Alexandre Julliard : libwine: Add support for relocating MS-style imports that use OriginalFirstThunk.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: ed8204b9de40d9e83630ffe2deecdd0bf021049e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ed8204b9de40d9e83630ffe2de...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Thu Sep  4 21:52:36 2008 +0200

libwine: Add support for relocating MS-style imports that use OriginalFirstThunk.
(cherry picked from commit 4eb350b86b50edf84a5587f54483c22ecb5a2750)

---

 libs/wine/loader.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libs/wine/loader.c b/libs/wine/loader.c
index 0f05f0c..dde5a70 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;