diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 9ae207bc563..5286dad542b 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -925,7 +925,7 @@ static HRESULT WINAPI DefaultHandler_GetMoniker( } - return E_UNSPEC; + return E_FAIL; } /************************************************************************ diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 52d9a996972..986ce9bb982 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -708,10 +708,8 @@ HRESULT WINAPI FileMonikerImpl_BindToStorage(IMoniker* iface, } else if ( (IsEqualIID(&IID_IStream, riid)) || (IsEqualIID(&IID_ILockBytes, riid)) ) - - return E_UNSPEC; + return E_FAIL; else - return E_NOINTERFACE; } else { diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index d7db11a995c..ffd538e1445 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -220,7 +220,7 @@ static HRESULT WINAPI WBOOBJ_GetMoniker(LPOLEOBJECT iface, DWORD dwAssign, DWORD dwWhichMoniker, LPMONIKER *ppmk) { FIXME("stub (%p, %ld, %ld, %p)\n", iface, dwAssign, dwWhichMoniker, ppmk); - return E_UNSPEC; + return E_FAIL; } /************************************************************************ diff --git a/include/winerror.h b/include/winerror.h index 0de4d8901db..771672d18b0 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1546,10 +1546,6 @@ #define E_POINTER _HRESULT_TYPEDEF_(0x80004003L) #define E_ABORT _HRESULT_TYPEDEF_(0x80004004L) #define E_FAIL _HRESULT_TYPEDEF_(0x80004005L) -/* FIXME: E_UNSPEC is not a standard value but it is used by - * FileMoniker, IOleLink and DoDragDrop as a return value. - */ -#define E_UNSPEC E_FAIL #define CO_E_INIT_TLS _HRESULT_TYPEDEF_(0x80004006L)