[SCM] GNU Libtool branch, master, updated. v2.2.6-192-gf21029c

[Peter Rosin]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  f21029c498c2cf9f0481a203f91f538f0c290d58 (commit)
       via  3f0fa1bae41684e2ec5dba6d4f01c0d35fde7599 (commit)
      from  d5ca75c82dfb86fb66d69d6ff62ac16a5bdcc8e0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f21029c498c2cf9f0481a203f91f538f0c290d58
Author: Peter Rosin <address@hidden>
Date:   Wed Mar 17 09:01:57 2010 +0100

    Preserve the last error when restoring the error mode.
    
    * libltdl/loaders/loadlibrary.c (wm_open): Don't rely on
    SetThreadErrorMode (or SetErrorMode) to not clobber the last
    error.
    Report by Ralf Wildenhues.
    
    Signed-off-by: Peter Rosin <address@hidden>

commit 3f0fa1bae41684e2ec5dba6d4f01c0d35fde7599
Author: Peter Rosin <address@hidden>
Date:   Wed Mar 17 08:54:16 2010 +0100

    Use Get/SetThreadErrorMode if they are available.
    
    * libltdl/loaders/loadlibrary.c (wrap_geterrormode): Replaced...
    (wrap_getthreaderrormode): ...by this function that checks
    first for GetThreadErrorMode, then GetErrorMode and makes use
    of either of those or...
    (fallback_getthreaderrormode): ...else falls back to this
    replacement function that implements the old workaround, which
    was previously implemented in...
    (fallback_geterrormode): ...this now renamed function.
    (geterrormode): Replaced...
    (getthreaderrormode): ...by this function pointer that points
    at either of wrap_getthreaderrormode, GetThreadErrorMode,
    GetErrorMode or fallback_getthreaderrormode.
    (wrap_setthreaderrormode): New function that checks if
    SetThreadErrorMode is supported by the system and makes use of
    it if it is.
    (fallback_setthreaderrormode): New function that is used
    otherwise that implements the old version using SetErrorMode.
    (setthreaderrormode): New function pointer that points at
    either of wrap_setthreaderrormode, SetThreadErrorMode or
    fallback_setthreaderrormode.
    (vm_open): Adjust to the above.
    
    Signed-off-by: Peter Rosin <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                     |   31 ++++++++++++++
 libltdl/loaders/loadlibrary.c |   92 ++++++++++++++++++++++++++++++-----------
 2 files changed, 99 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e5d92c..5c36a74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2010-03-17  Peter Rosin  <address@hidden>
+
+       Preserve the last error when restoring the error mode.
+       * libltdl/loaders/loadlibrary.c (wm_open): Don't rely on
+       SetThreadErrorMode (or SetErrorMode) to not clobber the last
+       error.
+       Report by Ralf Wildenhues.
+
+       Use Get/SetThreadErrorMode if they are available.
+       * libltdl/loaders/loadlibrary.c (wrap_geterrormode): Replaced...
+       (wrap_getthreaderrormode): ...by this function that checks
+       first for GetThreadErrorMode, then GetErrorMode and makes use
+       of either of those or...
+       (fallback_getthreaderrormode): ...else falls back to this
+       replacement function that implements the old workaround, which
+       was previously implemented in...
+       (fallback_geterrormode): ...this now renamed function.
+       (geterrormode): Replaced...
+       (getthreaderrormode): ...by this function pointer that points
+       at either of wrap_getthreaderrormode, GetThreadErrorMode,
+       GetErrorMode or fallback_getthreaderrormode.
+       (wrap_setthreaderrormode): New function that checks if
+       SetThreadErrorMode is supported by the system and makes use of
+       it if it is.
+       (fallback_setthreaderrormode): New function that is used
+       otherwise that implements the old version using SetErrorMode.
+       (setthreaderrormode): New function pointer that points at
+       either of wrap_setthreaderrormode, SetThreadErrorMode or
+       fallback_setthreaderrormode.
+       (vm_open): Adjust to the above.
+
 2010-02-28  Ralf Wildenhues  <address@hidden>
 
        Detect Sun compiler suite with 'sun'-prefixed names.
diff --git a/libltdl/loaders/loadlibrary.c b/libltdl/loaders/loadlibrary.c
index 139851a..179c009 100644
--- a/libltdl/loaders/loadlibrary.c
+++ b/libltdl/loaders/loadlibrary.c
@@ -104,12 +104,16 @@ get_vtable (lt_user_data loader_data)
 #define LOADLIB_SETERROR(errcode) LOADLIB__SETERROR (LT__STRERROR (errcode))
 
 static const char *loadlibraryerror (const char *default_errmsg);
-static UINT WINAPI wrap_geterrormode (void);
-static UINT WINAPI fallback_geterrormode (void);
+static DWORD WINAPI wrap_getthreaderrormode (void);
+static DWORD WINAPI fallback_getthreaderrormode (void);
+static BOOL WINAPI wrap_setthreaderrormode (DWORD mode, DWORD *oldmode);
+static BOOL WINAPI fallback_setthreaderrormode (DWORD mode, DWORD *oldmode);
 
-typedef UINT (WINAPI geterrormode_type) (void);
+typedef DWORD (WINAPI getthreaderrormode_type) (void);
+typedef BOOL (WINAPI setthreaderrormode_type) (DWORD, DWORD *);
 
-static geterrormode_type *geterrormode = wrap_geterrormode;
+static getthreaderrormode_type *getthreaderrormode = wrap_getthreaderrormode;
+static setthreaderrormode_type *setthreaderrormode = wrap_setthreaderrormode;
 static char *error_message = 0;
 
 
@@ -187,13 +191,17 @@ vm_open (lt_user_data LT__UNUSED loader_data, const char 
*filename,
 
   {
     /* Silence dialog from LoadLibrary on some failures. */
-    UINT errormode = geterrormode ();
-    SetErrorMode (errormode | SEM_FAILCRITICALERRORS);
+    DWORD errormode = getthreaderrormode ();
+    DWORD last_error;
+
+    setthreaderrormode (errormode | SEM_FAILCRITICALERRORS, NULL);
 
     module = LoadLibrary (wpath);
 
     /* Restore the error mode. */
-    SetErrorMode (errormode);
+    last_error = GetLastError ();
+    setthreaderrormode (errormode, NULL);
+    SetLastError (last_error);
   }
 
   /* libltdl expects this function to fail if it is unable
@@ -298,28 +306,64 @@ loadlibraryerror (const char *default_errmsg)
   return len ? error_message : default_errmsg;
 }
 
-/* A function called through the geterrormode variable which checks
-   if the system supports GetErrorMode and arranges for it or a
-   fallback implementation to be called directly in the future. The
-   selected version is then called. */
-static UINT WINAPI
-wrap_geterrormode (void)
+/* A function called through the getthreaderrormode variable which checks
+   if the system supports GetThreadErrorMode (or GetErrorMode) and arranges
+   for it or a fallback implementation to be called directly in the future.
+   The selected version is then called. */
+static DWORD WINAPI
+wrap_getthreaderrormode (void)
 {
   HMODULE kernel32 = GetModuleHandleA ("kernel32.dll");
-  geterrormode = (geterrormode_type *) GetProcAddress (kernel32,
-                                                       "GetErrorMode");
-  if (!geterrormode)
-    geterrormode = fallback_geterrormode;
-  return geterrormode ();
+  getthreaderrormode
+    = (getthreaderrormode_type *) GetProcAddress (kernel32,
+                                                 "GetThreadErrorMode");
+  if (!getthreaderrormode)
+    getthreaderrormode
+      = (getthreaderrormode_type *) GetProcAddress (kernel32,
+                                                   "GetErrorMode");
+  if (!getthreaderrormode)
+    getthreaderrormode = fallback_getthreaderrormode;
+  return getthreaderrormode ();
 }
 
-/* A function called through the geterrormode variable for cases
-   where the system does not support GetErrorMode */
-static UINT WINAPI
-fallback_geterrormode (void)
+/* A function called through the getthreaderrormode variable for cases
+   where the system does not support GetThreadErrorMode or GetErrorMode */
+static DWORD WINAPI
+fallback_getthreaderrormode (void)
 {
   /* Prior to Windows Vista, the only way to get the current error
      mode was to set a new one. In our case, we are setting a new
-     error mode right after "getting" it, so that's fairly ok. */
-  return SetErrorMode (SEM_FAILCRITICALERRORS);
+     error mode right after "getting" it while ignoring the error
+     mode in effect when setting the new error mode, so that's
+     fairly ok. */
+  return (DWORD) SetErrorMode (SEM_FAILCRITICALERRORS);
+}
+
+/* A function called through the setthreaderrormode variable which checks
+   if the system supports SetThreadErrorMode and arranges for it or a
+   fallback implementation to be called directly in the future.
+   The selected version is then called. */
+static BOOL WINAPI
+wrap_setthreaderrormode (DWORD mode, DWORD *oldmode)
+{
+  HMODULE kernel32 = GetModuleHandleA ("kernel32.dll");
+  setthreaderrormode
+    = (setthreaderrormode_type *) GetProcAddress (kernel32,
+                                                 "SetThreadErrorMode");
+  if (!setthreaderrormode)
+    setthreaderrormode = fallback_setthreaderrormode;
+  return setthreaderrormode (mode, oldmode);
+}
+
+/* A function called through the setthreaderrormode variable for cases
+   where the system does not support SetThreadErrorMode. */
+static BOOL WINAPI
+fallback_setthreaderrormode (DWORD mode, DWORD *oldmode)
+{
+  /* Prior to Windows 7, there was no way to set the thread local error
+     mode, so set the process global error mode instead. */
+  DWORD old = (DWORD) SetErrorMode (mode);
+  if (oldmode)
+    *oldmode = old;
+  return TRUE;
 }


hooks/post-receive
-- 
GNU Libtool