Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Li Wenzhe
wine
Commits
6a3ad422
Commit
6a3ad422
authored
25 years ago
by
Patrik Stridvall
Committed by
Alexandre Julliard
25 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Added CINTERFACE and NONAMELESSUNION support.
parent
14da7b1c
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
include/commctrl.h
+3
-3
3 additions, 3 deletions
include/commctrl.h
include/prsht.h
+3
-3
3 additions, 3 deletions
include/prsht.h
include/wine/obj_dataobject.h
+9
-5
9 additions, 5 deletions
include/wine/obj_dataobject.h
include/wtypes.h
+3
-3
3 additions, 3 deletions
include/wtypes.h
with
18 additions
and
14 deletions
include/commctrl.h
+
3
−
3
View file @
6a3ad422
...
...
@@ -12,21 +12,21 @@
/* c++ likes nameless unions whereas c doesnt */
/* (used in property sheet structures) */
#ifdef
__cplusplus
#if
def
ined(
__cplusplus
) && !defined(NONAMELESSUNION)
#define DUMMYUNIONNAME
#define DUMMYUNIONNAME1
#define DUMMYUNIONNAME2
#define DUMMYUNIONNAME3
#define DUMMYUNIONNAME4
#define DUMMYUNIONNAME5
#else
#else
/* defined(__cplusplus) && !defined(NONAMELESSUNION) */
#define DUMMYUNIONNAME u
#define DUMMYUNIONNAME1 u1
#define DUMMYUNIONNAME2 u2
#define DUMMYUNIONNAME3 u3
#define DUMMYUNIONNAME4 u4
#define DUMMYUNIONNAME5 u5
#endif
#endif
/* defined(__cplusplus) && !defined(NONAMELESSUNION) */
#ifdef __cplusplus
extern
"C"
{
...
...
This diff is collapsed.
Click to expand it.
include/prsht.h
+
3
−
3
View file @
6a3ad422
...
...
@@ -31,21 +31,21 @@ typedef BOOL (CALLBACK *LPFNADDPROPSHEETPAGES)(LPVOID, LPFNADDPROPSHEETPAGE, LPA
/* c++ likes nameless unions whereas c doesnt */
/* (used in property sheet structures) */
#ifdef
__cplusplus
#if
def
ined(
__cplusplus
) && !defined(NONAMELESSUNION)
#define DUMMYUNIONNAME
#define DUMMYUNIONNAME1
#define DUMMYUNIONNAME2
#define DUMMYUNIONNAME3
#define DUMMYUNIONNAME4
#define DUMMYUNIONNAME5
#else
#else
/* defined(__cplusplus) && !defined(NONAMELESSUNION) */
#define DUMMYUNIONNAME u
#define DUMMYUNIONNAME1 u1
#define DUMMYUNIONNAME2 u2
#define DUMMYUNIONNAME3 u3
#define DUMMYUNIONNAME4 u4
#define DUMMYUNIONNAME5 u5
#endif
#endif
/* defined(__cplusplus) && !defined(NONAMELESSUNION) */
/*
* Property sheet support (structures)
...
...
This diff is collapsed.
Click to expand it.
include/wine/obj_dataobject.h
+
9
−
5
View file @
6a3ad422
...
...
@@ -7,11 +7,15 @@
#ifndef __WINE_WINE_OBJ_DATAOBJECT_H
#define __WINE_WINE_OBJ_DATAOBJECT_H
#if defined(__cplusplus) && !defined(NONAMELESSUNION)
#define DUMMYUNIONNAME
#else
/* defined(__cplusplus) && !defined(NONAMELESSUNION) */
#define DUMMYUNIONNAME u
#endif
/* defined(__cplusplus) && !defined(NONAMELESSUNION) */
#ifdef __cplusplus
#define DUMMY_UNION_NAME
#else
#define DUMMY_UNION_NAME u
#endif
extern
"C"
{
#endif
/* defined(__cplusplus) */
/*****************************************************************************
* Predeclare the structures
...
...
@@ -118,7 +122,7 @@ struct STGMEDIUM
LPOLESTR
lpszFileName
;
IStream
*
pstm
;
IStorage
*
pstg
;
}
DUMMY
_
UNION
_
NAME
;
}
DUMMYUNIONNAME
;
IUnknown
*
pUnkForRelease
;
};
...
...
This diff is collapsed.
Click to expand it.
include/wtypes.h
+
3
−
3
View file @
6a3ad422
...
...
@@ -51,17 +51,17 @@ typedef GUID *LPGUID;
typedef
GUID
CLSID
,
*
LPCLSID
;
typedef
GUID
IID
,
*
LPIID
;
typedef
GUID
FMTID
,
*
LPFMTID
;
#ifdef
__cplusplus
#if
def
ined(
__cplusplus
) && !defined(CINTERFACE)
#define REFGUID const GUID &
#define REFCLSID const CLSID &
#define REFIID const IID &
#define REFFMTID const FMTID &
#else
/* !defined(__cplusplus) */
#else
/* !defined(__cplusplus)
&& !defined(CINTERFACE)
*/
#define REFGUID const GUID* const
#define REFCLSID const CLSID* const
#define REFIID const IID* const
#define REFFMTID const FMTID* const
#endif
/* !defined(__cplusplus) */
#endif
/* !defined(__cplusplus)
&& !defined(CINTERFACE)
*/
extern
const
IID
GUID_NULL
;
#define IID_NULL GUID_NULL
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment