From 4e17aba4b55003dde8de2671e968c75245fdfcae Mon Sep 17 00:00:00 2001 From: Ray Ni Date: Mon, 5 Dec 2022 14:51:18 +0800 Subject: [PATCH] EmulatorPkg/Win: Unload DLLs before reset EmulatorPkg/Win calls LoadLibraryEx() when the corresponding DLL file is found for each PEIM or DXE driver. The module entry point is changed to point to the entry point from the DLL. This helps to notify Visual Studio that a new windows module is loaded and corresponding symbol parsing is performed for source level debugging. But entry point from the DLL is only executed when the module is not loaded by AddModHandle(). When reset happens, we need to clear the DLL loading so that in next boot the module can be loaded again by AddModHandle(). Without this patch, source level debugging doesn't work after reset. Signed-off-by: Ray Ni Reviewed-by: Zhiguang Liu Cc: Andrew Fish --- EmulatorPkg/Win/Host/WinHost.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/EmulatorPkg/Win/Host/WinHost.c b/EmulatorPkg/Win/Host/WinHost.c index 096292f95a..084cd4cbd7 100644 --- a/EmulatorPkg/Win/Host/WinHost.c +++ b/EmulatorPkg/Win/Host/WinHost.c @@ -226,12 +226,26 @@ WinReset ( IN VOID *ResetData OPTIONAL ) { + UINTN Index; + ASSERT (ResetType <= EfiResetPlatformSpecific); SecPrint (" Emu ResetSystem is called: ResetType = %s\n", mResetTypeStr[ResetType]); if (ResetType == EfiResetShutdown) { exit (0); } else { + // + // Unload all DLLs + // + for (Index = 0; Index < mPdbNameModHandleArraySize; Index++) { + if (mPdbNameModHandleArray[Index].PdbPointer != NULL) { + SecPrint (" Emu Unload DLL: %s\n", mPdbNameModHandleArray[Index].PdbPointer); + FreeLibrary (mPdbNameModHandleArray[Index].ModHandle); + HeapFree (GetProcessHeap (), 0, mPdbNameModHandleArray[Index].PdbPointer); + mPdbNameModHandleArray[Index].PdbPointer = NULL; + } + } + // // Jump back to SetJump with jump code = ResetType + 1 //