* include/winerror.h (ERROR_DIFFERENT_SERVICE_ACCOUNT,

	ERROR_EXE_MACHINE_TYPE_MISMATCH, ERROR_HOOK_TYPE_NOT_ALLOWED,
	ERROR_INVALID_KEYBOARD_HANDLE, ERROR_INVALID_PRINT_MONITOR,
	ERROR_PRINT_MONITOR_IN_USE, ERROR_PRINTER_HAS_JOBS_QUEUED,
	ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION,
	ERROR_SUCCESS_REBOOT_REQUIRED, ERROR_SUCCESS_RESTART_REQUIRED,
	ERROR_TIMEOUT, OR_INVALID_OID, OR_INVALID_OXID,
	OR_INVALID_SET, RPC_X_INVALID_PIPE_OPERATION): Add missing
	error codes.
	Re-sort codes..

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index f97d34e..deafa8c 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,5 +1,18 @@
 2003-01-02  Danny Smith  <dannysmith@users.sourceforge.net>
 
+       * include/winerror.h (ERROR_DIFFERENT_SERVICE_ACCOUNT,
+       ERROR_EXE_MACHINE_TYPE_MISMATCH, ERROR_HOOK_TYPE_NOT_ALLOWED,
+       ERROR_INVALID_KEYBOARD_HANDLE, ERROR_INVALID_PRINT_MONITOR,
+       ERROR_PRINT_MONITOR_IN_USE, ERROR_PRINTER_HAS_JOBS_QUEUED,
+       ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION,
+       ERROR_SUCCESS_REBOOT_REQUIRED, ERROR_SUCCESS_RESTART_REQUIRED,
+       ERROR_TIMEOUT, OR_INVALID_OID, OR_INVALID_OXID,
+       OR_INVALID_SET, RPC_X_INVALID_PIPE_OPERATION): Add missing
+       error codes.
+       Re-sort codes.
+
+2003-01-02  Danny Smith  <dannysmith@users.sourceforge.net>
+
        * include/winspool.h (PRINTER_INFO_6): Add.
        Reported by: Mat Nieuwenhoven  <matnieuw@users.sourceforge.net>
 

diff --git a/winsup/w32api/include/winerror.h b/winsup/w32api/include/winerror.h
index b8c65ee..8c733d5 100644 (file)
--- a/winsup/w32api/include/winerror.h
+++ b/winsup/w32api/include/winerror.h
@@ -171,6 +171,7 @@
 #define ERROR_LOCKED 212L
 #define ERROR_TOO_MANY_MODULES 214L
 #define ERROR_NESTING_NOT_ALLOWED 215L
+#define ERROR_EXE_MACHINE_TYPE_MISMATCH 216L
 #define ERROR_BAD_PIPE 230L
 #define ERROR_PIPE_BUSY 231L
 #define ERROR_NO_DATA 232L
@@ -251,6 +252,7 @@
 #define ERROR_BOOT_ALREADY_ACCEPTED 1076L
 #define ERROR_SERVICE_NEVER_STARTED 1077L
 #define ERROR_DUPLICATE_SERVICE_NAME 1078L
+#define ERROR_DIFFERENT_SERVICE_ACCOUNT 1079L
 #define ERROR_END_OF_MEDIA 1100L
 #define ERROR_FILEMARK_DETECTED 1101L
 #define ERROR_BEGINNING_OF_MEDIA 1102L
@@ -295,11 +297,6 @@
 #define ERROR_NO_ASSOCIATION 1155L
 #define ERROR_DDE_FAIL 1156L
 #define ERROR_DLL_NOT_FOUND 1157L
-#define ERROR_BAD_USERNAME 2202L
-#define ERROR_NOT_CONNECTED 2250L
-#define ERROR_OPEN_FILES 2401L
-#define ERROR_ACTIVE_CONNECTIONS 2402L
-#define ERROR_DEVICE_IN_USE 2404L
 #define ERROR_BAD_DEVICE 1200L
 #define ERROR_CONNECTION_UNAVAIL 1201L
 #define ERROR_DEVICE_ALREADY_REMEMBERED 1202L
