Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
434842e1
Commit
434842e1
authored
Jan 16, 2014
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Jan 16, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dmcompos: None of the COM classes support aggregation.
parent
4f3931eb
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
18 deletions
+25
-18
chordmap.c
dlls/dmcompos/chordmap.c
+2
-1
chordmaptrack.c
dlls/dmcompos/chordmaptrack.c
+2
-1
composer.c
dlls/dmcompos/composer.c
+2
-1
dmcompos_main.c
dlls/dmcompos/dmcompos_main.c
+13
-10
dmcompos_private.h
dlls/dmcompos/dmcompos_private.h
+4
-4
signposttrack.c
dlls/dmcompos/signposttrack.c
+2
-1
No files found.
dlls/dmcompos/chordmap.c
View file @
434842e1
...
...
@@ -524,7 +524,8 @@ static const IPersistStreamVtbl DirectMusicChordMap_PersistStream_Vtbl = {
};
/* for ClassFactory */
HRESULT
WINAPI
DMUSIC_CreateDirectMusicChordMapImpl
(
LPCGUID
lpcGUID
,
LPVOID
*
ppobj
,
LPUNKNOWN
pUnkOuter
)
{
HRESULT
WINAPI
create_dmchordmap
(
REFIID
lpcGUID
,
void
**
ppobj
)
{
IDirectMusicChordMapImpl
*
obj
;
obj
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
IDirectMusicChordMapImpl
));
...
...
dlls/dmcompos/chordmaptrack.c
View file @
434842e1
...
...
@@ -269,7 +269,8 @@ static const IPersistStreamVtbl DirectMusicChordMapTrack_PersistStream_Vtbl = {
};
/* for ClassFactory */
HRESULT
WINAPI
DMUSIC_CreateDirectMusicChordMapTrack
(
LPCGUID
lpcGUID
,
LPVOID
*
ppobj
,
LPUNKNOWN
pUnkOuter
)
{
HRESULT
WINAPI
create_dmchordmaptrack
(
REFIID
lpcGUID
,
void
**
ppobj
)
{
IDirectMusicChordMapTrack
*
track
;
track
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
IDirectMusicChordMapTrack
));
...
...
dlls/dmcompos/composer.c
View file @
434842e1
...
...
@@ -112,7 +112,8 @@ static const IDirectMusicComposerVtbl DirectMusicComposer_Vtbl = {
};
/* for ClassFactory */
HRESULT
WINAPI
DMUSIC_CreateDirectMusicComposerImpl
(
LPCGUID
lpcGUID
,
LPVOID
*
ppobj
,
LPUNKNOWN
pUnkOuter
)
{
HRESULT
WINAPI
create_dmcomposer
(
REFIID
lpcGUID
,
void
**
ppobj
)
{
IDirectMusicComposerImpl
*
obj
;
obj
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
IDirectMusicComposerImpl
));
...
...
dlls/dmcompos/dmcompos_main.c
View file @
434842e1
...
...
@@ -30,12 +30,12 @@ LONG DMCOMPOS_refCount = 0;
typedef
struct
{
IClassFactory
IClassFactory_iface
;
HRESULT
WINAPI
(
*
fnCreateInstance
)(
REFIID
riid
,
void
**
ppv
,
IUnknown
*
pUnkOuter
);
HRESULT
WINAPI
(
*
fnCreateInstance
)(
REFIID
riid
,
void
**
ret_iface
);
}
IClassFactoryImpl
;
static
HRESULT
WINAPI
create_direct_music_template
(
REFIID
riid
,
void
**
ppv
,
IUnknown
*
pUnkOuter
)
static
HRESULT
WINAPI
create_direct_music_template
(
REFIID
riid
,
void
**
ret_iface
)
{
FIXME
(
"(%
p, %s, %p) stub
\n
"
,
pUnkOuter
,
debugstr_dmguid
(
riid
),
ppv
);
FIXME
(
"(%
s, %p) stub
\n
"
,
debugstr_dmguid
(
riid
),
ret_iface
);
return
CLASS_E_CLASSNOTAVAILABLE
;
}
...
...
@@ -89,7 +89,12 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown
TRACE
(
"(%p, %s, %p)
\n
"
,
pUnkOuter
,
debugstr_dmguid
(
riid
),
ppv
);
return
This
->
fnCreateInstance
(
riid
,
ppv
,
pUnkOuter
);
if
(
pUnkOuter
)
{
*
ppv
=
NULL
;
return
CLASS_E_NOAGGREGATION
;
}
return
This
->
fnCreateInstance
(
riid
,
ppv
);
}
static
HRESULT
WINAPI
ClassFactory_LockServer
(
IClassFactory
*
iface
,
BOOL
dolock
)
...
...
@@ -112,13 +117,11 @@ static const IClassFactoryVtbl classfactory_vtbl = {
ClassFactory_LockServer
};
static
IClassFactoryImpl
ChordMap_CF
=
{{
&
classfactory_vtbl
},
DMUSIC_CreateDirectMusicChordMapImpl
};
static
IClassFactoryImpl
Composer_CF
=
{{
&
classfactory_vtbl
},
DMUSIC_CreateDirectMusicComposerImpl
};
static
IClassFactoryImpl
ChordMapTrack_CF
=
{{
&
classfactory_vtbl
},
DMUSIC_CreateDirectMusicChordMapTrack
};
static
IClassFactoryImpl
ChordMap_CF
=
{{
&
classfactory_vtbl
},
create_dmchordmap
};
static
IClassFactoryImpl
Composer_CF
=
{{
&
classfactory_vtbl
},
create_dmcomposer
};
static
IClassFactoryImpl
ChordMapTrack_CF
=
{{
&
classfactory_vtbl
},
create_dmchordmaptrack
};
static
IClassFactoryImpl
Template_CF
=
{{
&
classfactory_vtbl
},
create_direct_music_template
};
static
IClassFactoryImpl
SignPostTrack_CF
=
{{
&
classfactory_vtbl
},
DMUSIC_CreateDirectMusicSignPostTrack
};
static
IClassFactoryImpl
SignPostTrack_CF
=
{{
&
classfactory_vtbl
},
create_dmsignposttrack
};
/******************************************************************
* DllMain
...
...
dlls/dmcompos/dmcompos_private.h
View file @
434842e1
...
...
@@ -53,10 +53,10 @@ typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack;
/*****************************************************************************
* ClassFactory
*/
extern
HRESULT
WINAPI
DMUSIC_CreateDirectMusicChordMapImpl
(
LPCGUID
lpcGUID
,
LPVOID
*
ppobj
,
LPUNKNOWN
pUnkOuter
)
DECLSPEC_HIDDEN
;
extern
HRESULT
WINAPI
DMUSIC_CreateDirectMusicComposerImpl
(
LPCGUID
lpcGUID
,
LPVOID
*
ppobj
,
LPUNKNOWN
pUnkOuter
)
DECLSPEC_HIDDEN
;
extern
HRESULT
WINAPI
DMUSIC_CreateDirectMusicChordMapTrack
(
LPCGUID
lpcGUID
,
LPVOID
*
ppobj
,
LPUNKNOWN
pUnkOuter
)
DECLSPEC_HIDDEN
;
extern
HRESULT
WINAPI
DMUSIC_CreateDirectMusicSignPostTrack
(
LPCGUID
lpcGUID
,
LPVOID
*
ppobj
,
LPUNKNOWN
pUnkOuter
)
DECLSPEC_HIDDEN
;
extern
HRESULT
WINAPI
create_dmchordmap
(
REFIID
riid
,
void
**
ret_iface
)
DECLSPEC_HIDDEN
;
extern
HRESULT
WINAPI
create_dmcomposer
(
REFIID
riid
,
void
**
ret_iface
)
DECLSPEC_HIDDEN
;
extern
HRESULT
WINAPI
create_dmchordmaptrack
(
REFIID
riid
,
void
**
ret_iface
)
DECLSPEC_HIDDEN
;
extern
HRESULT
WINAPI
create_dmsignposttrack
(
REFIID
riid
,
void
**
ret_iface
)
DECLSPEC_HIDDEN
;
/*****************************************************************************
* IDirectMusicChordMapImpl implementation structure
...
...
dlls/dmcompos/signposttrack.c
View file @
434842e1
...
...
@@ -267,7 +267,8 @@ static const IPersistStreamVtbl DirectMusicSignPostTrack_PersistStream_Vtbl =
};
/* for ClassFactory */
HRESULT
WINAPI
DMUSIC_CreateDirectMusicSignPostTrack
(
LPCGUID
lpcGUID
,
LPVOID
*
ppobj
,
LPUNKNOWN
pUnkOuter
)
{
HRESULT
WINAPI
create_dmsignposttrack
(
REFIID
lpcGUID
,
void
**
ppobj
)
{
IDirectMusicSignPostTrack
*
track
;
track
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
IDirectMusicSignPostTrack
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment