ERROR_UNKNOWN

[Filip Navara]

Get rid of non-standard ERROR_UNKNOWN value. The IShellLink case was 
tested, others were replaced with reasonable values.

- Filip

-------------- next part --------------
diff -u -r wine-20040408/dlls/icmp/icmp_main.c wine-current/dlls/icmp/icmp_main.c
--- wine-20040408/dlls/icmp/icmp_main.c	Fri Sep  5 23:08:38 2003
+++ wine-current/dlls/icmp/icmp_main.c	Fri Apr  9 23:41:28 2004
@@ -325,11 +325,11 @@
                 SetLastError(IP_DEST_NET_UNREACHABLE);
                 break;
             case EHOSTUNREACH:
-                SetLastError(IP_DEST_NET_UNREACHABLE);
+                SetLastError(IP_DEST_HOST_UNREACHABLE);
                 break;
             default:
                 TRACE("unknown error: errno=%d\n",errno);
-                SetLastError(ERROR_UNKNOWN);
+                SetLastError(IP_GENERAL_FAILURE);
             }
         }
         return 0;
diff -u -r wine-20040408/dlls/shell32/shelllink.c wine-current/dlls/shell32/shelllink.c
--- wine-20040408/dlls/shell32/shelllink.c	Wed Apr  7 03:59:42 2004
+++ wine-current/dlls/shell32/shelllink.c	Fri Apr  9 23:21:04 2004
@@ -289,7 +289,7 @@
     TRACE("(%p)->(%s)\n",This,debugstr_w(pszFileName));
 
     if (!pszFileName || !This->sPath)
-        return ERROR_UNKNOWN;
+        return E_FAIL;
 
     r = CreateStreamOnFile(pszFileName, STGM_READWRITE | STGM_CREATE, &stm);
     if( SUCCEEDED( r ) )
diff -u -r wine-20040408/include/winerror.h wine-current/include/winerror.h
--- wine-20040408/include/winerror.h	Tue Mar  2 04:57:36 2004
+++ wine-current/include/winerror.h	Fri Apr  9 23:22:02 2004
@@ -62,13 +62,6 @@
 /* This macros is obsolete and should not be used in new apps. */
 #define ResultFromScode(sc)  ((HRESULT)(sc))
 
-/* ERROR_UNKNOWN is a placeholder for error conditions which haven't
- * been tested yet so we're not exactly sure what will be returned.
- * All instances of ERROR_UNKNOWN should be tested under Win95/NT
- * and replaced.
- */
-#define ERROR_UNKNOWN                                      99999
-
 #define NO_ERROR                                           0
 #define ERROR_SUCCESS                                      0
 #define ERROR_INVALID_FUNCTION                             1
diff -u -r wine-20040408/server/file.c wine-current/server/file.c
--- wine-20040408/server/file.c	Thu Apr  8 19:09:04 2004
+++ wine-current/server/file.c	Fri Apr  9 23:26:06 2004
@@ -373,7 +373,7 @@
 #ifdef EOVERFLOW
     case EOVERFLOW: set_error( STATUS_INVALID_PARAMETER ); break;
 #endif
-    default:        perror("file_set_error"); set_win32_error( ERROR_UNKNOWN ); break;
+    default:        perror("file_set_error"); set_error( STATUS_UNSUCCESSFUL ); break;
     }
 }
 
diff -u -r wine-20040408/server/sock.c wine-current/server/sock.c
--- wine-20040408/server/sock.c	Thu Apr  8 19:09:04 2004
+++ wine-current/server/sock.c	Fri Apr  9 23:30:48 2004
@@ -755,7 +755,7 @@
 #ifdef EREMOTE
         case EREMOTE:           return WSAEREMOTE; break;
 #endif
-    default: errno=err; perror("sock_set_error"); return ERROR_UNKNOWN; break;
+    default: errno=err; perror("sock_set_error"); return WSAEFAULT; break;
     }
 }
 
diff -u -r wine-20040408/server/trace.c wine-current/server/trace.c
--- wine-20040408/server/trace.c	Thu Apr  8 19:09:04 2004
+++ wine-current/server/trace.c	Fri Apr  9 23:22:14 2004
@@ -3117,7 +3117,6 @@
         NAME_WIN32(ERROR_INVALID_INDEX),
         NAME_WIN32(ERROR_NEGATIVE_SEEK),
         NAME_WIN32(ERROR_SEEK),
-        NAME_WIN32(ERROR_UNKNOWN),
         { NULL, 0 }  /* terminator */
     };
 #undef NAME