imagehlp-ImageLoad: Add dependency on imagehlp-Cleanup and remove a couple of todo_wines.

patches/imagehlp-ImageLoad/0001-imagehlp-tests-Add-tests-for-ImageLoad-ImageUnload-G.patch

@@ -1,15 +1,15 @@
-From 1000f8248d714ee0c17ab5fce6c79d7a310666c9 Mon Sep 17 00:00:00 2001
+From c7cb245f53d0a512be8b80fc4339ca7293186a08 Mon Sep 17 00:00:00 2001
 From: Mark Jansen <learn0more@gmail.com>
 Date: Thu, 14 May 2015 00:53:20 +0200
 Subject: imagehlp/tests: Add tests for ImageLoad, ImageUnload,
  GetImageUnusedHeaderBytes.
 
 ---
- dlls/imagehlp/tests/image.c | 103 ++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 103 insertions(+)
+ dlls/imagehlp/tests/image.c | 97 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 97 insertions(+)
 
 diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c
-index 48443f5..74068dd 100644
+index 3416c10..7a6019b 100644
 --- a/dlls/imagehlp/tests/image.c
 +++ b/dlls/imagehlp/tests/image.c
 @@ -33,6 +33,10 @@ static HMODULE hImageHlp;
@@ -23,7 +23,7 @@ index 48443f5..74068dd 100644
  
  /* minimal PE file image */
  #define VA_START 0x400000
-@@ -427,6 +431,101 @@ static void test_bind_image_ex(void)
+@@ -424,6 +428,95 @@ static void test_bind_image_ex(void)
      DeleteFileA(temp_file);
  }
  
@@ -60,10 +60,8 @@ index 48443f5..74068dd 100644
 +
 +    if (img)
 +    {
-+        todo_wine
 +        ok(!strcmp(img->ModuleName, temp_file),
 +           "unexpected ModuleName, got %s instead of %s\n", img->ModuleName, temp_file);
-+        todo_wine
 +        ok(img->MappedAddress != NULL, "MappedAddress != NULL\n");
 +        if (img->MappedAddress)
 +        {
@@ -73,11 +71,9 @@ index 48443f5..74068dd 100644
 +        ok(img->FileHeader != NULL, "FileHeader != NULL\n");
 +        if (img->FileHeader)
 +        {
-+            todo_wine
 +            ok(!memcmp(img->FileHeader, &bin.nt_headers, sizeof(bin.nt_headers)),
 +                "FileHeader doesn't point to IMAGE_NT_HEADERS32\n");
 +        }
-+        todo_wine
 +        ok(img->NumberOfSections == 3,
 +           "unexpected NumberOfSections, got %d instead of 3\n", img->NumberOfSections);
 +        if (img->NumberOfSections >= 3)
@@ -92,7 +88,6 @@ index 48443f5..74068dd 100644
 +               "unexpected name for section 2, expected .idata, got %s\n",
 +               (const char *)img->Sections[2].Name);
 +        }
-+        todo_wine
 +        ok(img->Characteristics == 0x102,
 +           "unexpected Characteristics, got 0x%x instead of 0x102\n", img->Characteristics);
 +        ok(img->fSystemImage == 0,
@@ -105,7 +100,6 @@ index 48443f5..74068dd 100644
 +        todo_wine
 +        ok(img->Version == 1 || broken(!img->Version) /* <= WinXP */,
 +           "unexpected Version, got %d instead of 1\n", img->Version);
-+        todo_wine
 +        ok(img->SizeOfImage == 0x600,
 +           "unexpected SizeOfImage, got 0x%x instead of 0x600\n", img->SizeOfImage);
 +
@@ -125,7 +119,7 @@ index 48443f5..74068dd 100644
  START_TEST(image)
  {
      hImageHlp = LoadLibraryA("imagehlp.dll");
-@@ -439,9 +538,13 @@ START_TEST(image)
+@@ -436,9 +529,13 @@ START_TEST(image)
  
      pImageGetDigestStream = (void *) GetProcAddress(hImageHlp, "ImageGetDigestStream");
      pBindImageEx = (void *) GetProcAddress(hImageHlp, "BindImageEx");
@@ -140,5 +134,5 @@ index 48443f5..74068dd 100644
      FreeLibrary(hImageHlp);
  }
 -- 
-2.4.0
+2.8.0
 

patches/imagehlp-ImageLoad/definition

@@ -0,0 +1 @@
+Depends: imagehlp-Cleanup

patches/patchinstall.sh

@@ -2215,6 +2215,13 @@ if test "$enable_ntdll_FileDispositionInformation" -eq 1; then
 	enable_server_File_Permissions=1
 fi
 
+if test "$enable_imagehlp_ImageLoad" -eq 1; then
+	if test "$enable_imagehlp_Cleanup" -gt 1; then
+		abort "Patchset imagehlp-Cleanup disabled, but imagehlp-ImageLoad depends on that."
+	fi
+	enable_imagehlp_Cleanup=1
+fi
+
 if test "$enable_gdiplus_GdipCreateMetafileFromStream" -eq 1; then
 	if test "$enable_oleaut32_OLEPictureImpl_SaveAsFile" -gt 1; then
 		abort "Patchset oleaut32-OLEPictureImpl_SaveAsFile disabled, but gdiplus-GdipCreateMetafileFromStream depends on that."
@@ -3871,6 +3878,9 @@ fi
 
 # Patchset imagehlp-ImageLoad
 # |
+# | This patchset has the following (direct or indirect) dependencies:
+# |   *	imagehlp-Cleanup
+# |
 # | Modified files:
 # |   *	dlls/imagehlp/tests/image.c
 # |