Changeset 3547 for trunk/src

Timestamp:

May 18, 2000, 11:08:38 AM (25 years ago)

Author:

sandervl

Message:

exception + enumresourcenamesa fix

Location:

trunk/src/kernel32

Files:

• exceptions.cpp (modified) (3 diffs)
• winimgres.cpp (modified) (2 diffs)

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.40 2000-05-02 20:53:12 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.41 2000-05-18 09:08:37 sandervl Exp $ */
 
 /*
@@ -936 +936 @@
                                    PVOID                        p)
 {
+  //SvL: Check if exception inside debug fprintf -> if so, clear lock so
+  //     next dprintf won't wait forever
+  CheckLogException();
+
   /* Access violation at a known location */
   switch(pERepRec->ExceptionNum)
@@ -1047 +1051 @@
   case XCPT_IN_PAGE_ERROR:
 CrashAndBurn:
-        CheckLogException();
 #ifdef DEBUG
         dprintfException(pERepRec, pERegRec, pCtxRec, p);

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.35 2000-05-09 18:56:10 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.36 2000-05-18 09:08:38 sandervl Exp $ */
 
 /*
@@ -490 +490 @@
                     pszASCII = (char*)pszTmp;
                 }
-                UnicodeToAsciiN(pResDirString->NameString, pszASCII, pResDirString->Length);
+                lstrcpynWtoA(pszASCII, pResDirString->NameString, pResDirString->Length+1);
                 lpszName = pszASCII;
             }