Alexandre Julliard : ntdll: Try any address in map_image no matter what the failure was for a fixed address .

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Wed May 27 21:17:09 2009 +0200

ntdll: Try any address in map_image no matter what the failure was for a fixed address.

---

dlls/ntdll/virtual.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index 0475bd9..33918ca 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -1004,7 +1004,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz
         status = map_view( &view, base, total_size, mask, FALSE,
                            VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY | VPROT_IMAGE );

-    if (status == STATUS_CONFLICTING_ADDRESSES)
+    if (status != STATUS_SUCCESS)
         status = map_view( &view, NULL, total_size, mask, FALSE,
                            VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY | VPROT_IMAGE );