[PATCH 2/4] msvcrt: Fix app_type handling for failure messages

Detlef Riekenberg wine.dev at web.de
Sun Jan 30 16:34:39 CST 2011


---
 dlls/msvcrt/exit.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c
index 6e5a58a..9e6cf5c 100644
--- a/dlls/msvcrt/exit.c
+++ b/dlls/msvcrt/exit.c
@@ -137,7 +137,7 @@ void CDECL _amsg_exit(int errnum)
   TRACE("(%d)\n", errnum);
 
   if ((MSVCRT_error_mode == MSVCRT__OUT_TO_MSGBOX) ||
-     ((MSVCRT_error_mode == MSVCRT__OUT_TO_DEFAULT) && (MSVCRT_app_type == 2)))
+     ((MSVCRT_error_mode == MSVCRT__OUT_TO_DEFAULT) && (MSVCRT_app_type != 1)))
   {
     char text[32];
     sprintf(text, "Error: R60%d",errnum);
@@ -158,7 +158,7 @@ void CDECL MSVCRT_abort(void)
   if (MSVCRT_abort_behavior & MSVCRT__WRITE_ABORT_MSG)
   {
     if ((MSVCRT_error_mode == MSVCRT__OUT_TO_MSGBOX) ||
-       ((MSVCRT_error_mode == MSVCRT__OUT_TO_DEFAULT) && (MSVCRT_app_type == 2)))
+       ((MSVCRT_error_mode == MSVCRT__OUT_TO_DEFAULT) && (MSVCRT_app_type != 1)))
     {
       DoMessageBox("Runtime error!", "abnormal program termination");
     }
@@ -194,7 +194,7 @@ void CDECL MSVCRT__assert(const char* str, const char* file, unsigned int line)
 {
   TRACE("(%s,%s,%d)\n",str,file,line);
   if ((MSVCRT_error_mode == MSVCRT__OUT_TO_MSGBOX) ||
-     ((MSVCRT_error_mode == MSVCRT__OUT_TO_DEFAULT) && (MSVCRT_app_type == 2)))
+     ((MSVCRT_error_mode == MSVCRT__OUT_TO_DEFAULT) && (MSVCRT_app_type != 1)))
   {
     char text[2048];
     snprintf(text, sizeof(text), "File: %s\nLine: %d\n\nExpression: \"%s\"", file, line, str);
-- 
1.7.1




More information about the wine-patches mailing list