mirror of
https://github.com/reactos/wine.git
synced 2024-11-25 04:39:45 +00:00
Moved some definitions from include/wine/obj_moniker.h to
dlls/ole32/moniker.h.
This commit is contained in:
parent
174b188444
commit
a93a5e9ce0
@ -25,9 +25,14 @@
|
||||
#include "wine/unicode.h"
|
||||
#include "objbase.h"
|
||||
#include "wine/debug.h"
|
||||
#include "moniker.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||
|
||||
const CLSID CLSID_AntiMoniker = {
|
||||
0x305, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46}
|
||||
};
|
||||
|
||||
/* AntiMoniker data structure */
|
||||
typedef struct AntiMonikerImpl{
|
||||
|
||||
|
@ -24,9 +24,14 @@
|
||||
#include "wine/debug.h"
|
||||
#include "wine/unicode.h"
|
||||
#include "ole2.h"
|
||||
#include "moniker.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||
|
||||
const CLSID CLSID_CompositeMoniker = {
|
||||
0x309, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46}
|
||||
};
|
||||
|
||||
#define BLOCK_TAB_SIZE 5 /* represent the first size table and it's increment block size */
|
||||
|
||||
/* CompositeMoniker data structure */
|
||||
@ -1715,5 +1720,3 @@ HRESULT WINAPI MonikerCommonPrefixWith(IMoniker* pmkThis,IMoniker* pmkOther,IMon
|
||||
FIXME("(),stub!\n");
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
|
||||
|
@ -26,11 +26,16 @@
|
||||
#include "wine/unicode.h"
|
||||
#include "wine/debug.h"
|
||||
#include "objbase.h"
|
||||
#include "moniker.h"
|
||||
|
||||
#include "compobj_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||
|
||||
const CLSID CLSID_FileMoniker = {
|
||||
0x303, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46}
|
||||
};
|
||||
|
||||
/* filemoniker data structure */
|
||||
typedef struct FileMonikerImpl{
|
||||
|
||||
|
@ -26,9 +26,14 @@
|
||||
#include "wine/debug.h"
|
||||
#include "ole2.h"
|
||||
#include "wine/unicode.h"
|
||||
#include "moniker.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||
|
||||
const CLSID CLSID_ItemMoniker = {
|
||||
0x304, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46}
|
||||
};
|
||||
|
||||
/* ItemMoniker data structure */
|
||||
typedef struct ItemMonikerImpl{
|
||||
|
||||
|
11
dlls/ole32/moniker.h
Normal file
11
dlls/ole32/moniker.h
Normal file
@ -0,0 +1,11 @@
|
||||
#ifndef __WINE_MONIKER_H__
|
||||
#define __WINE_MONIKER_H__
|
||||
|
||||
#define ICOM_THIS_From_IROTData(class, name) class* This = (class*)(((char*)name)-sizeof(void*))
|
||||
|
||||
extern const CLSID CLSID_FileMoniker;
|
||||
extern const CLSID CLSID_ItemMoniker;
|
||||
extern const CLSID CLSID_AntiMoniker;
|
||||
extern const CLSID CLSID_CompositeMoniker;
|
||||
|
||||
#endif /* __WINE_MONIKER_H__ */
|
@ -50,14 +50,6 @@ typedef struct IRunnableObject IRunnableObject,*LPRUNNABLEOBJECT;
|
||||
DEFINE_OLEGUID(IID_IRunningObjectTable, 0x00000010L, 0, 0);
|
||||
typedef struct IRunningObjectTable IRunningObjectTable,*LPRUNNINGOBJECTTABLE;
|
||||
|
||||
DEFINE_GUID( CLSID_FileMoniker,0x00000303,0,0,0xc0,0,0,0,0,0,0,0x46);
|
||||
|
||||
DEFINE_GUID( CLSID_ItemMoniker,0x00000304,0,0,0xc0,0,0,0,0,0,0,0x46);
|
||||
|
||||
DEFINE_GUID( CLSID_AntiMoniker,0x00000305,0,0,0xc0,0,0,0,0,0,0,0x46);
|
||||
|
||||
DEFINE_GUID( CLSID_CompositeMoniker,0x00000309,0,0,0xc0,0,0,0,0,0,0,0x46);
|
||||
|
||||
/*********************************************************************************
|
||||
* BIND_OPTS and BIND_OPTS2 structures definition
|
||||
* These structures contain parameters used during a moniker-binding operation.
|
||||
@ -260,8 +252,6 @@ ICOM_DEFINE(IROTData,IUnknown)
|
||||
/*** IROTData methods ***/
|
||||
#define IROTData_GetComparisonData(p,a,b,c) ICOM_CALL3(GetComparisonData,p,a,b,c)
|
||||
|
||||
#define ICOM_THIS_From_IROTData(class, name) class* This = (class*)(((char*)name)-sizeof(void*))
|
||||
|
||||
/*****************************************************************************
|
||||
* IRunnableObject interface
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user