mirror of
https://github.com/reactos/reactos.git
synced 2025-08-07 02:42:59 +00:00
[PSDK] Sync winerror.h with wine-10.0 (#8244)
- Sync winerror.h to wine-10.0 - Fix a couple hacks that existed because we didn't do this sooner - Fix an instance where Wine compares a pointer to S_OK to see if it's null
This commit is contained in:
parent
12fa72a06d
commit
117cd33b49
4 changed files with 5242 additions and 1205 deletions
|
@ -521,8 +521,6 @@ static inline DWORD make_grfdex(script_ctx_t *ctx, DWORD flags)
|
||||||
return ((ctx->version & 0xff) << 28) | flags;
|
return ((ctx->version & 0xff) << 28) | flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define FACILITY_JSCRIPT 10
|
|
||||||
|
|
||||||
#define MAKE_JSERROR(code) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_JSCRIPT, code)
|
#define MAKE_JSERROR(code) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_JSCRIPT, code)
|
||||||
|
|
||||||
#define JS_E_TO_PRIMITIVE MAKE_JSERROR(IDS_TO_PRIMITIVE)
|
#define JS_E_TO_PRIMITIVE MAKE_JSERROR(IDS_TO_PRIMITIVE)
|
||||||
|
|
|
@ -839,7 +839,7 @@ static void test_CreateStub(IPSFactoryBuffer *ppsf)
|
||||||
|
|
||||||
vtbl = &create_stub_test_fail_vtbl;
|
vtbl = &create_stub_test_fail_vtbl;
|
||||||
pstub = create_stub(ppsf, &IID_if1, obj, E_NOINTERFACE);
|
pstub = create_stub(ppsf, &IID_if1, obj, E_NOINTERFACE);
|
||||||
ok(pstub == S_OK, "create_stub failed: %u\n", GetLastError());
|
ok(pstub == NULL, "create_stub failed: %u\n", GetLastError());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* Error code handling
|
* Error code handling
|
||||||
*/
|
*/
|
||||||
#define FACILITY_DIRECTMUSIC 0x878
|
|
||||||
#define DMUS_ERRBASE 0x1000
|
#define DMUS_ERRBASE 0x1000
|
||||||
|
|
||||||
#ifndef MAKE_HRESULT
|
#ifndef MAKE_HRESULT
|
||||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue