[ooo-build-commit] .: sal/osl

[Tor Lillqvist]

 sal/osl/w32/dllentry.c |    2 ++
 sal/osl/w32/module.cxx |    4 ++++
 2 files changed, 6 insertions(+)

New commits:
commit 2844f65c7411b0ec5b18221fa2373560b9dfcf2e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 29 14:55:43 2010 +0300

    We do want Windows error messages when built with debug=true
    
    From win32-no-seterror-when-debugging.diff.

diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c
index 3c1d119..fd43678 100644
--- a/sal/osl/w32/dllentry.c
+++ b/sal/osl/w32/dllentry.c
@@ -193,8 +193,10 @@ static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvR
                     osl_isSingleCPU = 1;
                 }
 #endif
+#if OSL_DEBUG_LEVEL < 2
                 /* Suppress file error messages from system like "Floppy A: not inserted" */
                 SetErrorMode( SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS );
+#endif
 
                 /* initialize global mutex */
                 g_Mutex = osl_createMutex();
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index be5a5b4..770b664 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -48,7 +48,9 @@
 oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMode )
 {
     HINSTANCE hInstance;
+#if OSL_DEBUG_LEVEL < 2
     UINT errorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS);
+#endif
     rtl_uString* Module = NULL;
     oslModule ret = 0;
     oslFileError	nError;
@@ -74,7 +76,9 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMod
 
     ret = (oslModule) hInstance;
     rtl_uString_release(Module);
+#if OSL_DEBUG_LEVEL < 2
     SetErrorMode(errorMode);
+#endif
 
     RTL_LOGFILE_TRACE1( "} osl_loadModule end: %S", (LPTSTR)&strModuleName->buffer );