include: Add some new error codes.

dlls/jscript/jscript.h

@@ -526,8 +526,6 @@ static inline HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, jsval_
     return disp_call_value_with_caller(ctx, disp, vthis, flags, argc, argv, r, &ctx->jscaller->IServiceProvider_iface);
 }
 
-#define FACILITY_JSCRIPT 10
-
 #define MAKE_JSERROR(code) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_JSCRIPT, code)
 
 #define JS_E_TO_PRIMITIVE            MAKE_JSERROR(IDS_TO_PRIMITIVE)

include/d3d10.idl

@@ -249,8 +249,6 @@ const unsigned int D3D10_SDK_VERSION
 
 cpp_quote("#define MAKE_D3D10_HRESULT(code)                   MAKE_HRESULT( 1, _FACD3D10, code)")
 cpp_quote("#define MAKE_D3D10_STATUS(code)                    MAKE_HRESULT( 0, _FACD3D10, code)")
-cpp_quote("#define D3D10_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS  MAKE_D3D10_HRESULT(1)")
-cpp_quote("#define D3D10_ERROR_FILE_NOT_FOUND                 MAKE_D3D10_HRESULT(2)")
 
 cpp_quote("#if defined(__cplusplus) && !defined(D3D10_NO_HELPERS)")
 cpp_quote("inline unsigned int D3D10CalcSubresource(unsigned int level, unsigned int layer, unsigned int level_count)")

include/dmerror.h

@@ -23,7 +23,6 @@
 /*****************************************************************************
  * Error code handling
  */
-#define FACILITY_DIRECTMUSIC 0x878
 #define DMUS_ERRBASE 0x1000
 
 #ifndef MAKE_HRESULT

include/webservices.h

@@ -1840,6 +1840,8 @@ HRESULT WINAPI WsWriteXmlnsAttribute(WS_XML_WRITER*, const WS_XML_STRING*, const
                                      BOOL, WS_ERROR*);
 HRESULT WINAPI WsXmlStringEquals(const WS_XML_STRING*, const WS_XML_STRING*, WS_ERROR*);
 
+#ifndef FACILITY_WEBSERVICES
+#define FACILITY_WEBSERVICES 61
 #define WS_S_ASYNC                          0x003d0000
 #define WS_S_END                            0x003d0001
 #define WS_E_INVALID_FORMAT                 0x803d0000
@@ -1878,6 +1880,7 @@ HRESULT WINAPI WsXmlStringEquals(const WS_XML_STRING*, const WS_XML_STRING*, WS_
 #define WS_E_OTHER                          0x803d0021
 #define WS_E_SECURITY_TOKEN_EXPIRED         0x803d0022
 #define WS_E_SECURITY_SYSTEM_FAILURE        0x803d0023
+#endif
 
 #define WS_STRING_VALUE(s) { sizeof(s) / sizeof((s)[0]) - 1, (WCHAR *)(s) }
 #define WS_XML_STRING_VALUE(s) { sizeof(s) - 1, (BYTE *)(s) }

include/winsock2.h

@@ -786,10 +786,10 @@ typedef struct _OVERLAPPED* LPWSAOVERLAPPED;
 #define WS_h_errno                 WSAGetLastError()
 #endif
 
-#define WSAHOST_NOT_FOUND          (WSABASEERR + 1001)
-#define WSATRY_AGAIN               (WSABASEERR + 1002)
-#define WSANO_RECOVERY             (WSABASEERR + 1003)
-#define WSANO_DATA                 (WSABASEERR + 1004)
+#define WSAHOST_NOT_FOUND          (WSABASEERR+1001)
+#define WSATRY_AGAIN               (WSABASEERR+1002)
+#define WSANO_RECOVERY             (WSABASEERR+1003)
+#define WSANO_DATA                 (WSABASEERR+1004)
 #define WSANO_ADDRESS              WSANO_DATA
 
 #define WSA_IO_PENDING             (ERROR_IO_PENDING)