diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 6831b27df..0e86629ee 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-05  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
+	* include/winerror.h (STG_E_*):  Define.
+	Thanks to:    Oliver Stoeneberg <kidkat at users dot sf dot net>
+	* include/winerror.h (STG_S_*): Define.
+	(CO_S_MACHINENAMENOTFOUND): Define.
+	(RPC_E_*): Define.
+	(NTE_*): Define.
+
 2006-04-03  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/commctrl.h (ListView_*):  Define and correct.
diff --git a/winsup/w32api/include/winerror.h b/winsup/w32api/include/winerror.h
index 56f6700e0..2618efb20 100644
--- a/winsup/w32api/include/winerror.h
+++ b/winsup/w32api/include/winerror.h
@@ -2080,6 +2080,7 @@
 #define MEM_E_INVALID_LINK ((HRESULT)0x80080010L)
 #define MEM_E_INVALID_SIZE ((HRESULT)0x80080011L)
 #define CO_S_NOTALLINTERFACES ((HRESULT)0x00080012L)
+#define CO_S_MACHINENAMENOTFOUND ((HRESULT)0x00080013L)
 #define DISP_E_UNKNOWNINTERFACE ((HRESULT)0x80020001L)
 #define DISP_E_MEMBERNOTFOUND ((HRESULT)0x80020003L)
 #define DISP_E_PARAMNOTFOUND ((HRESULT)0x80020004L)
@@ -2140,6 +2141,7 @@
 #define STG_E_FILEALREADYEXISTS ((HRESULT)0x80030050L)
 #define STG_E_INVALIDPARAMETER ((HRESULT)0x80030057L)
 #define STG_E_MEDIUMFULL ((HRESULT)0x80030070L)
+#define STG_E_PROPSETMISMATCHED ((HRESULT)0x800300F0L)
 #define STG_E_ABNORMALAPIEXIT ((HRESULT)0x800300FAL)
 #define STG_E_INVALIDHEADER ((HRESULT)0x800300FBL)
 #define STG_E_INVALIDNAME ((HRESULT)0x800300FCL)
@@ -2155,7 +2157,19 @@
 #define STG_E_SHAREREQUIRED ((HRESULT)0x80030106L)
 #define STG_E_NOTFILEBASEDSTORAGE ((HRESULT)0x80030107L)
 #define STG_E_EXTANTMARSHALLINGS ((HRESULT)0x80030108L)
+#define STG_E_DOCFILECORRUPT ((HRESULT)0x80030109L)
+#define STG_E_BADBASEADDRESS ((HRESULT)0x80030110L)
+#define STG_E_DOCFILETOOLARGE ((HRESULT)0x80030111L)
+#define STG_E_NOTSIMPLEFORMAT ((HRESULT)0x80030112L)
+#define STG_E_INCOMPLETE ((HRESULT)0x80030201L)
+#define STG_E_TERMINATED ((HRESULT)0x80030202L)
 #define STG_S_CONVERTED ((HRESULT)0x00030200L)
+#define STG_S_BLOCK ((HRESULT)0x00030201L)
+#define STG_S_RETRYNOW ((HRESULT)0x00030202L)
+#define STG_S_MONITORING ((HRESULT)0x00030203L)
+#define STG_S_MULTIPLEOPENS ((HRESULT)0x00030204L)
+#define STG_S_CONSOLIDATIONFAILED ((HRESULT)0x00030205L)
+#define STG_S_CANNOTCONSOLIDATE ((HRESULT)0x00030206L)
 #define RPC_E_CALL_REJECTED ((HRESULT)0x80010001L)
 #define RPC_E_CALL_CANCELED ((HRESULT)0x80010002L)
 #define RPC_E_CANTPOST_INSENDCALL ((HRESULT)0x80010003L)
@@ -2190,6 +2204,23 @@
 #define RPC_E_CANTCALLOUT_ININPUTSYNCCALL ((HRESULT)0x8001010DL)
 #define RPC_E_WRONG_THREAD ((HRESULT)0x8001010EL)
 #define RPC_E_THREAD_NOT_INIT ((HRESULT)0x8001010FL)
+#define RPC_E_VERSION_MISMATCH  ((HRESULT)0x80010110L)
+#define RPC_E_INVALID_HEADER ((HRESULT)0x80010111L)
+#define RPC_E_INVALID_EXTENSION ((HRESULT)0x80010112L)
+#define RPC_E_INVALID_IPID ((HRESULT)0x80010113L)
+#define RPC_E_INVALID_OBJECT ((HRESULT)0x80010114L)
+#define RPC_E_CALL_COMPLETE ((HRESULT)0x80010117L)
+#define RPC_E_UNSECURE_CALL ((HRESULT)0x80010118L)
+#define RPC_E_TOO_LATE ((HRESULT)0x80010119L)
+#define RPC_E_NO_GOOD_SECURITY_PACKAGES ((HRESULT)0x8001011AL)
+#define RPC_E_ACCESS_DENIED ((HRESULT)0x8001011BL)
+#define RPC_E_REMOTE_DISABLED ((HRESULT)0x8001011CL)
+#define RPC_E_INVALID_OBJREF ((HRESULT)0x8001011DL)
+#define RPC_E_NO_CONTEXT ((HRESULT)0x8001011EL)
+#define RPC_E_TIMEOUT ((HRESULT)0x8001011FL)
+#define RPC_E_NO_SYNC ((HRESULT)0x80010120L)
+#define RPC_E_FULLSIC_REQUIRED ((HRESULT)0x80010121L)
+#define RPC_E_INVALID_STD_NAME ((HRESULT)0x80010122L)
 #define RPC_E_UNEXPECTED ((HRESULT)0x8001FFFFL)
 
 #define NTE_BAD_UID ((HRESULT)0x80090001L)
@@ -2225,6 +2256,9 @@
 #define NTE_BAD_KEYSET_PARAM ((HRESULT)0x8009001FL)
 #define NTE_FAIL ((HRESULT)0x80090020L)
 #define NTE_SYS_ERR ((HRESULT)0x80090021L)
-/* #define NTE_TOKEN_KEYSET_STORAGE ??? */
+#define NTE_SILENT_CONTEXT ((HRESULT)0x80090022L)
+#define NTE_TOKEN_KEYSET_STORAGE_FULL ((HRESULT)0x80090023L)
+#define NTE_TEMPORARY_PROFILE ((HRESULT)0x80090024L)
+#define NTE_FIXEDPARAMETER ((HRESULT)0x80090025L)
 
 #endif