ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

In the PSDK HRESULT_FROM_WIN32() is now an inline function, and it is __HRESULT_FROM_WIN32() which is a macro.

This commit is contained in:
Francois Gouget 2007-05-27 13:28:58 +02:00 committed by Alexandre Julliard
parent 47b6392b44
commit c85b74d63e
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/urlmon/tests/misc.c
View File

@ -373,9 +373,9 @@ static const struct {
{url2, mimeTextHtml, S_OK}, {url2, mimeTextHtml, S_OK},
{url3, mimeTextHtml, S_OK}, {url3, mimeTextHtml, S_OK},
{url4, NULL, E_FAIL}, {url4, NULL, E_FAIL},
{url5, NULL, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}, {url5, NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)},
{url6, NULL, E_FAIL}, {url6, NULL, E_FAIL},
{url7, NULL, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)} {url7, NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}
}; };
static BYTE data1[] = "test data\n"; static BYTE data1[] = "test data\n";

14
include/winerror.h
View File

@ -81,8 +81,20 @@
#define HRESULT_SEVERITY(hr) (((hr) >> 31) & 0x1) #define HRESULT_SEVERITY(hr) (((hr) >> 31) & 0x1)
#define SCODE_SEVERITY(sc) (((sc) >> 31) & 0x1) #define SCODE_SEVERITY(sc) (((sc) >> 31) & 0x1)
#define __HRESULT_FROM_WIN32(x) ((x) ? ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : 0 )
#ifndef _HRESULT_DEFINED
#define _HRESULT_DEFINED
# ifdef _MSC_VER
typedef long HRESULT;
# else
typedef int HRESULT;
# endif
#endif
static inline HRESULT HRESULT_FROM_WIN32(unsigned long x)
{
return x ? ((HRESULT) ((x & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : 0;
}
#define FACILITY_NT_BIT 0x10000000 #define FACILITY_NT_BIT 0x10000000
#define HRESULT_FROM_WIN32(x) ((x) ? ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : 0 )
#define HRESULT_FROM_NT(x) ((HRESULT) ((x) | FACILITY_NT_BIT)) #define HRESULT_FROM_NT(x) ((HRESULT) ((x) | FACILITY_NT_BIT))
/* SCODE <-> HRESULT functions */ /* SCODE <-> HRESULT functions */

5
include/winnt.h
View File

@ -398,10 +398,13 @@ typedef LPCSTR PCTSTR, LPCTSTR;
/* Misc common WIN32 types */ /* Misc common WIN32 types */
typedef char CCHAR; typedef char CCHAR;
typedef LONG HRESULT;
typedef DWORD LCID, *PLCID; typedef DWORD LCID, *PLCID;
typedef WORD LANGID; typedef WORD LANGID;
typedef DWORD EXECUTION_STATE; typedef DWORD EXECUTION_STATE;
#ifndef _HRESULT_DEFINED
#define _HRESULT_DEFINED
typedef LONG HRESULT;
#endif
/* Handle type */ /* Handle type */