@@ -501,6 +498,10 @@
 #define ERROR_PAGEFILE_QUOTA 1454L
 #define ERROR_COMMITMENT_LIMIT 1455L
 #define ERROR_MENU_ITEM_NOT_FOUND 1456L
+#define ERROR_INVALID_KEYBOARD_HANDLE 1457L
+#define ERROR_HOOK_TYPE_NOT_ALLOWED 1458L
+#define ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION 1459L
+#define ERROR_TIMEOUT 1460L
 #define ERROR_EVENTLOG_FILE_CORRUPT 1500L
 #define ERROR_EVENTLOG_CANT_START 1501L
 #define ERROR_LOG_FILE_FULL 1502L
@@ -633,6 +634,7 @@
 #define RPC_X_WRONG_STUB_VERSION 1829L
 #define RPC_X_INVALID_PIPE_OBJECT 1830L
 #define RPC_X_WRONG_PIPE_ORDER 1831L
+#define RPC_X_INVALID_PIPE_OPERATION 1831L
 #define RPC_X_WRONG_PIPE_VERSION 1832L
 #define RPC_S_GROUP_MEMBER_NOT_FOUND 1898L
 #define EPT_S_CANT_CREATE 1899L
@@ -646,14 +648,21 @@
 #define ERROR_PASSWORD_MUST_CHANGE 1907L
 #define ERROR_DOMAIN_CONTROLLER_NOT_FOUND 1908L
 #define ERROR_ACCOUNT_LOCKED_OUT 1909L
+#define OR_INVALID_OXID 1910L
+#define OR_INVALID_OID 1911L
+#define OR_INVALID_SET 1912L
 #define RPC_S_SEND_INCOMPLETE 1913L
-#define ERROR_NO_BROWSER_SERVERS_FOUND 6118L
 #define ERROR_INVALID_PIXEL_FORMAT 2000L
 #define ERROR_BAD_DRIVER 2001L
 #define ERROR_INVALID_WINDOW_STYLE 2002L
 #define ERROR_METAFILE_NOT_SUPPORTED 2003L
 #define ERROR_TRANSFORM_NOT_SUPPORTED 2004L
 #define ERROR_CLIPPING_NOT_SUPPORTED 2005L
+#define ERROR_BAD_USERNAME 2202L
+#define ERROR_NOT_CONNECTED 2250L
+#define ERROR_OPEN_FILES 2401L
+#define ERROR_ACTIVE_CONNECTIONS 2402L
+#define ERROR_DEVICE_IN_USE 2404L
 #define ERROR_UNKNOWN_PRINT_MONITOR 3000L
 #define ERROR_PRINTER_DRIVER_IN_USE 3001L
 #define ERROR_SPOOL_FILE_NOT_FOUND 3002L
@@ -661,6 +670,11 @@
 #define ERROR_SPL_NO_ADDJOB 3004L
 #define ERROR_PRINT_PROCESSOR_ALREADY_INSTALLED 3005L
 #define ERROR_PRINT_MONITOR_ALREADY_INSTALLED 3006L
+#define ERROR_INVALID_PRINT_MONITOR 3007L
+#define ERROR_PRINT_MONITOR_IN_USE 3008L
+#define ERROR_PRINTER_HAS_JOBS_QUEUED 3009L
+#define ERROR_SUCCESS_REBOOT_REQUIRED 3010L
+#define ERROR_SUCCESS_RESTART_REQUIRED 3011L
 #define ERROR_WINS_INTERNAL 4000L
 #define ERROR_CAN_NOT_DEL_LOCAL_WINS 4001L
 #define ERROR_STATIC_INIT 4002L
@@ -668,6 +682,8 @@
 #define ERROR_FULL_BACKUP 4004L
 #define ERROR_REC_NON_EXISTENT 4005L
 #define ERROR_RPL_NOT_ALLOWED 4006L
+#define ERROR_NO_BROWSER_SERVERS_FOUND 6118L
+
 #define SEVERITY_SUCCESS 0
 #define SEVERITY_ERROR 1
 #define FACILITY_WINDOWS 8