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
b8d0f4cd
Commit
b8d0f4cd
authored
Aug 09, 2005
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Get rid of the almost empty tmarshal.h file.
parent
e659f1e6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
31 deletions
+8
-31
oleaut.c
dlls/oleaut32/oleaut.c
+2
-3
tmarshal.c
dlls/oleaut32/tmarshal.c
+2
-3
tmarshal.h
dlls/oleaut32/tmarshal.h
+0
-24
typelib.h
dlls/oleaut32/typelib.h
+4
-1
No files found.
dlls/oleaut32/oleaut.c
View file @
b8d0f4cd
...
...
@@ -32,8 +32,7 @@
#include "ole2.h"
#include "olectl.h"
#include "oleauto.h"
#include "tmarshal.h"
#include "typelib.h"
#include "wine/debug.h"
...
...
@@ -727,7 +726,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
return
OLEAUTPS_DllGetClassObject
(
&
CLSID_PSDispatch
,
iid
,
ppv
);
}
if
(
IsEqualGUID
(
rclsid
,
&
CLSID_PSOAInterface
))
{
if
(
S_OK
==
T
ypeLibFac
_DllGetClassObject
(
rclsid
,
iid
,
ppv
))
if
(
S_OK
==
T
MARSHAL
_DllGetClassObject
(
rclsid
,
iid
,
ppv
))
return
S_OK
;
/*FALLTHROUGH*/
}
...
...
dlls/oleaut32/tmarshal.c
View file @
b8d0f4cd
...
...
@@ -2305,10 +2305,9 @@ static const IPSFactoryBufferVtbl psfacbufvtbl = {
static
const
IPSFactoryBufferVtbl
*
lppsfac
=
&
psfacbufvtbl
;
/***********************************************************************
*
DllGetClassObject [OLE32.63]
*
TMARSHAL_DllGetClassObject
*/
HRESULT
WINAPI
TypeLibFac_DllGetClassObject
(
REFCLSID
rclsid
,
REFIID
iid
,
LPVOID
*
ppv
)
HRESULT
TMARSHAL_DllGetClassObject
(
REFCLSID
rclsid
,
REFIID
iid
,
LPVOID
*
ppv
)
{
if
(
IsEqualIID
(
iid
,
&
IID_IPSFactoryBuffer
))
{
*
ppv
=
&
lppsfac
;
...
...
dlls/oleaut32/tmarshal.h
deleted
100644 → 0
View file @
e659f1e6
/*
* Copyright 2002 Marcus Meissner
*
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef TMARSHAL_H
#define TMARSHAL_H
HRESULT
WINAPI
TypeLibFac_DllGetClassObject
(
REFCLSID
rclsid
,
REFIID
iid
,
LPVOID
*
ppv
);
#endif
dlls/oleaut32/typelib.h
View file @
b8d0f4cd
...
...
@@ -597,9 +597,12 @@ WORD offset from start of block to SAFEARRAY
WORD typeofarray
*/
#include "poppack.h"
extern
DWORD
_invoke
(
FARPROC
func
,
CALLCONV
callconv
,
int
nrargs
,
DWORD
*
args
);
extern
void
dump_Variant
(
VARIANT
*
pvar
);
#include "poppack.h"
HRESULT
TMARSHAL_DllGetClassObject
(
REFCLSID
rclsid
,
REFIID
iid
,
LPVOID
*
ppv
);
/*---------------------------END--------------------------------------------*/
#endif
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