Ros-diffs December 2011

ros-diffs@reactos.org

16 participants
242 discussions

[jimtabor] 54596: [Win32k] - Fix more set active window API tests. The window postion change message with fixed lparam is erroneous. How can the address be the same since it originates from kernel ...
by jimtabor＠svn.reactos.org 05 Dec '11

05 Dec '11

Author: jimtabor Date: Mon Dec 5 01:09:25 2011 New Revision: 54596 URL: http://svn.reactos.org/svn/reactos?rev=54596&view=rev Log: [Win32k] - Fix more set active window API tests. The window postion change message with fixed lparam is erroneous. How can the address be the same since it originates from kernel space? Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Mon Dec 5 01:09:25 2011 @@ -814,6 +814,13 @@ INT cyMsgFontChar; /* 010 */ UINT wMaxBtnSize; /* 014 */ } DPISERVERINFO, *PDPISERVERINFO; + +// PUSIFlags: +#define PUSIF_PALETTEDISPLAY 0x01 +#define PUSIF_SNAPTO 0x02 +#define PUSIF_COMBOBOXANIMATION 0x04 +#define PUSIF_LISTBOXSMOOTHSCROLLING 0x08 +#define PUSIF_KEYBOARDCUES 0x20 typedef struct _PERUSERSERVERINFO { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Mon Dec 5 01:09:25 2011 @@ -63,7 +63,8 @@ if (WindowPrev) UserRefObjectCo(WindowPrev, &RefPrev); /* Send palette messages */ - if (co_IntPostOrSendMessage(hWnd, WM_QUERYNEWPALETTE, 0, 0)) + if (gpsi->PUSIFlags & PUSIF_PALETTEDISPLAY && + co_IntPostOrSendMessage(hWnd, WM_QUERYNEWPALETTE, 0, 0)) { UserSendNotifyMessage( HWND_BROADCAST, WM_PALETTEISCHANGING, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Mon Dec 5 01:09:25 2011 @@ -306,6 +306,12 @@ gpsi->BitsPixel = NtGdiGetDeviceCaps(ScreenDeviceContext, BITSPIXEL); gpsi->BitCount = gpsi->Planes * gpsi->BitsPixel; gpsi->dmLogPixels = NtGdiGetDeviceCaps(ScreenDeviceContext, LOGPIXELSY); + if (NtGdiGetDeviceCaps(ScreenDeviceContext, RASTERCAPS) & RC_PALETTE) + { + gpsi->PUSIFlags |= PUSIF_PALETTEDISPLAY; + } + else + gpsi->PUSIFlags &= ~PUSIF_PALETTEDISPLAY; // Font is realized and this dc was previously set to internal DC_ATTR. gpsi->cxSysFontChar = IntGetCharDimensions(hSystemBM, &tmw, (DWORD*)&gpsi->cySysFontChar); gpsi->tmSysFont = tmw;

1 0

[jimtabor] 54595: [Win32k] - Fix crash in shutdown, see bug 6714.
by jimtabor＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: jimtabor Date: Sun Dec 4 22:35:18 2011 New Revision: 54595 URL: http://svn.reactos.org/svn/reactos?rev=54595&view=rev Log: [Win32k] - Fix crash in shutdown, see bug 6714. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Sun Dec 4 22:35:18 2011 @@ -841,7 +841,7 @@ !IS_KEY_DOWN(gafAsyncKeyState, VK_CONTROL) && (wVk == VK_ESCAPE || wVk == VK_TAB)) { - TRACE("Alt-Tab/Esc Pressed wParam %x\n",Msg.wParam); + TRACE("Alt-Tab/Esc Pressed wParam %x\n",wVk); } /* If we have a focus queue, post a keyboard message */ @@ -1065,6 +1065,17 @@ LARGE_INTEGER LargeTickCount; BOOL bResult = FALSE; + switch(lpMsg->message) + { + case WM_KEYDOWN: + case WM_KEYUP: + case WM_SYSKEYDOWN: + case WM_SYSKEYUP: + break; + default: + return FALSE; + } + pWnd = UserGetWindowObject(lpMsg->hwnd); if (!pWnd) // Must have a window! { @@ -1073,7 +1084,14 @@ } pti = pWnd->head.pti; - pKbdTbl = pti->KeyboardLayout->spkf->pKbdTbl; + + if (!pti->KeyboardLayout) + { + pti->KeyboardLayout = W32kGetDefaultKeyLayout(); + pKbdTbl = pti->KeyboardLayout->spkf->pKbdTbl; + } + else + pKbdTbl = pti->KeyboardLayout->spkf->pKbdTbl; if (!pKbdTbl) return FALSE;

1 0

[jgardou] 54594: [ACPI] - return correct status in case of unknown GUID passed for IRP_MN_QUERY_INTERFACE
by jgardou＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: jgardou Date: Sun Dec 4 22:34:55 2011 New Revision: 54594 URL: http://svn.reactos.org/svn/reactos?rev=54594&view=rev Log: [ACPI] - return correct status in case of unknown GUID passed for IRP_MN_QUERY_INTERFACE Modified: trunk/reactos/drivers/bus/acpi/interface.c Modified: trunk/reactos/drivers/bus/acpi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/interface… ============================================================================== --- trunk/reactos/drivers/bus/acpi/interface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/interface.c [iso-8859-1] Sun Dec 4 22:34:55 2011 @@ -139,6 +139,6 @@ else { DPRINT1("Invalid GUID\n"); - return STATUS_INVALID_PARAMETER; + return STATUS_NOT_SUPPORTED; } }

1 0

