Author: mlytwyn
Date: Mon Oct 31 21:30:46 2016
New Revision: 40186

URL: http://svn.gna.org/viewcvs/gnustep?rev=40186&view=rev
Log:
Fix (temporary?) for OutputDebugString's raised exceptions screwing up vectored 
exception handling

Modified:
    libs/base/branches/gnustep_testplant_branch/Source/NSLog.m
    
libs/base/branches/gnustep_testplant_branch/Source/win32/NSMessagePortNameServer.m

Modified: libs/base/branches/gnustep_testplant_branch/Source/NSLog.m
URL: 
http://svn.gna.org/viewcvs/gnustep/libs/base/branches/gnustep_testplant_branch/Source/NSLog.m?rev=40186&r1=40185&r2=40186&view=diff
==============================================================================
--- libs/base/branches/gnustep_testplant_branch/Source/NSLog.m  (original)
+++ libs/base/branches/gnustep_testplant_branch/Source/NSLog.m  Mon Oct 31 
21:30:46 2016
@@ -151,8 +151,10 @@
     }
 
 #if    defined(_WIN32)
+#if defined(_WIN64) // OutputDebugString raises exceptions screwing up 
vectored exception handling
+  write(_NSLogDescriptor, buf, len);
+#else
   null_terminated_buf = UNISTR(message);
-
   OutputDebugStringW(null_terminated_buf);
 
   if ((GSPrivateDefaultsFlag(GSLogSyslog) == YES
@@ -178,6 +180,7 @@
            NULL);                      // pointer to data
        }
     }
+#endif
 #else
 
 #if    defined(HAVE_SYSLOG)

Modified: 
libs/base/branches/gnustep_testplant_branch/Source/win32/NSMessagePortNameServer.m
URL: 
http://svn.gna.org/viewcvs/gnustep/libs/base/branches/gnustep_testplant_branch/Source/win32/NSMessagePortNameServer.m?rev=40186&r1=40185&r2=40186&view=diff
==============================================================================
--- 
libs/base/branches/gnustep_testplant_branch/Source/win32/NSMessagePortNameServer.m
  (original)
+++ 
libs/base/branches/gnustep_testplant_branch/Source/win32/NSMessagePortNameServer.m
  Mon Oct 31 21:30:46 2016
@@ -166,7 +166,7 @@
 
   translatedName = [[self class] _translate: name];
 
-#if 1
+#if !defined(_WIN64) // OutputDebugString raises exceptions screwing up 
vectored exception handling
 /* FIXME ... wierd hack.
  * It appears that RegQueryValueExW does not always read from the registry,
  * but will in fact return cached results (even if you close and re-open the


_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs

Reply via email to