Remove the 'L' suffix on a number of constants to avoid comparison
errors on 64-bit platforms.
diff --git a/include/urlmon.idl b/include/urlmon.idl
index 47f8267..5589a17 100644
--- a/include/urlmon.idl
+++ b/include/urlmon.idl
@@ -1092,27 +1092,27 @@
cpp_quote("#define MK_S_ASYNCHRONOUS 0x000401E8")
cpp_quote("#define S_ASYNCHRONOUS MK_S_ASYNCHRONOUS")
-cpp_quote("#define INET_E_ERROR_FIRST 0x800C0002L")
-cpp_quote("#define INET_E_INVALID_URL 0x800C0002L")
-cpp_quote("#define INET_E_NO_SESSION 0x800C0003L")
-cpp_quote("#define INET_E_CANNOT_CONNECT 0x800C0004L")
-cpp_quote("#define INET_E_RESOURCE_NOT_FOUND 0x800C0005L")
-cpp_quote("#define INET_E_OBJECT_NOT_FOUND 0x800C0006L")
-cpp_quote("#define INET_E_DATA_NOT_AVAILABLE 0x800C0007L")
-cpp_quote("#define INET_E_DOWNLOAD_FAILURE 0x800C0008L")
-cpp_quote("#define INET_E_AUTHENTICATION_REQUIRED 0x800C0009L")
-cpp_quote("#define INET_E_NO_VALID_MEDIA 0x800C000AL")
-cpp_quote("#define INET_E_CONNECTION_TIMEOUT 0x800C000BL")
-cpp_quote("#define INET_E_INVALID_REQUEST 0x800C000CL")
-cpp_quote("#define INET_E_UNKNOWN_PROTOCOL 0x800C000DL")
-cpp_quote("#define INET_E_SECURITY_PROBLEM 0x800C000EL")
-cpp_quote("#define INET_E_CANNOT_LOAD_DATA 0x800C000FL")
-cpp_quote("#define INET_E_CANNOT_INSTANTIATE_OBJECT 0x800C0010L")
-cpp_quote("#define INET_E_USE_DEFAULT_PROTOCOLHANDLER 0x800C0011L")
-cpp_quote("#define INET_E_QUERYOPTION_UNKNOWN 0x800C0013L")
-cpp_quote("#define INET_E_REDIRECT_FAILED 0x800C0014L")
-cpp_quote("#define INET_E_REDIRECT_TO_DIR 0x800C0015L")
-cpp_quote("#define INET_E_CANNOT_LOCK_REQUEST 0x800C0016L")
+cpp_quote("#define INET_E_ERROR_FIRST 0x800C0002")
+cpp_quote("#define INET_E_INVALID_URL 0x800C0002")
+cpp_quote("#define INET_E_NO_SESSION 0x800C0003")
+cpp_quote("#define INET_E_CANNOT_CONNECT 0x800C0004")
+cpp_quote("#define INET_E_RESOURCE_NOT_FOUND 0x800C0005")
+cpp_quote("#define INET_E_OBJECT_NOT_FOUND 0x800C0006")
+cpp_quote("#define INET_E_DATA_NOT_AVAILABLE 0x800C0007")
+cpp_quote("#define INET_E_DOWNLOAD_FAILURE 0x800C0008")
+cpp_quote("#define INET_E_AUTHENTICATION_REQUIRED 0x800C0009")
+cpp_quote("#define INET_E_NO_VALID_MEDIA 0x800C000A")
+cpp_quote("#define INET_E_CONNECTION_TIMEOUT 0x800C000B")
+cpp_quote("#define INET_E_INVALID_REQUEST 0x800C000C")
+cpp_quote("#define INET_E_UNKNOWN_PROTOCOL 0x800C000D")
+cpp_quote("#define INET_E_SECURITY_PROBLEM 0x800C000E")
+cpp_quote("#define INET_E_CANNOT_LOAD_DATA 0x800C000F")
+cpp_quote("#define INET_E_CANNOT_INSTANTIATE_OBJECT 0x800C0010")
+cpp_quote("#define INET_E_USE_DEFAULT_PROTOCOLHANDLER 0x800C0011")
+cpp_quote("#define INET_E_QUERYOPTION_UNKNOWN 0x800C0013")
+cpp_quote("#define INET_E_REDIRECT_FAILED 0x800C0014")
+cpp_quote("#define INET_E_REDIRECT_TO_DIR 0x800C0015")
+cpp_quote("#define INET_E_CANNOT_LOCK_REQUEST 0x800C0016")
cpp_quote("#define INET_E_ERROR_LAST INET_E_REDIRECT_TO_DIR")
cpp_quote("#define INET_E_DEFAULT_ACTION INET_E_USE_DEFAULT_PROTOCOLHANDLER")
diff --git a/include/wincrypt.h b/include/wincrypt.h
index 33b02b4..9eba1ee 100644
--- a/include/wincrypt.h
+++ b/include/wincrypt.h
@@ -1784,7 +1784,7 @@
#define CERT_STORE_CERTIFICATE_CONTEXT 1
#define CERT_STORE_CRL_CONTEXT 2
#define CERT_STORE_CTL_CONTEXT 3
-#define CERT_STORE_ALL_CONTEXT_FLAG ~0UL
+#define CERT_STORE_ALL_CONTEXT_FLAG ~0U
#define CERT_STORE_CERTIFICATE_CONTEXT_FLAG \
(1 << CERT_STORE_CERTIFICATE_CONTEXT)
#define CERT_STORE_CRL_CONTEXT_FLAG (1 << CERT_STORE_CRL_CONTEXT)
diff --git a/include/winerror.h b/include/winerror.h
index 31b3cb1..afa1ea3 100644
--- a/include/winerror.h
+++ b/include/winerror.h
@@ -1511,9 +1511,6 @@
#define ERROR_SXS_THREAD_QUERIES_DISABLED 14010
#define ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET 14011
-#define ERROR_AUDITING_DISABLED 0xC0090001L
-#define ERROR_ALL_SIDS_FILTERED 0xC0090002L
-
/* HRESULT values for OLE, SHELL and other Interface stuff */
/* the codes 4000-40ff are reserved for OLE */
#undef NOERROR /* arpa/nameser_compat.h defines this */
@@ -2209,4 +2206,7 @@
#define SCARD_W_CHV_BLOCKED _HRESULT_TYPEDEF_(0x8010006CL)
#define SCARD_W_CARD_NOT_AUTHENTICATED _HRESULT_TYPEDEF_(0x8010006FL)
+#define ERROR_AUDITING_DISABLED _HRESULT_TYPEDEF_(0xC0090001L)
+#define ERROR_ALL_SIDS_FILTERED _HRESULT_TYPEDEF_(0xC0090002L)
+
#endif /* __WINE_WINERROR_H */