[cgutman] 54593: [TCPIP] - Avoid an extra copy operation when receiving packets - Optimize loopback code a bit - Make IP receive independent of the location of the data and continuity of buffers in...
by cgutman＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: cgutman Date: Sun Dec 4 22:31:49 2011 New Revision: 54593 URL: http://svn.reactos.org/svn/reactos?rev=54593&view=rev Log: [TCPIP] - Avoid an extra copy operation when receiving packets - Optimize loopback code a bit - Make IP receive independent of the location of the data and continuity of buffers in the NDIS packet for ProtocolReceivePacket support (part 1 of x) Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/network/tcpip/include/receive.h trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/network/loopback.c trunk/reactos/lib/drivers/ip/network/receive.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sun Dec 4 22:31:49 2011 @@ -278,22 +278,21 @@ ("Ether Type = %x ContigSize = %d Total = %d\n", PacketType, IPPacket.ContigSize, IPPacket.TotalSize)); + /* NDIS packet is freed in all of these cases */ switch (PacketType) { - case ETYPE_IPv4: - case ETYPE_IPv6: - TI_DbgPrint(MID_TRACE,("Received IP Packet\n")); - IPReceive(Adapter->Context, &IPPacket); - break; - case ETYPE_ARP: - TI_DbgPrint(MID_TRACE,("Received ARP Packet\n")); - ARPReceive(Adapter->Context, &IPPacket); - break; - default: - IPPacket.Free(&IPPacket); - break; - } - - FreeNdisPacket( Packet ); + case ETYPE_IPv4: + case ETYPE_IPv6: + TI_DbgPrint(MID_TRACE,("Received IP Packet\n")); + IPReceive(Adapter->Context, &IPPacket); + break; + case ETYPE_ARP: + TI_DbgPrint(MID_TRACE,("Received ARP Packet\n")); + ARPReceive(Adapter->Context, &IPPacket); + break; + default: + IPPacket.Free(&IPPacket); + break; + } } VOID LanSubmitReceiveWork( Modified: trunk/reactos/drivers/network/tcpip/include/receive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/receive.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/receive.h [iso-8859-1] Sun Dec 4 22:31:49 2011 @@ -15,7 +15,8 @@ /* IP datagram fragment descriptor. Used to store IP datagram fragments */ typedef struct IP_FRAGMENT { LIST_ENTRY ListEntry; /* Entry on list */ - PVOID Data; /* Pointer to fragment data */ + PNDIS_PACKET Packet; /* NDIS packet containing fragment data */ + UINT PacketOffset; /* Offset into NDIS packet where data is */ UINT Offset; /* Offset into datagram where this fragment is */ UINT Size; /* Size of this fragment */ } IP_FRAGMENT, *PIP_FRAGMENT; Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Sun Dec 4 22:31:49 2011 @@ -30,14 +30,22 @@ VOID TCPUnregisterInterface(PIP_INTERFACE IF); -VOID DontFreePacket( +VOID DeinitializePacket( PVOID Object) /* - * FUNCTION: Do nothing for when the IPPacket struct is part of another + * FUNCTION: Frees buffers attached to the packet * ARGUMENTS: * Object = Pointer to an IP packet structure */ { + PIP_PACKET IPPacket = Object; + + /* Detect double free */ + ASSERT(IPPacket->Type != 0xFF); + IPPacket->Type = 0xFF; + + if (IPPacket->NdisPacket != NULL) + FreeNdisPacket(IPPacket->NdisPacket); } VOID FreeIF( @@ -62,10 +70,9 @@ * Pointer to the created IP packet. NULL if there was not enough free resources. */ { - /* FIXME: Is this needed? */ RtlZeroMemory(IPPacket, sizeof(IP_PACKET)); - IPPacket->Free = DontFreePacket; + IPPacket->Free = DeinitializePacket; IPPacket->Type = Type; return IPPacket; Modified: trunk/reactos/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/loo… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] Sun Dec 4 22:31:49 2011 @@ -17,10 +17,10 @@ { PIP_PACKET IPPacket = Context; + /* IPReceive() takes care of the NDIS packet */ IPReceive(Loopback, IPPacket); - FreeNdisPacket(IPPacket->NdisPacket); - ExFreePool(Context); + ExFreePool(IPPacket); } VOID LoopTransmit( @@ -43,9 +43,8 @@ UINT PacketLength; PNDIS_PACKET XmitPacket; NDIS_STATUS NdisStatus; - IP_PACKET IPPacket; + PIP_PACKET IPPacket; PNDIS_BUFFER NdisBuffer; - PVOID WorkerBuffer; ASSERT_KM_POINTER(NdisPacket); ASSERT_KM_POINTER(PC(NdisPacket)); @@ -59,24 +58,23 @@ ( &XmitPacket, PacketBuffer, PacketLength ); if( NT_SUCCESS(NdisStatus) ) { - IPInitializePacket(&IPPacket, 0); - - IPPacket.NdisPacket = XmitPacket; - - NdisGetFirstBufferFromPacket(XmitPacket, - &NdisBuffer, - &IPPacket.Header, - &IPPacket.ContigSize, - &IPPacket.TotalSize); + IPPacket = ExAllocatePool(NonPagedPool, sizeof(IP_PACKET)); + if (IPPacket) + { + IPInitializePacket(IPPacket, 0); - - WorkerBuffer = ExAllocatePool(NonPagedPool, sizeof(IPPacket)); - if (WorkerBuffer) - { - RtlCopyMemory(WorkerBuffer, &IPPacket, sizeof(IPPacket)); - if (!ChewCreate(LoopPassiveWorker, WorkerBuffer)) + IPPacket->NdisPacket = XmitPacket; + + NdisGetFirstBufferFromPacket(XmitPacket, + &NdisBuffer, + &IPPacket->Header, + &IPPacket->ContigSize, + &IPPacket->TotalSize); + + if (!ChewCreate(LoopPassiveWorker, IPPacket)) { - ExFreePool(WorkerBuffer); + IPPacket->Free(IPPacket); + ExFreePool(IPPacket); NdisStatus = NDIS_STATUS_RESOURCES; } } Modified: trunk/reactos/lib/drivers/ip/network/receive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rec… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/receive.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/receive.c [iso-8859-1] Sun Dec 4 22:31:49 2011 @@ -89,10 +89,10 @@ /* Unlink it from the list */ RemoveEntryList(CurrentEntry); - TI_DbgPrint(DEBUG_IP, ("Freeing fragment data at (0x%X).\n", CurrentF->Data)); + TI_DbgPrint(DEBUG_IP, ("Freeing fragment packet at (0x%X).\n", CurrentF->Packet)); /* Free the fragment data buffer */ - ExFreePoolWithTag(CurrentF->Data, FRAGMENT_DATA_TAG); + FreeNdisPacket(CurrentF->Packet); TI_DbgPrint(DEBUG_IP, ("Freeing fragment at (0x%X).\n", CurrentF)); @@ -186,20 +186,16 @@ */ { PLIST_ENTRY CurrentEntry; - PIP_FRAGMENT Current; - PVOID Data; + PIP_FRAGMENT Fragment; + PCHAR Data; TI_DbgPrint(DEBUG_IP, ("Reassembling datagram from IPDR at (0x%X).\n", IPDR)); TI_DbgPrint(DEBUG_IP, ("IPDR->HeaderSize = %d\n", IPDR->HeaderSize)); TI_DbgPrint(DEBUG_IP, ("IPDR->DataSize = %d\n", IPDR->DataSize)); - TI_DbgPrint(DEBUG_IP, ("Fragment header:\n")); - //OskitDumpBuffer((PCHAR)IPDR->IPv4Header, IPDR->HeaderSize); - IPPacket->TotalSize = IPDR->HeaderSize + IPDR->DataSize; IPPacket->ContigSize = IPPacket->TotalSize; IPPacket->HeaderSize = IPDR->HeaderSize; - /*IPPacket->Position = IPDR->HeaderSize;*/ RtlCopyMemory(&IPPacket->SrcAddr, &IPDR->SrcAddr, sizeof(IP_ADDRESS)); RtlCopyMemory(&IPPacket->DstAddr, &IPDR->DstAddr, sizeof(IP_ADDRESS)); @@ -221,15 +217,14 @@ /* Copy data from all fragments into buffer */ CurrentEntry = IPDR->FragmentListHead.Flink; while (CurrentEntry != &IPDR->FragmentListHead) { - Current = CONTAINING_RECORD(CurrentEntry, IP_FRAGMENT, ListEntry); - - TI_DbgPrint(DEBUG_IP, ("Copying (%d) bytes of fragment data from (0x%X) to offset (%d).\n", - Current->Size, Data, Current->Offset)); - /* Copy fragment data to the destination buffer at the correct offset */ - RtlCopyMemory((PVOID)((ULONG_PTR)Data + Current->Offset), - Current->Data, - Current->Size); - //OskitDumpBuffer( Data, Current->Offset + Current->Size ); + Fragment = CONTAINING_RECORD(CurrentEntry, IP_FRAGMENT, ListEntry); + + /* Copy fragment data into datagram buffer */ + CopyPacketToBuffer(Data + Fragment->Offset, + Fragment->Packet, + Fragment->PacketOffset, + Fragment->Size); + CurrentEntry = CurrentEntry->Flink; } @@ -410,24 +405,12 @@ TI_DbgPrint(DEBUG_IP, ("Fragment descriptor allocated at (0x%X).\n", Fragment)); Fragment->Size = IPPacket->TotalSize - IPPacket->HeaderSize; - Fragment->Data = ExAllocatePoolWithTag(NonPagedPool, Fragment->Size, FRAGMENT_DATA_TAG); - if (!Fragment->Data) { - /* We don't have the resources to process this packet, discard it */ - ExFreeToNPagedLookasideList(&IPFragmentList, Fragment); - Cleanup(&IPDR->Lock, OldIrql, IPDR); - return; - } - - /* Position here is an offset from the NdisPacket start, not the header */ - TI_DbgPrint(DEBUG_IP, ("Fragment data buffer allocated at (0x%X) Size (%d) Pos (%d).\n", - Fragment->Data, Fragment->Size, IPPacket->Position)); - - /* Copy datagram data into fragment buffer */ - CopyPacketToBuffer(Fragment->Data, - IPPacket->NdisPacket, - IPPacket->HeaderSize, - Fragment->Size); + Fragment->Packet = IPPacket->NdisPacket; + Fragment->PacketOffset = IPPacket->Position + IPPacket->HeaderSize; Fragment->Offset = FragFirst; + + /* Disassociate the NDIS packet so it isn't freed upon return from IPReceive() */ + IPPacket->NdisPacket = NULL; /* If this is the last fragment, compute and save the datagram data size */ if (!MoreFragments) @@ -581,7 +564,6 @@ AddrInitIPv4(&IPPacket->SrcAddr, ((PIPv4_HEADER)IPPacket->Header)->SrcAddr); AddrInitIPv4(&IPPacket->DstAddr, ((PIPv4_HEADER)IPPacket->Header)->DstAddr); - IPPacket->Position += IPPacket->HeaderSize; IPPacket->Data = (PVOID)((ULONG_PTR)IPPacket->Header + IPPacket->HeaderSize); TI_DbgPrint(MID_TRACE,("IPPacket->Position = %d\n",

