marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32: Remove duplicated CLSIDs.

oldstable
Robert Shearman 2006-05-08 15:55:25 +01:00 committed by Alexandre Julliard
parent 8a4f71c61e
commit b155f233f3
2 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/ole32/compobj_private.h
View File

@ -41,6 +41,9 @@
struct apartment;
typedef struct apartment APARTMENT;
extern const CLSID CLSID_PSFactoryBuffer;
extern const CLSID CLSID_DfMarshal;
/* Thread-safety Annotation Legend:
*
* RO - The value is read only. It never changes after creation, so no

24
dlls/ole32/regsvr.c
View File

@ -33,6 +33,7 @@
#include "compobj_private.h"
#include "ole2.h"
#include "olectl.h"
#include "moniker.h"
#include "wine/debug.h"
@ -398,35 +399,12 @@ static LONG recursive_delete_key(HKEY key)
/***********************************************************************
* coclass list
*/
static GUID const CLSID_FileMoniker = {
0x00000303, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
static GUID const CLSID_ItemMoniker = {
0x00000304, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
static GUID const CLSID_AntiMoniker = {
0x00000305, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
static GUID const CLSID_PointerMoniker = {
0x00000306, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
static GUID const CLSID_PackagerMoniker = {
0x00000308, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
static GUID const CLSID_CompositeMoniker = {
0x00000309, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
/* FIXME: DfMarshal and PSFactoryBuffer are defined elsewhere too */
static GUID const CLSID_DfMarshal = {
0x0000030B, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
static GUID const CLSID_ClassMoniker = {
0x0000031A, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
static GUID const CLSID_PSFactoryBuffer = {
0x00000320, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} };
static struct regsvr_coclass const coclass_list[] = {
{ &CLSID_FileMoniker,
"FileMoniker",