Francois Gouget : shell32: Fix compilation on systems that don' t support nameless unions.

Alexandre Julliard julliard at winehq.org
Mon Oct 19 09:56:12 CDT 2009


Module: wine
Branch: master
Commit: 915b69e2a72dabe9fb03ce1b52558f1d2040817e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=915b69e2a72dabe9fb03ce1b52558f1d2040817e

Author: Francois Gouget <fgouget at free.fr>
Date:   Sat Oct 17 20:28:22 2009 +0200

shell32: Fix compilation on systems that don't support nameless unions.

---

 dlls/shell32/tests/shlexec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c
index 7d9e7b2..5e97f61 100644
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -1408,7 +1408,7 @@ static void hook_WaitForInputIdle(void *new_func)
 
     /* Search for the correct imported module by walking the import descriptors */
     import_descriptor = (PIMAGE_IMPORT_DESCRIPTOR)(base + import_directory_rva);
-    while (import_descriptor->OriginalFirstThunk != 0)
+    while (U(*import_descriptor).OriginalFirstThunk != 0)
     {
         char *import_module_name;
 
@@ -1423,7 +1423,7 @@ static void hook_WaitForInputIdle(void *new_func)
              * arrays. We need the import name table to find the imported
              * routine and the import address table to patch the address, so
              * walk them side by side */
-            int_entry = (PIMAGE_THUNK_DATA)(base + import_descriptor->OriginalFirstThunk);
+            int_entry = (PIMAGE_THUNK_DATA)(base + U(*import_descriptor).OriginalFirstThunk);
             iat_entry = (PIMAGE_THUNK_DATA)(base + import_descriptor->FirstThunk);
             while (int_entry->u1.Ordinal != 0)
             {




More information about the wine-cvs mailing list