Rebase against c7f323107b3b956d206d8d0ee28851d60f19841c

2025-09-12 18:50:20 -07:00 · 2019-03-26 12:56:49 +11:00
parent d963a250c9
commit 0d4d90ee80
7 changed files with 77 additions and 378 deletions
--- a/patches/imagehlp-Cleanup/0003-imagehlp-Implement-ImageLoad-and-cleanup-ImageUnload.patch
+++ b/patches/imagehlp-Cleanup/0003-imagehlp-Implement-ImageLoad-and-cleanup-ImageUnload.patch
@@ -1,131 +0,0 @@
-From 9156b97f5aab56ae2ab8b981b625bd46e1ef2056 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Tue, 11 Aug 2015 04:35:45 +0200
-Subject: imagehlp: Implement ImageLoad and cleanup ImageUnload.
-
---
- dlls/imagehlp/access.c | 85 ++++++++++++++++++++++++++++----------------------
- 1 file changed, 48 insertions(+), 37 deletions(-)
-
-diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c
-index 6a33c0c..897f2d5 100644
--- a/dlls/imagehlp/access.c
-+++ b/dlls/imagehlp/access.c
-@@ -33,8 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
- /***********************************************************************
-  *           Data
-  */
-
-static PLOADED_IMAGE IMAGEHLP_pFirstLoadedImage=NULL;
-+LIST_ENTRY image_list = { &image_list, &image_list };
- 
- DECLSPEC_HIDDEN extern HANDLE IMAGEHLP_hHeap;
- 
-@@ -69,57 +68,69 @@ DWORD WINAPI GetImageUnusedHeaderBytes(
- /***********************************************************************
-  *		ImageLoad (IMAGEHLP.@)
-  */
-PLOADED_IMAGE WINAPI ImageLoad(PCSTR DllName, PCSTR DllPath)
-+PLOADED_IMAGE WINAPI ImageLoad(PCSTR dll_name, PCSTR dll_path)
- {
-  PLOADED_IMAGE pLoadedImage;
-
-  FIXME("(%s, %s): stub\n", DllName, DllPath);
-	  
-  pLoadedImage = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(LOADED_IMAGE));
-  if (pLoadedImage)
-    pLoadedImage->FileHeader = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(IMAGE_NT_HEADERS));
-  
-  return pLoadedImage;
-+    LOADED_IMAGE *image;
-+
-+    TRACE("(%s, %s)\n", dll_name, dll_path);
-+
-+    image = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(*image));
-+    if (!image) return NULL;
-+
-+    if (!MapAndLoad(dll_name, dll_path, image, TRUE, TRUE))
-+    {
-+        HeapFree(IMAGEHLP_hHeap, 0, image);
-+        return NULL;
-+    }
-+
-+    image->Links.Flink = image_list.Flink;
-+    image->Links.Blink = &image_list;
-+    image_list.Flink->Blink = &image->Links;
-+    image_list.Flink = &image->Links;
-+
-+    return image;
- }
- 
- /***********************************************************************
-  *		ImageUnload (IMAGEHLP.@)
-  */
-BOOL WINAPI ImageUnload(PLOADED_IMAGE pLoadedImage)
-+BOOL WINAPI ImageUnload(PLOADED_IMAGE loaded_image)
- {
-  LIST_ENTRY *pCurrent, *pFind;
-+    LIST_ENTRY *entry, *mark;
-+    PLOADED_IMAGE image;
-+
-+    FIXME("(%p)\n", loaded_image);
- 
-  TRACE("(%p)\n", pLoadedImage);
-  
-  if(!IMAGEHLP_pFirstLoadedImage || !pLoadedImage)
-+    if (!loaded_image)
-     {
-      /* No image loaded or null pointer */
-      SetLastError(ERROR_INVALID_PARAMETER);
-      return FALSE;
-+        /* No image loaded or null pointer */
-+        SetLastError(ERROR_INVALID_PARAMETER);
-+        return FALSE;
-     }
- 
-  pFind=&pLoadedImage->Links;
-  pCurrent=&IMAGEHLP_pFirstLoadedImage->Links;
-  while((pCurrent != pFind) &&
-    (pCurrent != NULL))
-      pCurrent = pCurrent->Flink;
-  if(!pCurrent)
-+    /* FIXME: do we really need to check this? */
-+    mark = &image_list;
-+    for (entry = mark->Flink; entry != mark; entry = entry->Flink)
-     {
-      /* Not found */
-      SetLastError(ERROR_INVALID_PARAMETER);
-      return FALSE;
-+        image = CONTAINING_RECORD(entry, LOADED_IMAGE, Links);
-+        if (image == loaded_image)
-+            break;
-     }
- 
-  if(pCurrent->Blink)
-    pCurrent->Blink->Flink = pCurrent->Flink;
-  else
-    IMAGEHLP_pFirstLoadedImage = pCurrent->Flink?CONTAINING_RECORD(
-      pCurrent->Flink, LOADED_IMAGE, Links):NULL;
-+    if (entry == mark)
-+    {
-+        /* Not found */
-+        SetLastError(ERROR_INVALID_PARAMETER);
-+        return FALSE;
-+    }
- 
-  if(pCurrent->Flink)
-    pCurrent->Flink->Blink = pCurrent->Blink;
-+    entry->Blink->Flink = entry->Flink;
-+    entry->Flink->Blink = entry->Blink;
- 
-  return FALSE;
-+    UnMapAndLoad(loaded_image);
-+    HeapFree(IMAGEHLP_hHeap, 0, loaded_image);
-+
-+    return TRUE;
- }
- 
- /***********************************************************************
-- 
-2.5.0
-