include: Replace unsigned long with unsigned int in winerror.h.
Michael Stefaniuc
mstefani at redhat.de
Sat Jan 10 17:16:47 CST 2009
The cookie cutter method of using ULONG isn't possible here as
winerror.h can and is included before windef.h.
---
include/winerror.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/winerror.h b/include/winerror.h
index 5d32374..c7427d7 100644
--- a/include/winerror.h
+++ b/include/winerror.h
@@ -65,12 +65,12 @@
#define MAKE_HRESULT(sev,fac,code) \
- ((HRESULT) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))) )
+ ((HRESULT) (((unsigned int)(sev)<<31) | ((unsigned int)(fac)<<16) | ((unsigned int)(code))) )
#define MAKE_SCODE(sev,fac,code) \
- ((SCODE) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))) )
+ ((SCODE) (((unsigned int)(sev)<<31) | ((unsigned int)(fac)<<16) | ((unsigned int)(code))) )
#define SUCCEEDED(stat) ((HRESULT)(stat)>=0)
#define FAILED(stat) ((HRESULT)(stat)<0)
-#define IS_ERROR(stat) (((unsigned long)(stat)>>31) == SEVERITY_ERROR)
+#define IS_ERROR(stat) (((unsigned int)(stat)>>31) == SEVERITY_ERROR)
#define HRESULT_CODE(hr) ((hr) & 0xFFFF)
#define SCODE_CODE(sc) ((sc) & 0xFFFF)
@@ -90,7 +90,7 @@ typedef long HRESULT;
typedef int HRESULT;
# endif
#endif
-static inline HRESULT HRESULT_FROM_WIN32(unsigned long x)
+static inline HRESULT HRESULT_FROM_WIN32(unsigned int x)
{
return (HRESULT)x > 0 ? ((HRESULT) ((x & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : (HRESULT)x;
}
--
1.6.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20090111/9c41216d/attachment.pgp
More information about the wine-patches
mailing list