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

- stub for OLE32.MkParseDisplayName 

- spelling fixes
This commit is contained in:
Andreas Mohr 2000-02-20 19:17:53 +00:00 committed by Alexandre Julliard
parent 1c20b39fa5
commit 6d982b6ee6
2 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dlls/ole32/moniker.c
View File

@ -25,22 +25,22 @@ typedef struct RunObject{
DWORD regTypeObj; /* registration type : strong or weak */ DWORD regTypeObj; /* registration type : strong or weak */
}RunObject; }RunObject;
/* define de RunningObjectTableImpl structure */ /* define the RunningObjectTableImpl structure */
typedef struct RunningObjectTableImpl{ typedef struct RunningObjectTableImpl{
ICOM_VFIELD(IRunningObjectTable); ICOM_VFIELD(IRunningObjectTable);
ULONG ref; ULONG ref;
RunObject* runObjTab; /* pointe to the first object in the table */ RunObject* runObjTab; /* pointer to the first object in the table */
DWORD runObjTabSize; /* current table size */ DWORD runObjTabSize; /* current table size */
DWORD runObjTabLastIndx; /* first free index element in the table. */ DWORD runObjTabLastIndx; /* first free index element in the table. */
DWORD runObjTabRegister; /* registration key of the next registred object */ DWORD runObjTabRegister; /* registration key of the next registered object */
} RunningObjectTableImpl; } RunningObjectTableImpl;
RunningObjectTableImpl* runningObjectTableInstance=0; RunningObjectTableImpl* runningObjectTableInstance=0;
/* IRunningObjectTable prototipe functions : */ /* IRunningObjectTable prototype functions : */
/* IUnknown functions*/ /* IUnknown functions*/
static HRESULT WINAPI RunningObjectTableImpl_QueryInterface(IRunningObjectTable* iface,REFIID riid,void** ppvObject); static HRESULT WINAPI RunningObjectTableImpl_QueryInterface(IRunningObjectTable* iface,REFIID riid,void** ppvObject);
static ULONG WINAPI RunningObjectTableImpl_AddRef(IRunningObjectTable* iface); static ULONG WINAPI RunningObjectTableImpl_AddRef(IRunningObjectTable* iface);
@ -84,7 +84,7 @@ HRESULT WINAPI RunningObjectTableImpl_QueryInterface(IRunningObjectTable* iface,
TRACE("(%p,%p,%p)\n",This,riid,ppvObject); TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
/* validate arguments*/ /* validate arguments */
if (This==0) if (This==0)
return CO_E_NOTINITIALIZED; return CO_E_NOTINITIALIZED;
@ -153,7 +153,7 @@ ULONG WINAPI RunningObjectTableImpl_Release(IRunningObjectTable* iface)
/* unitialize ROT structure if there's no more reference to it*/ /* unitialize ROT structure if there's no more reference to it*/
if (This->ref==0){ if (This->ref==0){
/* release all registred objects */ /* release all registered objects */
for(i=0;i<This->runObjTabLastIndx;i++) for(i=0;i<This->runObjTabLastIndx;i++)
{ {
if (( This->runObjTab[i].regTypeObj & ROTFLAGS_REGISTRATIONKEEPSALIVE) != 0) if (( This->runObjTab[i].regTypeObj & ROTFLAGS_REGISTRATIONKEEPSALIVE) != 0)
@ -249,18 +249,18 @@ HRESULT WINAPI RunningObjectTableImpl_Register(IRunningObjectTable* iface,
if (punkObject==NULL || pmkObjectName==NULL || pdwRegister==NULL) if (punkObject==NULL || pmkObjectName==NULL || pdwRegister==NULL)
return E_INVALIDARG; return E_INVALIDARG;
/* verify if the object to be registred was registred befor */ /* verify if the object to be registered was registered before */
if (RunningObjectTableImpl_GetObjectIndex(This,-1,pmkObjectName,NULL)==S_OK) if (RunningObjectTableImpl_GetObjectIndex(This,-1,pmkObjectName,NULL)==S_OK)
res = MK_S_MONIKERALREADYREGISTERED; res = MK_S_MONIKERALREADYREGISTERED;
/* put the new registred object in the first free element in the table */ /* put the new registered object in the first free element in the table */
This->runObjTab[This->runObjTabLastIndx].pObj = punkObject; This->runObjTab[This->runObjTabLastIndx].pObj = punkObject;
This->runObjTab[This->runObjTabLastIndx].pmkObj = pmkObjectName; This->runObjTab[This->runObjTabLastIndx].pmkObj = pmkObjectName;
This->runObjTab[This->runObjTabLastIndx].regTypeObj = grfFlags; This->runObjTab[This->runObjTabLastIndx].regTypeObj = grfFlags;
This->runObjTab[This->runObjTabLastIndx].identRegObj = This->runObjTabRegister; This->runObjTab[This->runObjTabLastIndx].identRegObj = This->runObjTabRegister;
CoFileTimeNow(&(This->runObjTab[This->runObjTabLastIndx].lastModifObj)); CoFileTimeNow(&(This->runObjTab[This->runObjTabLastIndx].lastModifObj));
/* gives a registration identifier to the registred object*/ /* gives a registration identifier to the registered object*/
(*pdwRegister)= This->runObjTabRegister; (*pdwRegister)= This->runObjTabRegister;
if (This->runObjTabRegister == 0xFFFFFFFF){ if (This->runObjTabRegister == 0xFFFFFFFF){
@ -300,12 +300,12 @@ HRESULT WINAPI RunningObjectTableImpl_Revoke( IRunningObjectTable* iface,
TRACE("(%p,%ld)\n",This,dwRegister); TRACE("(%p,%ld)\n",This,dwRegister);
/* verify if the object to be revoked was registred befor or not */ /* verify if the object to be revoked was registered before or not */
if (RunningObjectTableImpl_GetObjectIndex(This,dwRegister,NULL,&index)==S_FALSE) if (RunningObjectTableImpl_GetObjectIndex(This,dwRegister,NULL,&index)==S_FALSE)
return E_INVALIDARG; return E_INVALIDARG;
/* release the object if it was registred with a strong registrantion option */ /* release the object if it was registered with a strong registrantion option */
if ((This->runObjTab[index].regTypeObj & ROTFLAGS_REGISTRATIONKEEPSALIVE)!=0) if ((This->runObjTab[index].regTypeObj & ROTFLAGS_REGISTRATIONKEEPSALIVE)!=0)
IUnknown_Release(This->runObjTab[index].pObj); IUnknown_Release(This->runObjTab[index].pObj);
@ -350,7 +350,7 @@ HRESULT WINAPI RunningObjectTableImpl_GetObject( IRunningObjectTable* iface,
*ppunkObject=0; *ppunkObject=0;
/* verify if the object was registred befor or not */ /* verify if the object was registered before or not */
if (RunningObjectTableImpl_GetObjectIndex(This,-1,pmkObjectName,&index)==S_FALSE) if (RunningObjectTableImpl_GetObjectIndex(This,-1,pmkObjectName,&index)==S_FALSE)
return MK_E_UNAVAILABLE; return MK_E_UNAVAILABLE;
@ -373,7 +373,7 @@ HRESULT WINAPI RunningObjectTableImpl_NoteChangeTime(IRunningObjectTable* iface,
TRACE("(%p,%ld,%p)\n",This,dwRegister,pfiletime); TRACE("(%p,%ld,%p)\n",This,dwRegister,pfiletime);
/* verify if the object to be changed was registred befor or not */ /* verify if the object to be changed was registered before or not */
if (RunningObjectTableImpl_GetObjectIndex(This,dwRegister,NULL,&index)==S_FALSE) if (RunningObjectTableImpl_GetObjectIndex(This,dwRegister,NULL,&index)==S_FALSE)
return E_INVALIDARG; return E_INVALIDARG;
@ -398,7 +398,7 @@ HRESULT WINAPI RunningObjectTableImpl_GetTimeOfLastChange(IRunningObjectTable* i
if (pmkObjectName==NULL || pfiletime==NULL) if (pmkObjectName==NULL || pfiletime==NULL)
return E_INVALIDARG; return E_INVALIDARG;
/* verify if the object was registred befor or not */ /* verify if the object was registered before or not */
if (RunningObjectTableImpl_GetObjectIndex(This,-1,pmkObjectName,&index)==S_FALSE) if (RunningObjectTableImpl_GetObjectIndex(This,-1,pmkObjectName,&index)==S_FALSE)
return MK_E_UNAVAILABLE;; return MK_E_UNAVAILABLE;;
@ -431,10 +431,10 @@ HRESULT WINAPI RunningObjectTableImpl_GetObjectIndex(RunningObjectTableImpl* Thi
TRACE("(%p,%ld,%p,%p)\n",This,identReg,pmk,indx); TRACE("(%p,%ld,%p,%p)\n",This,identReg,pmk,indx);
if (pmk!=NULL) if (pmk!=NULL)
/* search object identified by a moniker*/ /* search object identified by a moniker */
for(i=0 ; (i < This->runObjTabLastIndx) &&(!IMoniker_IsEqual(This->runObjTab[i].pmkObj,pmk)==S_OK);i++); for(i=0 ; (i < This->runObjTabLastIndx) &&(!IMoniker_IsEqual(This->runObjTab[i].pmkObj,pmk)==S_OK);i++);
else else
/* search object identified by a register identifier*/ /* search object identified by a register identifier */
for(i=0;((i<This->runObjTabLastIndx)&&(This->runObjTab[i].identRegObj!=identReg));i++); for(i=0;((i<This->runObjTabLastIndx)&&(This->runObjTab[i].identRegObj!=identReg));i++);
if (i==This->runObjTabLastIndx) return S_FALSE; if (i==This->runObjTabLastIndx) return S_FALSE;
@ -490,3 +490,16 @@ HRESULT WINAPI OleRun(LPUNKNOWN pUnknown)
IRunnableObject_Release(runable); IRunnableObject_Release(runable);
return ret; return ret;
} }
/******************************************************************************
* MkParseDisplayName [OLE32.81]
*/
HRESULT MkParseDisplayName( LPBC pbc, LPCOLESTR szUserName,
LPDWORD pchEaten, LPMONIKER *ppmk)
{
FIXME("(%p, %s, %p, %p): stub.\n", pbc, debugstr_w(szUserName), pchEaten, *ppmk);
if (!(IsValidInterface(pbc)))
return E_INVALIDARG;
return MK_E_SYNTAX;
}

2
dlls/ole32/ole32.spec
View File

@ -81,7 +81,7 @@ type win32
78 stdcall IsValidInterface(ptr) IsValidInterface 78 stdcall IsValidInterface(ptr) IsValidInterface
79 stub IsValidPtrIn 79 stub IsValidPtrIn
80 stub IsValidPtrOut 80 stub IsValidPtrOut
81 stub MkParseDisplayName 81 stdcall MkParseDisplayName(ptr ptr ptr ptr) MkParseDisplayName
82 stdcall MonikerCommonPrefixWith(ptr ptr ptr) MonikerCommonPrefixWith 82 stdcall MonikerCommonPrefixWith(ptr ptr ptr) MonikerCommonPrefixWith
83 stub MonikerRelativePathTo 83 stub MonikerRelativePathTo
84 stdcall OleBuildVersion() OleBuildVersion 84 stdcall OleBuildVersion() OleBuildVersion