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

ole32: Use the standard DEFINE_OLEGUID macro to define GUIDs.

This commit is contained in:
Alexandre Julliard 2006-06-09 21:09:49 +02:00
parent 707060913c
commit 32f57b0214
11 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/ole32/antimoniker.c
View File

@ -35,10 +35,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
const CLSID CLSID_AntiMoniker = {
0x305, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46}
};
/* AntiMoniker data structure */ /* AntiMoniker data structure */
typedef struct AntiMonikerImpl{ typedef struct AntiMonikerImpl{

4
dlls/ole32/classmoniker.c
View File

@ -39,10 +39,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
const GUID CLSID_ClassMoniker = {
0x31A, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46}
};
#define CHARS_IN_GUID 39 #define CHARS_IN_GUID 39
/* ClassMoniker data structure */ /* ClassMoniker data structure */

5
dlls/ole32/compobj_private.h
View File

@ -41,8 +41,9 @@
struct apartment; struct apartment;
typedef struct apartment APARTMENT; typedef struct apartment APARTMENT;
extern const CLSID CLSID_PSFactoryBuffer; DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 );
extern const CLSID CLSID_DfMarshal; DEFINE_OLEGUID( CLSID_PSFactoryBuffer, 0x00000320, 0, 0 );
DEFINE_OLEGUID( CLSID_InProcFreeMarshaler, 0x0000033a, 0, 0 );
/* Thread-safety Annotation Legend: /* Thread-safety Annotation Legend:
* *

4
dlls/ole32/compositemoniker.c
View File

@ -37,10 +37,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole); 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 */ #define BLOCK_TAB_SIZE 5 /* represent the first size table and it's increment block size */
/* CompositeMoniker data structure */ /* CompositeMoniker data structure */

4
dlls/ole32/filemoniker.c
View File

@ -39,10 +39,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
const CLSID CLSID_FileMoniker = {
0x303, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46}
};
/* filemoniker data structure */ /* filemoniker data structure */
typedef struct FileMonikerImpl{ typedef struct FileMonikerImpl{

2
dlls/ole32/ftmarshal.c
View File

@ -38,8 +38,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
const CLSID CLSID_InProcFreeMarshaler = { 0x33A, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46} };
typedef struct _FTMarshalImpl { typedef struct _FTMarshalImpl {
const IUnknownVtbl *lpVtbl; const IUnknownVtbl *lpVtbl;
LONG ref; LONG ref;

4
dlls/ole32/itemmoniker.c
View File

@ -38,10 +38,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
const CLSID CLSID_ItemMoniker = {
0x304, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46}
};
/* ItemMoniker data structure */ /* ItemMoniker data structure */
typedef struct ItemMonikerImpl{ typedef struct ItemMonikerImpl{

32
dlls/ole32/moniker.h
View File

@ -1,11 +1,33 @@
/*
* Monikers
*
* Copyright 1998 Marcus Meissner
* Copyright 1999 Noomen Hamza
* Copyright 2005 Robert Shearman (for CodeWeavers)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __WINE_MONIKER_H__ #ifndef __WINE_MONIKER_H__
#define __WINE_MONIKER_H__ #define __WINE_MONIKER_H__
extern const CLSID CLSID_FileMoniker; DEFINE_OLEGUID( CLSID_FileMoniker, 0x303, 0, 0 );
extern const CLSID CLSID_ItemMoniker; DEFINE_OLEGUID( CLSID_ItemMoniker, 0x304, 0, 0 );
extern const CLSID CLSID_AntiMoniker; DEFINE_OLEGUID( CLSID_AntiMoniker, 0x305, 0, 0 );
extern const CLSID CLSID_CompositeMoniker; DEFINE_OLEGUID( CLSID_CompositeMoniker, 0x309, 0, 0 );
extern const CLSID CLSID_ClassMoniker; DEFINE_OLEGUID( CLSID_ClassMoniker, 0x31a, 0, 0 );
HRESULT FileMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT FileMonikerCF_Create(REFIID riid, LPVOID *ppv);
HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv);

3
dlls/ole32/oleproxy.c
View File

@ -63,9 +63,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
const CLSID CLSID_DfMarshal = { 0x0000030b, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46} };
const CLSID CLSID_PSFactoryBuffer = { 0x00000320, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46} };
static ULONG WINAPI RURpcProxyBufferImpl_Release(LPRPCPROXYBUFFER iface); static ULONG WINAPI RURpcProxyBufferImpl_Release(LPRPCPROXYBUFFER iface);
/* From: http://msdn.microsoft.com/library/en-us/com/cmi_m_4lda.asp /* From: http://msdn.microsoft.com/library/en-us/com/cmi_m_4lda.asp

3
dlls/ole32/regsvr.c
View File

@ -30,9 +30,10 @@
#include "winerror.h" #include "winerror.h"
#include "objbase.h" #include "objbase.h"
#include "compobj_private.h"
#include "ole2.h" #include "ole2.h"
#include "olectl.h" #include "olectl.h"
#include "initguid.h"
#include "compobj_private.h"
#include "moniker.h" #include "moniker.h"
#include "wine/debug.h" #include "wine/debug.h"

2
dlls/ole32/stubmanager.c
View File

@ -560,8 +560,6 @@ BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid)
* interacts with stub managers. * interacts with stub managers.
*/ */
const IID IID_IRemUnknown = { 0x00000131, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46} };
typedef struct rem_unknown typedef struct rem_unknown
{ {
const IRemUnknownVtbl *lpVtbl; const IRemUnknownVtbl *lpVtbl;