1 0

[ion] 54592: [KERNEL32]: Implement BasepComputeProcessPath. [KERNEL32]: Replace BasepGetDllPath with BasepComputeProcessDllPath. Paths now work right. This is step 1. SearchPatchW is next (BasepCom...
by ion＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: ion Date: Sun Dec 4 19:30:12 2011 New Revision: 54592 URL: http://svn.reactos.org/svn/reactos?rev=54592&view=rev Log: [KERNEL32]: Implement BasepComputeProcessPath. [KERNEL32]: Replace BasepGetDllPath with BasepComputeProcessDllPath. Paths now work right. This is step 1. SearchPatchW is next (BasepComputeProcessPath), followed by CreateProcessInternalW (BasepComputeProcessExePath). Then all paths will work right. Modified: trunk/reactos/dll/win32/kernel32/client/loader.c trunk/reactos/dll/win32/kernel32/client/path.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/dll/win32/kernel32/include/kernel32.h Modified: trunk/reactos/dll/win32/kernel32/client/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] Sun Dec 4 19:30:12 2011 @@ -67,105 +67,6 @@ /* It'a a normal DLL, just return its handle */ return hModule; -} - -/** - * @name GetDllLoadPath - * - * Internal function to compute the load path to use for a given dll. - * - * @remarks Returned pointer must be freed by caller. - */ - -LPWSTR -GetDllLoadPath(LPCWSTR lpModule) -{ - ULONG Pos = 0, Length = 4, Tmp; - PWCHAR EnvironmentBufferW = NULL; - LPCWSTR lpModuleEnd = NULL; - UNICODE_STRING ModuleName; - DWORD LastError = GetLastError(); /* GetEnvironmentVariable changes LastError */ - - // FIXME: This function is used only by SearchPathW, and is deprecated and will be deleted ASAP. - - if (lpModule != NULL && wcslen(lpModule) > 2 && lpModule[1] == ':') - { - lpModuleEnd = lpModule + wcslen(lpModule); - } - else - { - ModuleName = NtCurrentPeb()->ProcessParameters->ImagePathName; - lpModule = ModuleName.Buffer; - lpModuleEnd = lpModule + (ModuleName.Length / sizeof(WCHAR)); - } - - if (lpModule != NULL) - { - while (lpModuleEnd > lpModule && *lpModuleEnd != L'/' && - *lpModuleEnd != L'\\' && *lpModuleEnd != L':') - { - --lpModuleEnd; - } - Length = (lpModuleEnd - lpModule) + 1; - } - - Length += GetCurrentDirectoryW(0, NULL); - Length += GetDllDirectoryW(0, NULL); - Length += GetSystemDirectoryW(NULL, 0); - Length += GetWindowsDirectoryW(NULL, 0); - Length += GetEnvironmentVariableW(L"PATH", NULL, 0); - - EnvironmentBufferW = RtlAllocateHeap(RtlGetProcessHeap(), 0, - (Length + 1) * sizeof(WCHAR)); - if (EnvironmentBufferW == NULL) - { - return NULL; - } - - if (lpModule) - { - RtlCopyMemory(EnvironmentBufferW, lpModule, - (lpModuleEnd - lpModule) * sizeof(WCHAR)); - Pos += lpModuleEnd - lpModule; - EnvironmentBufferW[Pos++] = L';'; - } - - Tmp = GetCurrentDirectoryW(Length, EnvironmentBufferW + Pos); - if(Tmp > 0 && Tmp < Length - Pos) - { - Pos += Tmp; - if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; - } - - Tmp = GetDllDirectoryW(Length - Pos, EnvironmentBufferW + Pos); - if(Tmp > 0 && Tmp < Length - Pos) - { - Pos += Tmp; - if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; - } - - Tmp = GetSystemDirectoryW(EnvironmentBufferW + Pos, Length - Pos); - if(Tmp > 0 && Tmp < Length - Pos) - { - Pos += Tmp; - if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; - } - - Tmp = GetWindowsDirectoryW(EnvironmentBufferW + Pos, Length - Pos); - if(Tmp > 0 && Tmp < Length - Pos) - { - Pos += Tmp; - if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; - } - - Tmp = GetEnvironmentVariableW(L"PATH", EnvironmentBufferW + Pos, Length - Pos); - - /* Make sure buffer is null terminated */ - EnvironmentBufferW[Pos++] = UNICODE_NULL; - - - SetLastError(LastError); - return EnvironmentBufferW; } /* @@ -421,9 +322,9 @@ } /* Compute the load path */ - SearchPath = BasepGetDllPath((dwFlags & LOAD_WITH_ALTERED_SEARCH_PATH) ? (LPWSTR)lpLibFileName : NULL, - NULL); - + SearchPath = BaseComputeProcessDllPath((dwFlags & LOAD_WITH_ALTERED_SEARCH_PATH) ? + DllName.Buffer : NULL, + NULL); if (!SearchPath) { /* Getting DLL path failed, so set last error, free mem and return */ @@ -766,20 +667,24 @@ if (NT_SUCCESS(Status)) return Module; /* If not, then the path should be computed */ - DllPath = BasepGetDllPath(NULL, 0); - - /* Call LdrGetHandle() again providing the computed DllPath - and wrapped into SEH */ - _SEH2_TRY - { - Status = LdrGetDllHandle(DllPath, NULL, ModuleName, &Module); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Fail with the SEH error */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; + DllPath = BaseComputeProcessDllPath(NULL, 0); + if (!DllPath) + { + Status = STATUS_NO_MEMORY; + } + else + { + _SEH2_TRY + { + Status = LdrGetDllHandle(DllPath, NULL, ModuleName, &Module); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Fail with the SEH error */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } /* Free the DllPath */ RtlFreeHeap(RtlGetProcessHeap(), 0, DllPath); Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Dec 4 19:30:12 2011 @@ -33,7 +33,7 @@ 0x10000000 // 7C not allowed }; -BASE_SEARCH_PATH_TYPE BaseDllOrderCurrent[BaseCurrentDirMax][BaseSearchPathMax] = +BASE_SEARCH_PATH_TYPE BaseDllOrderCurrent[BaseCurrentDirPlacementMax][BaseSearchPathMax] = { { BaseSearchPathApp, @@ -78,7 +78,38 @@ BaseSearchPathInvalid }; +BASE_CURRENT_DIR_PLACEMENT BasepDllCurrentDirPlacement = BaseCurrentDirPlacementInvalid; + +extern UNICODE_STRING BasePathVariableName; + /* PRIVATE FUNCTIONS **********************************************************/ + +PWCHAR +WINAPI +BasepEndOfDirName(IN PWCHAR FileName) +{ + PWCHAR FileNameEnd, FileNameSeparator; + + /* Find the first slash */ + FileNameSeparator = wcschr(FileName, OBJ_NAME_PATH_SEPARATOR); + if (FileNameSeparator) + { + /* Find the last one */ + FileNameEnd = wcsrchr(FileNameSeparator, OBJ_NAME_PATH_SEPARATOR); + ASSERT(FileNameEnd); + + /* Handle the case where they are one and the same */ + if (FileNameEnd == FileNameSeparator) FileNameEnd++; + } + else + { + /* No directory was specified */ + FileNameEnd = NULL; + } + + /* Return where the directory ends and the filename starts */ + return FileNameEnd; +} LPWSTR WINAPI @@ -86,7 +117,274 @@ IN LPWSTR AppName, IN LPVOID Environment) { - return NULL; + PWCHAR PathBuffer, Buffer, AppNameEnd, PathCurrent; + ULONG PathLengthInBytes; + NTSTATUS Status; + UNICODE_STRING EnvPath; + PBASE_SEARCH_PATH_TYPE Order; + + /* Initialize state */ + AppNameEnd = Buffer = PathBuffer = NULL; + Status = STATUS_SUCCESS; + PathLengthInBytes = 0; + + /* Loop the ordering array */ + for (Order = PathOrder; *Order != BaseSearchPathInvalid; Order++) { + switch (*Order) + { + /* Compute the size of the DLL path */ + case BaseSearchPathDll: + + /* This path only gets called if SetDllDirectory was called */ + ASSERT(BaseDllDirectory.Buffer != NULL); + + /* Make sure there's a DLL directory size */ + if (BaseDllDirectory.Length) + { + /* Add it, plus the separator */ + PathLengthInBytes += BaseDllDirectory.Length + sizeof(L';'); + } + break; + + /* Compute the size of the current path */ + case BaseSearchPathCurrent: + + /* Add ".;" */ + PathLengthInBytes += (2 * sizeof(WCHAR)); + break; + + /* Compute the size of the "PATH" environment variable */ + case BaseSearchPathEnv: + + /* Grab PEB lock if one wasn't passed in */ + if (!Environment) RtlAcquirePebLock(); + + /* Query the size first */ + EnvPath.MaximumLength = 0; + Status = RtlQueryEnvironmentVariable_U(Environment, + &BasePathVariableName, + &EnvPath); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Compute the size we'll need for the environment */ + EnvPath.MaximumLength = EnvPath.Length + sizeof(WCHAR); + if ((EnvPath.Length + sizeof(WCHAR)) > UNICODE_STRING_MAX_BYTES) + { + /* Don't let it overflow */ + EnvPath.MaximumLength = EnvPath.Length; + } + + /* Allocate the environment buffer */ + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + EnvPath.MaximumLength); + if (Buffer) + { + /* Now query the PATH environment variable */ + EnvPath.Buffer = Buffer; + Status = RtlQueryEnvironmentVariable_U(Environment, + &BasePathVariableName, + &EnvPath); + } + else + { + /* Failure case */ + Status = STATUS_NO_MEMORY; + } + } + + /* Release the PEB lock from above */ + if (!Environment) RtlReleasePebLock(); + + /* There might not be a PATH */ + if (Status == STATUS_VARIABLE_NOT_FOUND) + { + /* In this case, skip this PathOrder */ + EnvPath.Length = EnvPath.MaximumLength = 0; + Status = STATUS_SUCCESS; + } + else if (!NT_SUCCESS(Status)) + { + /* An early failure, go to exit code */ + goto Quickie; + } + else + { + /* Add the length of the PATH variable */ + ASSERT(!(EnvPath.Length & 1)); + PathLengthInBytes += (EnvPath.Length + sizeof(L';')); + } + break; + + /* Compute the size of the default search path */ + case BaseSearchPathDefault: + + /* Just add it... it already has a ';' at the end */ + ASSERT(!(BaseDefaultPath.Length & 1)); + PathLengthInBytes += BaseDefaultPath.Length; + break; + + /* Compute the size of the current app directory */ + case BaseSearchPathApp: + /* Find out where the app name ends, to get only the directory */ + if (AppName) AppNameEnd = BasepEndOfDirName(AppName); + + /* Check if there was no application name passed in */ + if (!(AppName) || !(AppNameEnd)) + { + /* Do we have a per-thread CURDIR to use? */ + if (NtCurrentTeb()->NtTib.SubSystemTib) + { + /* This means someone added RTL_PERTHREAD_CURDIR */ + UNIMPLEMENTED; + while (TRUE); + } + + /* We do not. Do we have the LDR_ENTRY for the executable? */ + if (!BasepExeLdrEntry) + { + /* We do not. Grab it */ + LdrEnumerateLoadedModules(0, + BasepLocateExeLdrEntry, + NtCurrentPeb()->ImageBaseAddress); + } + + /* Now do we have it? */ + if (BasepExeLdrEntry) + { + /* Yes, so read the name out of it */ + AppName = BasepExeLdrEntry->FullDllName.Buffer; + } + + /* Find out where the app name ends, to get only the directory */ + if (AppName) AppNameEnd = BasepEndOfDirName(AppName); + } + + /* So, do we have an application name and its directory? */ + if ((AppName) && (AppNameEnd)) + { + /* Add the size of the app's directory, plus the separator */ + PathLengthInBytes += ((AppNameEnd - AppName) * sizeof(WCHAR)) + sizeof(L';'); + } + break; + + default: + break; + } + } + + /* Bam, all done, we now have the final path size */ + ASSERT(PathLengthInBytes > 0); + ASSERT(!(PathLengthInBytes & 1)); + + /* Allocate the buffer to hold it */ + PathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, PathLengthInBytes); + if (!PathBuffer) + { + /* Failure path */ + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Now we loop again, this time to copy the data */ + PathCurrent = PathBuffer; + for (Order = PathOrder; *Order != BaseSearchPathInvalid; Order++) { + switch (*Order) + { + /* Add the DLL path */ + case BaseSearchPathDll: + if (BaseDllDirectory.Length) + { + /* Copy it in the buffer, ASSERT there's enough space */ + ASSERT((((PathCurrent - PathBuffer + 1) * sizeof(WCHAR)) + BaseDllDirectory.Length) <= PathLengthInBytes); + RtlCopyMemory(PathCurrent, + BaseDllDirectory.Buffer, + BaseDllDirectory.Length); + + /* Update the current pointer, add a separator */ + PathCurrent += (BaseDllDirectory.Length / sizeof(WCHAR)); + *PathCurrent++ = ';'; + } + break; + + /* Add the current applicaiton path */ + case BaseSearchPathApp: + if ((AppName) && (AppNameEnd)) + { + /* Copy it in the buffer, ASSERT there's enough space */ + ASSERT(((PathCurrent - PathBuffer + 1 + (AppNameEnd - AppName)) * sizeof(WCHAR)) <= PathLengthInBytes); + RtlCopyMemory(PathCurrent, + AppName, + (AppNameEnd - AppName) * sizeof(WCHAR)); + + /* Update the current pointer, add a separator */ + PathCurrent += AppNameEnd - AppName; + *PathCurrent++ = ';'; + } + break; + + /* Add the default search path */ + case BaseSearchPathDefault: + /* Copy it in the buffer, ASSERT there's enough space */ + ASSERT((((PathCurrent - PathBuffer) * sizeof(WCHAR)) + BaseDefaultPath.Length) <= PathLengthInBytes); + RtlCopyMemory(PathCurrent, BaseDefaultPath.Buffer, BaseDefaultPath.Length); + + /* Update the current pointer. The default path already has a ";" */ + PathCurrent += (BaseDefaultPath.Length / sizeof(WCHAR)); + break; + + /* Add the path in the PATH environment variable */ + case BaseSearchPathEnv: + if (EnvPath.Length) + { + /* Copy it in the buffer, ASSERT there's enough space */ + ASSERT((((PathCurrent - PathBuffer + 1) * sizeof(WCHAR)) + EnvPath.Length) <= PathLengthInBytes); + RtlCopyMemory(PathCurrent, EnvPath.Buffer, EnvPath.Length); + + /* Update the current pointer, add a separator */ + PathCurrent += (EnvPath.Length / sizeof(WCHAR)); + *PathCurrent++ = ';'; + } + break; + + /* Add the current dierctory */ + case BaseSearchPathCurrent: + + /* Copy it in the buffer, ASSERT there's enough space */ + ASSERT(((PathCurrent - PathBuffer + 2) * sizeof(WCHAR)) <= PathLengthInBytes); + *PathCurrent++ = '.'; + + /* Add the path separator */ + *PathCurrent++ = ';'; + break; + + default: + break; + } + } + + /* Everything should've perfectly fit in there */ + ASSERT((PathCurrent - PathBuffer) * sizeof(WCHAR) == PathLengthInBytes); + ASSERT(PathCurrent > PathBuffer); + + /* Terminate the whole thing */ + PathCurrent[-1] = UNICODE_NULL; + +Quickie: + /* Exit path: free our buffers */ + if (Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + if (PathBuffer) + { + /* This only gets freed in the failure path, since caller wants it */ + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, PathBuffer); + PathBuffer = NULL; + } + } + + /* Return the path! */ + return PathBuffer; } LPWSTR @@ -94,7 +392,7 @@ BaseComputeProcessSearchPath(VOID) { DPRINT1("Computing Process Search path\n"); - + /* Compute the path using default process order */ return BasepComputeProcessPath(BaseProcessOrder, NULL, NULL); } @@ -120,7 +418,14 @@ IN PVOID Environment) { LPWSTR DllPath = NULL; - DPRINT1("Computing DLL path: %wZ with BaseDll: %wZ\n", FullPath, &BaseDllDirectory); + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\MACHINE\\System\\CurrentControlSet\\Control\\Session Manager"); + UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"SafeDllSearchMode"); + OBJECT_ATTRIBUTES ObjectAttributes = RTL_CONSTANT_OBJECT_ATTRIBUTES(&KeyName, OBJ_CASE_INSENSITIVE); + KEY_VALUE_PARTIAL_INFORMATION PartialInfo; + HANDLE KeyHandle; + NTSTATUS Status; + ULONG ResultLength; + BASE_CURRENT_DIR_PLACEMENT CurrentDirPlacement, OldCurrentDirPlacement; /* Acquire DLL directory lock */ RtlEnterCriticalSection(&BaseDllDirectoryLock); @@ -141,8 +446,65 @@ /* Release DLL directory lock */ RtlLeaveCriticalSection(&BaseDllDirectoryLock); - /* There is no base DLL directory */ - UNIMPLEMENTED; + /* Read the current placement */ + CurrentDirPlacement = BasepDllCurrentDirPlacement; + if (CurrentDirPlacement == BaseCurrentDirPlacementInvalid) + { + /* Open the configuration key */ + Status = NtOpenKey(&KeyHandle, KEY_QUERY_VALUE, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Query if safe search is enabled */ + Status = NtQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + &PartialInfo, + sizeof(PartialInfo), + &ResultLength); + if (NT_SUCCESS(Status)) + { + /* Read the value if the size is OK */ + if (ResultLength == sizeof(PartialInfo)) + { + CurrentDirPlacement = *(PULONG)PartialInfo.Data; + } + } + + /* Close the handle */ + NtClose(KeyHandle); + + /* Validate the registry value */ + if ((CurrentDirPlacement <= BaseCurrentDirPlacementInvalid) || + (CurrentDirPlacement >= BaseCurrentDirPlacementMax)) + { + /* Default to safe search */ + CurrentDirPlacement = BaseCurrentDirPlacementSafe; + } + } + + /* Update the placement and read the old one */ + OldCurrentDirPlacement = InterlockedCompareExchange((PLONG)&BasepDllCurrentDirPlacement, + CurrentDirPlacement, + BaseCurrentDirPlacementInvalid); + if (OldCurrentDirPlacement != BaseCurrentDirPlacementInvalid) + { + /* If there already was a placement, use it */ + CurrentDirPlacement = OldCurrentDirPlacement; + } + } + + /* Check if the placement is invalid or not set */ + if ((CurrentDirPlacement <= BaseCurrentDirPlacementInvalid) || + (CurrentDirPlacement >= BaseCurrentDirPlacementMax)) + { + /* Default to safe search */ + CurrentDirPlacement = BaseCurrentDirPlacementSafe; + } + + /* Compute the process path using either normal or safe search */ + DllPath = BasepComputeProcessPath(BaseDllOrderCurrent[CurrentDirPlacement], + FullPath, + Environment); /* Return dll path */ return DllPath; @@ -939,6 +1301,105 @@ return (name[1] == '.' && (name[2] == '/' || name[2] == '\\')); } +/** + * @name GetDllLoadPath + * + * Internal function to compute the load path to use for a given dll. + * + * @remarks Returned pointer must be freed by caller. + */ + +LPWSTR +GetDllLoadPath(LPCWSTR lpModule) +{ + ULONG Pos = 0, Length = 4, Tmp; + PWCHAR EnvironmentBufferW = NULL; + LPCWSTR lpModuleEnd = NULL; + UNICODE_STRING ModuleName; + DWORD LastError = GetLastError(); /* GetEnvironmentVariable changes LastError */ + + // FIXME: This function is used only by SearchPathW, and is deprecated and will be deleted ASAP. + + if (lpModule != NULL && wcslen(lpModule) > 2 && lpModule[1] == ':') + { + lpModuleEnd = lpModule + wcslen(lpModule); + } + else + { + ModuleName = NtCurrentPeb()->ProcessParameters->ImagePathName; + lpModule = ModuleName.Buffer; + lpModuleEnd = lpModule + (ModuleName.Length / sizeof(WCHAR)); + } + + if (lpModule != NULL) + { + while (lpModuleEnd > lpModule && *lpModuleEnd != L'/' && + *lpModuleEnd != L'\\' && *lpModuleEnd != L':') + { + --lpModuleEnd; + } + Length = (lpModuleEnd - lpModule) + 1; + } + + Length += GetCurrentDirectoryW(0, NULL); + Length += GetDllDirectoryW(0, NULL); + Length += GetSystemDirectoryW(NULL, 0); + Length += GetWindowsDirectoryW(NULL, 0); + Length += GetEnvironmentVariableW(L"PATH", NULL, 0); + + EnvironmentBufferW = RtlAllocateHeap(RtlGetProcessHeap(), 0, + (Length + 1) * sizeof(WCHAR)); + if (EnvironmentBufferW == NULL) + { + return NULL; + } + + if (lpModule) + { + RtlCopyMemory(EnvironmentBufferW, lpModule, + (lpModuleEnd - lpModule) * sizeof(WCHAR)); + Pos += lpModuleEnd - lpModule; + EnvironmentBufferW[Pos++] = L';'; + } + + Tmp = GetCurrentDirectoryW(Length, EnvironmentBufferW + Pos); + if(Tmp > 0 && Tmp < Length - Pos) + { + Pos += Tmp; + if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; + } + + Tmp = GetDllDirectoryW(Length - Pos, EnvironmentBufferW + Pos); + if(Tmp > 0 && Tmp < Length - Pos) + { + Pos += Tmp; + if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; + } + + Tmp = GetSystemDirectoryW(EnvironmentBufferW + Pos, Length - Pos); + if(Tmp > 0 && Tmp < Length - Pos) + { + Pos += Tmp; + if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; + } + + Tmp = GetWindowsDirectoryW(EnvironmentBufferW + Pos, Length - Pos); + if(Tmp > 0 && Tmp < Length - Pos) + { + Pos += Tmp; + if(Pos < Length) EnvironmentBufferW[Pos++] = L';'; + } + + Tmp = GetEnvironmentVariableW(L"PATH", EnvironmentBufferW + Pos, Length - Pos); + + /* Make sure buffer is null terminated */ + EnvironmentBufferW[Pos++] = UNICODE_NULL; + + + SetLastError(LastError); + return EnvironmentBufferW; +} + /* * @implemented */ Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Dec 4 19:30:12 2011 @@ -373,201 +373,6 @@ sizeof(HANDLE), &Dummy); } -} - -LPWSTR -WINAPI -BasepGetProcessPath(DWORD Reserved, - LPWSTR FullPath, - PVOID Environment) -{ - NTSTATUS Status; - LPWSTR AllocatedPath = NULL, ch; - ULONG DefaultLength = BaseDefaultPath.Length; - ULONG AppLength = 0; - UNICODE_STRING EnvPath; - LPWSTR NamePtr; - LPWSTR PathBuffer; - BOOLEAN SecondAttempt = FALSE; - PPEB Peb = NtCurrentPeb(); - - if (!Environment) RtlAcquirePebLock(); - - /* Query PATH env var into append path */ - Status = RtlQueryEnvironmentVariable_U(Environment, - &BasePathVariableName, - &BaseDefaultPathAppend); - if (NT_SUCCESS(Status)) - { - /* Add up PATH environment length */ - DefaultLength += BaseDefaultPathAppend.Length; - } - else if (Status == STATUS_BUFFER_TOO_SMALL) - { - /* We have to allocate path dynamically */ - AllocatedPath = RtlAllocateHeap(RtlGetProcessHeap(), 0, BaseDefaultPathAppend.Length + sizeof(UNICODE_NULL)); - - if (AllocatedPath) - { - /* Set up EnvPath */ - EnvPath.Buffer = AllocatedPath; - EnvPath.Length = BaseDefaultPathAppend.Length + sizeof(UNICODE_NULL); - EnvPath.MaximumLength = EnvPath.Length; - - /* Query PATH env var into newly allocated path */ - Status = RtlQueryEnvironmentVariable_U(Environment, - &BasePathVariableName, - &EnvPath); - - if (NT_SUCCESS(Status)) - { - DefaultLength += EnvPath.Length; - } - else - { - /* Free newly allocated path, it didn't work */ - RtlFreeHeap(RtlGetProcessHeap(), 0, AllocatedPath); - AllocatedPath = NULL; - Status = STATUS_NO_MEMORY; - } - } - } - -secondattempt: - if (!FullPath) - { - /* Initialize BasepExeLdrEntry if necessary */ - if (!BasepExeLdrEntry) - LdrEnumerateLoadedModules(0, BasepLocateExeLdrEntry, Peb->ImageBaseAddress); - - DPRINT("Found BasepExeLdrEntry %wZ\n", &BasepExeLdrEntry->FullDllName); - - /* Set name pointer to the full dll path */ - NamePtr = BasepExeLdrEntry->FullDllName.Buffer; - } - else - { - /* Set name pointer to the provided path */ - NamePtr = FullPath; - } - - /* Determine application path length */ - if (NamePtr) - { - ch = NamePtr; - while (*ch) - { - /* Check if there is a slash */ - if (*ch == L'\\') - { - /* Update app length */ - AppLength = (ULONG_PTR)ch - (ULONG_PTR)NamePtr + sizeof(WCHAR); - } - - ch++; - } - } - - /* Now check, if we found a valid path in the provided full path */ - if (!AppLength && FullPath && !SecondAttempt) - { - /* We were provided with a bad full path, retry again using just this app's path */ - FullPath = NULL; - SecondAttempt = TRUE; - goto secondattempt; - } - - /* Allocate the path buffer */ - PathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, DefaultLength + AppLength + 2*sizeof(WCHAR)); - if (!PathBuffer) - { - /* Fail */ - if (!Environment) RtlReleasePebLock(); - if (AllocatedPath) RtlFreeHeap(RtlGetProcessHeap(), 0, AllocatedPath); - return NULL; - } - - /* Copy contents there */ - if (AppLength) - { - /* Remove trailing slashes if it's not root dir */ - if (AppLength != 3*sizeof(WCHAR)) - AppLength -= sizeof(WCHAR); - - /* Copy contents */ - RtlMoveMemory(PathBuffer, NamePtr, AppLength); - } - - /* Release the lock */ - if (!Environment) RtlReleasePebLock(); - - /* Finish preparing the path string */ - NamePtr = &PathBuffer[AppLength / sizeof(WCHAR)]; - - /* Put a separating ";" if something was added */ - if (AppLength) - { - *NamePtr = L';'; - NamePtr++; - } - - if (AllocatedPath) - { - /* Dynamically allocated env path, copy from the static buffer, - concatenate with dynamic buffer and free it */ - RtlMoveMemory(NamePtr, BaseDefaultPath.Buffer, BaseDefaultPath.Length); - RtlMoveMemory(&NamePtr[BaseDefaultPath.Length / sizeof(WCHAR)], AllocatedPath, EnvPath.Length); - - /* Free it */ - RtlFreeHeap(RtlGetProcessHeap(), 0, AllocatedPath); - } - else - { - /* Static env path string, copy directly from BaseDefaultPath */ - RtlMoveMemory(NamePtr, BaseDefaultPath.Buffer, DefaultLength); - } - - /* Null terminate the string */ - NamePtr[DefaultLength / sizeof(WCHAR)] = 0; - - return PathBuffer; -} - -LPWSTR -WINAPI -BasepGetDllPath(LPWSTR FullPath, - PVOID Environment) -{ -#if 0 - LPWSTR DllPath = NULL; - - /* Acquire DLL directory lock */ - RtlEnterCriticalSection(&BaseDllDirectoryLock); - - /* Check if we have a base dll directory */ - if (BaseDllDirectory.Buffer) - { - /* Then get process path */ - DllPath = BasepGetProcessPath(0, FullPath, Environment); - - /* Release DLL directory lock */ - RtlLeaveCriticalSection(&BaseDllDirectoryLock); - - /* Return dll path */ - return DllPath; - } - - /* Release DLL directory lock */ - RtlLeaveCriticalSection(&BaseDllDirectoryLock); - - /* There is no base DLL directory */ - UNIMPLEMENTED; - - /* Return dll path */ - return DllPath; -#else - return BasepGetProcessPath(0, FullPath, Environment); -#endif } VOID @@ -631,7 +436,9 @@ if ((Size) && (Size <= (MAX_PATH + 4))) { /* Get the DLL Path */ - DllPathString = BasepGetDllPath(ApplicationPathName, Environment); + DllPathString = BaseComputeProcessDllPath(ApplicationPathName, + Environment); + if (!DllPathString) return STATUS_NO_MEMORY; /* Initialize Strings */ RtlInitUnicodeString(&DllPath, DllPathString); @@ -640,7 +447,8 @@ else { /* Get the DLL Path */ - DllPathString = BasepGetDllPath(FullPath, Environment); + DllPathString = BaseComputeProcessDllPath(FullPath, Environment); + if (!DllPathString) return STATUS_NO_MEMORY; /* Initialize Strings */ RtlInitUnicodeString(&DllPath, DllPathString); Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Sun Dec 4 19:30:12 2011 @@ -88,14 +88,6 @@ DWORD dwReserved; } LOADPARMS32; -typedef enum _BASE_CURRENT_DIR_PRIORITY -{ - BaseCurrentDirInvalid = -1, - BaseCurrentDirFirst, - BaseCurrentDirLast, - BaseCurrentDirMax -} BASE_CURRENT_DIR_PRIORITY; - typedef enum _BASE_SEARCH_PATH_TYPE { BaseSearchPathInvalid, @@ -107,6 +99,14 @@ BaseSearchPathMax } BASE_SEARCH_PATH_TYPE, *PBASE_SEARCH_PATH_TYPE; +typedef enum _BASE_CURRENT_DIR_PLACEMENT +{ + BaseCurrentDirPlacementInvalid = -1, + BaseCurrentDirPlacementDefault, + BaseCurrentDirPlacementSafe, + BaseCurrentDirPlacementMax +} BASE_CURRENT_DIR_PLACEMENT; + #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_ERROR 1 #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS 2 #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_CONTINUE 3 @@ -289,17 +289,15 @@ OUT PHANDLE hSection, IN PUNICODE_STRING ApplicationName); -LPWSTR -WINAPI -BasepGetDllPath(LPWSTR FullPath, - PVOID Environment); - - PCODEPAGE_ENTRY FASTCALL IntGetCodePageEntry(UINT CodePage); LPWSTR -GetDllLoadPath(LPCWSTR lpModule); +WINAPI +BaseComputeProcessDllPath( + IN LPWSTR FullPath, + IN PVOID Environment +); VOID WINAPI

1 0

[cgutman] 54591: [NTOSKRNL] - Fix a logic error - Signal the balancer in the !CanWait case if we're too low on pages since it runs asynchronously as of recently
by cgutman＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: cgutman Date: Sun Dec 4 19:22:51 2011 New Revision: 54591 URL: http://svn.reactos.org/svn/reactos?rev=54591&view=rev Log: [NTOSKRNL] - Fix a logic error - Signal the balancer in the !CanWait case if we're too low on pages since it runs asynchronously as of recently Modified: trunk/reactos/ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Sun Dec 4 19:22:51 2011 @@ -239,7 +239,7 @@ /* * Make sure we don't exceed our individual target. */ - PagesUsed = InterlockedIncrementUL(&MiMemoryConsumers[Consumer].PagesUsed) + 1; + PagesUsed = InterlockedIncrementUL(&MiMemoryConsumers[Consumer].PagesUsed); if (PagesUsed > MiMemoryConsumers[Consumer].PagesTarget && !MiIsBalancerThread()) { @@ -275,6 +275,7 @@ if (!CanWait) { (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); + MmRebalanceMemoryConsumers(); return(STATUS_NO_MEMORY); }

1 0

[rmessiant] 54590: [REGEDIT] - Prevent buffer overflow when creating the display value for a value of type REG_MULTI_SZ. - Prevent processing excess data when preparing a value of type REG_MULTI_SZ...
by rmessiant＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: rmessiant Date: Sun Dec 4 19:19:33 2011 New Revision: 54590 URL: http://svn.reactos.org/svn/reactos?rev=54590&view=rev Log: [REGEDIT] - Prevent buffer overflow when creating the display value for a value of type REG_MULTI_SZ. - Prevent processing excess data when preparing a value of type REG_MULTI_SZ for editing. Modified: trunk/reactos/base/applications/regedit/edit.c trunk/reactos/base/applications/regedit/listview.c Modified: trunk/reactos/base/applications/regedit/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] Sun Dec 4 19:19:33 2011 @@ -1127,7 +1127,7 @@ size_t llen, listlen, nl_len; LPTSTR src, lines = NULL; - if (!(stringValueData = HeapAlloc(GetProcessHeap(), 0, valueDataLen))) + if (!(stringValueData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, valueDataLen + sizeof(TCHAR)))) { error(hwnd, IDS_TOO_BIG_VALUE, valueDataLen); goto done; Modified: trunk/reactos/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] Sun Dec 4 19:19:33 2011 @@ -186,7 +186,7 @@ if(dwCount >= 2) { src = (LPTSTR)ValBuf; - str = HeapAlloc(GetProcessHeap(), 0, dwCount); + str = HeapAlloc(GetProcessHeap(), 0, dwCount + sizeof(TCHAR)); if(str != NULL) { *str = _T('\0');

1 0

[cgutman] 54589: [NTOSKRNL] - Print a warning and signal RosMm to trim pages if we drop below MmMinimumFreePages in MiRemovePageByColor and MiUnlinkFreeOrZeroedPage
by cgutman＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: cgutman Date: Sun Dec 4 19:06:40 2011 New Revision: 54589 URL: http://svn.reactos.org/svn/reactos?rev=54589&view=rev Log: [NTOSKRNL] - Print a warning and signal RosMm to trim pages if we drop below MmMinimumFreePages in MiRemovePageByColor and MiUnlinkFreeOrZeroedPage Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Sun Dec 4 19:06:40 2011 @@ -206,6 +206,11 @@ if (--MmAvailablePages < MmMinimumFreePages) { /* FIXME: Should wake up the MPW and working set manager, if we had one */ + + DPRINT1("Running low on pages: %d remaining\n", MmAvailablePages); + + /* Call RosMm and see if it can release any pages for us */ + MmRebalanceMemoryConsumers(); } #if MI_TRACE_PFNS @@ -330,6 +335,11 @@ if (--MmAvailablePages < MmMinimumFreePages) { /* FIXME: Should wake up the MPW and working set manager, if we had one */ + + DPRINT1("Running low on pages: %d remaining\n", MmAvailablePages); + + /* Call RosMm and see if it can release any pages for us */ + MmRebalanceMemoryConsumers(); } #if MI_TRACE_PFNS

1 0

[ion] 54588: [RTL]: Clarify a comment.
by ion＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: ion Date: Sun Dec 4 17:25:15 2011 New Revision: 54588 URL: http://svn.reactos.org/svn/reactos?rev=54588&view=rev Log: [RTL]: Clarify a comment. Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=54588&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Sun Dec 4 17:25:15 2011 @@ -890,7 +890,14 @@ Length = CurDir->DosPath.Length / sizeof(WCHAR); ASSERT((CurDirName != NULL) && (Length > 0)); - /* Check for x:\ vs x:\path\foo (note the trailing slash) */ + /* + * DosPath.Buffer should always have a trailing slash. There is an assert + * below which checks for this. + * + * This function either returns x:\ for a root (keeping the original buffer) + * or it returns x:\path\foo for a directory (replacing the trailing slash + * with a NULL. + */ Bytes = Length * sizeof(WCHAR); if ((Length <= 1) || (CurDirName[Length - 2] == L':')) {

1 0

[ion] 54587: [KERNEL32]: Fix many bugs in BasepInitailizeEnvironment (and rename to BasePushProcessParameters): - Depending on how big the full path is, either the application path or the full path...
by ion＠svn.reactos.org 04 Dec '11

04 Dec '11

Author: ion Date: Sun Dec 4 16:34:58 2011 New Revision: 54587 URL: http://svn.reactos.org/svn/reactos?rev=54587&view=rev Log: [KERNEL32]: Fix many bugs in BasepInitailizeEnvironment (and rename to BasePushProcessParameters): - Depending on how big the full path is, either the application path or the full path should be used. Size the buffers correctly, too. - If the caller did not specify a window title, should use the app path as title. - Clear the current directory handle if InheritHandles is false. - Correctly handle CREATE_NEW_PROCESS_GROUP and CREATE_NEW_CONSOLE. - Check the failure codes of many APIs that we just assumed returned success. - STARTF_USEHOTKEY | STARTF_SHELLPRIVATE should be checked when inheriting console handles. - Handle 1MB and 16MB reservation requests. - Bugs remain: ImageSubsystem not written, and failure will leak. To be fixed later. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Dec 4 16:34:58 2011 @@ -16,13 +16,13 @@ #define NDEBUG #include <debug.h> - typedef INT (WINAPI *MessageBoxW_Proc) (HWND, LPCWSTR, LPCWSTR, UINT); /* GLOBALS *******************************************************************/ static UNICODE_STRING CommandLineStringW; static ANSI_STRING CommandLineStringA; +UNICODE_STRING BasePathVariableName = RTL_CONSTANT_STRING(L"PATH"); static BOOL bCommandLineInitialized = FALSE; @@ -33,7 +33,6 @@ VOID WINAPI RegisterWaitForInputIdle(WaitForInputIdleType lpfnRegisterWaitForInputIdle); -UNICODE_STRING BasePathVariableName = RTL_CONSTANT_STRING(L"PATH"); PLDR_DATA_TABLE_ENTRY BasepExeLdrEntry; #define CMD_STRING L"cmd /c " @@ -219,13 +218,13 @@ { return NULL; } - + Status = BasepNotifyCsrOfThread(hThread, ClientId); if (!NT_SUCCESS(Status)) { ASSERT(FALSE); } - + /* Success */ return hThread; } @@ -580,15 +579,17 @@ DPRINT("BasepCopyHandles %p %p, %d\n", Params, PebParams, InheritHandles); /* Copy the handle if we are inheriting or if it's a console handle */ - if (InheritHandles || IsConsoleHandle(PebParams->StandardInput)) + if ((InheritHandles) || (IsConsoleHandle(PebParams->StandardInput))) { Params->StandardInput = PebParams->StandardInput; } - if (InheritHandles || IsConsoleHandle(PebParams->StandardOutput)) + + if ((InheritHandles) || (IsConsoleHandle(PebParams->StandardOutput))) { Params->StandardOutput = PebParams->StandardOutput; } - if (InheritHandles || IsConsoleHandle(PebParams->StandardError)) + + if ((InheritHandles) || (IsConsoleHandle(PebParams->StandardError))) { Params->StandardError = PebParams->StandardError; } @@ -596,18 +597,18 @@ NTSTATUS WINAPI -BasepInitializeEnvironment(HANDLE ProcessHandle, - PPEB Peb, - LPWSTR ApplicationPathName, - LPWSTR lpCurrentDirectory, - LPWSTR lpCommandLine, - LPVOID lpEnvironment, - SIZE_T EnvSize, - LPSTARTUPINFOW StartupInfo, - DWORD CreationFlags, - BOOL InheritHandles) -{ - WCHAR FullPath[MAX_PATH]; +BasePushProcessParameters(IN HANDLE ProcessHandle, + IN PPEB Peb, + IN LPWSTR ApplicationPathName, + IN LPWSTR lpCurrentDirectory, + IN LPWSTR lpCommandLine, + IN LPVOID lpEnvironment, + IN SIZE_T EnvSize, + IN LPSTARTUPINFOW StartupInfo, + IN DWORD CreationFlags, + IN BOOL InheritHandles) +{ + WCHAR FullPath[MAX_PATH + 5]; LPWSTR Remaining; LPWSTR DllPathString; PRTL_USER_PROCESS_PARAMETERS ProcessParameters; @@ -620,23 +621,34 @@ UNICODE_STRING Desktop, Shell, Runtime, Title; PPEB OurPeb = NtCurrentPeb(); LPVOID Environment = lpEnvironment; - - DPRINT("BasepInitializeEnvironment\n"); + DPRINT("BasePushProcessParameters\n"); /* Get the full path name */ - GetFullPathNameW(ApplicationPathName, - MAX_PATH, - FullPath, - &Remaining); - DPRINT("ApplicationPathName: %S, FullPath: %S\n", ApplicationPathName, - FullPath); - - /* Get the DLL Path */ - DllPathString = BasepGetDllPath(FullPath, Environment); + Size = GetFullPathNameW(ApplicationPathName, + MAX_PATH + 4, + FullPath, + &Remaining); + if ((Size) && (Size <= (MAX_PATH + 4))) + { + /* Get the DLL Path */ + DllPathString = BasepGetDllPath(ApplicationPathName, Environment); + + /* Initialize Strings */ + RtlInitUnicodeString(&DllPath, DllPathString); + RtlInitUnicodeString(&ImageName, ApplicationPathName); + } + else + { + /* Get the DLL Path */ + DllPathString = BasepGetDllPath(FullPath, Environment); + + /* Initialize Strings */ + RtlInitUnicodeString(&DllPath, DllPathString); + RtlInitUnicodeString(&ImageName, FullPath); + } + DPRINT("DllPath: %wZ, ImageName: %wZ\n", DllPath, ImageName); /* Initialize Strings */ - RtlInitUnicodeString(&DllPath, DllPathString); - RtlInitUnicodeString(&ImageName, FullPath); RtlInitUnicodeString(&CommandLine, lpCommandLine); RtlInitUnicodeString(&CurrentDirectory, lpCurrentDirectory); @@ -663,7 +675,7 @@ } else { - RtlInitUnicodeString(&Title, L""); + RtlInitUnicodeString(&Title, ApplicationPathName); } /* This one is special because the length can differ */ @@ -685,50 +697,22 @@ &Desktop, &Shell, &Runtime); - if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create process parameters!\n"); return Status; } - /* Check if we got an environment. If not, use ours */ + /* Clear the current directory handle if not inheriting */ + if (!InheritHandles) ProcessParameters->CurrentDirectory.Handle = NULL; + + /* Save pointer and start lookup */ + Environment = ScanChar = ProcessParameters->Environment; if (Environment) { - /* Save pointer and start lookup */ - Environment = ScanChar = ProcessParameters->Environment; - } - else - { - /* Save pointer and start lookup */ - Environment = ScanChar = OurPeb->ProcessParameters->Environment; - } - - /* Find the environment size */ - if (ScanChar) - { - if (EnvSize && Environment == lpEnvironment) - { - /* its a converted ansi environment, bypass the length calculation */ - EnviroSize = EnvSize; - } - else - { - while (*ScanChar) - { - ScanChar += wcslen(ScanChar) + 1; - } - - /* Calculate the size of the block */ - if (ScanChar == Environment) - { - EnviroSize = 2 * sizeof(WCHAR); - } - else - { - EnviroSize = (ULONG)((ULONG_PTR)ScanChar - (ULONG_PTR)Environment + sizeof(WCHAR)); - } - } + /* Find the environment size */ + while (*ScanChar) ScanChar += wcslen(ScanChar) + 1; + EnviroSize = (ULONG_PTR)ScanChar - (ULONG_PTR)Environment; DPRINT("EnvironmentSize %ld\n", EnviroSize); /* Allocate and Initialize new Environment Block */ @@ -743,15 +727,20 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to allocate Environment Block\n"); - return(Status); + return Status; } /* Write the Environment Block */ - ZwWriteVirtualMemory(ProcessHandle, - ProcessParameters->Environment, - Environment, - EnviroSize, - NULL); + Status = ZwWriteVirtualMemory(ProcessHandle, + ProcessParameters->Environment, + Environment, + EnviroSize, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to write Environment Block\n"); + return Status; + } } /* Write new parameters */ @@ -766,7 +755,8 @@ ProcessParameters->ShowWindowFlags = StartupInfo->wShowWindow; /* Write the handles only if we have to */ - if (StartupInfo->dwFlags & STARTF_USESTDHANDLES) + if (StartupInfo->dwFlags & + (STARTF_USESTDHANDLES | STARTF_USEHOTKEY | STARTF_SHELLPRIVATE)) { DPRINT("Using Standard Handles\n"); ProcessParameters->StandardInput = StartupInfo->hStdInput; @@ -794,7 +784,7 @@ /* Is the shell trampling on our Handles? */ if (!(StartupInfo->dwFlags & - (STARTF_USESTDHANDLES | STARTF_USEHOTKEY | STARTF_SHELLPRIVATE))) + (STARTF_USESTDHANDLES | STARTF_USEHOTKEY | STARTF_SHELLPRIVATE))) { /* Use handles from PEB, if inheriting or they are console */ DPRINT("Copying handles from parent\n"); @@ -805,9 +795,22 @@ } /* Also set the Console Flag */ - if (CreationFlags & CREATE_NEW_PROCESS_GROUP) + if ((CreationFlags & CREATE_NEW_PROCESS_GROUP) && + (!(CreationFlags & CREATE_NEW_CONSOLE))) { ProcessParameters->ConsoleFlags = 1; + } + + /* See if the first 1MB should be reserved */ + if ((ULONG_PTR)ApplicationPathName & 1) + { + ProcessParameters->Flags |= RTL_USER_PROCESS_PARAMETERS_RESERVE_1MB; + } + + /* See if the first 16MB should be reserved */ + if ((ULONG_PTR)ApplicationPathName & 2) + { + ProcessParameters->Flags |= RTL_USER_PROCESS_PARAMETERS_RESERVE_16MB; } /* Allocate memory for the parameter block */ @@ -821,14 +824,13 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to allocate Parameters Block\n"); - return(Status); + return Status; } /* Set the allocated size */ ProcessParameters->MaximumLength = Size; /* Handle some Parameter Flags */ - ProcessParameters->ConsoleFlags = (CreationFlags & CREATE_NEW_PROCESS_GROUP); ProcessParameters->Flags |= (CreationFlags & PROFILE_USER) ? RTL_USER_PROCESS_PARAMETERS_PROFILE_USER : 0; ProcessParameters->Flags |= (CreationFlags & PROFILE_KERNEL) ? @@ -844,6 +846,11 @@ ProcessParameters, ProcessParameters->Length, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to write Parameters Block\n"); + return Status; + } /* Write the PEB Pointer */ Status = NtWriteVirtualMemory(ProcessHandle, @@ -851,6 +858,14 @@ &RemoteParameters, sizeof(PVOID), NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to write Parameters Block\n"); + return Status; + } + + /* FIXME: Write Peb->ImageSubSystem */ + /* Cleanup */ RtlFreeHeap(RtlGetProcessHeap(), 0, DllPath.Buffer); @@ -2836,17 +2851,17 @@ /* Create Process Environment */ RemotePeb = ProcessBasicInfo.PebBaseAddress; - Status = BasepInitializeEnvironment(hProcess, - RemotePeb, - (LPWSTR)lpApplicationName, - CurrentDirectory, - (QuotesNeeded || CmdLineIsAppName || Escape) ? - QuotedCmdLine : lpCommandLine, - lpEnvironment, - EnvSize, - &StartupInfo, - dwCreationFlags, - bInheritHandles); + Status = BasePushProcessParameters(hProcess, + RemotePeb, + (LPWSTR)lpApplicationName, + CurrentDirectory, + (QuotesNeeded || CmdLineIsAppName || Escape) ? + QuotedCmdLine : lpCommandLine, + lpEnvironment, + EnvSize, + &StartupInfo, + dwCreationFlags, + bInheritHandles); /* Cleanup Environment */ if (lpEnvironment && !(dwCreationFlags & CREATE_UNICODE_ENVIRONMENT)) @@ -2906,7 +2921,7 @@ BaseSetLastNTError(Status); goto Cleanup; } - + /* Create the first thread */ DPRINT("Creating thread for process (EntryPoint = 0x%p)\n", SectionImageInfo.TransferAddress);

1 0

← Newer
1
...
18
19
20
21
22
23
24
25
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 December 2011