[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                 |    5 ++
 patches/dev300/win32-no-seterror-when-debugging.diff |   35 +++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

New commits:
commit ec423db03fd1f934b256ff0300ce20b7c0213906
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Sep 16 14:55:25 2009 +0300

    Don't avoid error windows when sal is built for debugging
    
    * patches/dev300/win32-no-seterror-when-debugging.diff: New file. Ifdef out
      the SetErrorMode calls in sal/osl/w32 if OSL_DEBUG_LEVEL > 1, i.e. built
      with debug=true.
    
    * patches/dev300/apply: Add it to Win32Only.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a31cd96..798a67d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2740,7 +2740,10 @@ ooop-updatable-sameversion.diff
 [ Win32Only ]
 seamonkey-source-1.1.14.patch.diff, i#84961, tml
 
-[ TemporaryHacks ]
+# We *do* want error message windows about missing DLLs etc displayed
+# by Windows when built with debug=true, I think
+win32-no-seterror-when-debugging.diff, tml
+
 
 [ Fixes ]
 #sc-xclimpchangetrack-discard-bogus-formula-size.diff, n#355304, tml
diff --git a/patches/dev300/win32-no-seterror-when-debugging.diff b/patches/dev300/win32-no-seterror-when-debugging.diff
new file mode 100644
index 0000000..9e78279
--- /dev/null
+++ b/patches/dev300/win32-no-seterror-when-debugging.diff
@@ -0,0 +1,35 @@
+--- sal/osl/w32/dllentry.c
++++ sal/osl/w32/dllentry.c
+@@ -197,8 +197,10 @@
+                     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();
+--- sal/osl/w32/module.c
++++ sal/osl/w32/module.c
+@@ -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 +74,9 @@
+ 
+     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 );
+