From 4eb350b86b50edf84a5587f54483c22ecb5a2750 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 4 Sep 2008 21:52:36 +0200
Subject: [PATCH] libwine: Add support for relocating MS-style imports that use
 OriginalFirstThunk.

---
 libs/wine/loader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/wine/loader.c b/libs/wine/loader.c
index 0f05f0c4b5c..dde5a70d04e 100644
--- a/libs/wine/loader.c
+++ b/libs/wine/loader.c
@@ -277,7 +277,7 @@ static void fixup_imports( IMAGE_IMPORT_DESCRIPTOR *dir, BYTE *base, int delta )
         fixup_rva_dwords( &dir->u.OriginalFirstThunk, delta, 1 );
         fixup_rva_dwords( &dir->Name, delta, 1 );
         fixup_rva_dwords( &dir->FirstThunk, delta, 1 );
-        ptr = (UINT_PTR *)(base + dir->FirstThunk);
+        ptr = (UINT_PTR *)(base + (dir->u.OriginalFirstThunk ? dir->u.OriginalFirstThunk : dir->FirstThunk));
         while (*ptr)
         {
             if (!(*ptr & IMAGE_ORDINAL_FLAG)) *ptr += delta;