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
Sam Joan Roque-Worcel
wine
Commits
45437038
Commit
45437038
authored
24 years ago
by
Francois Gouget
Committed by
Alexandre Julliard
24 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Declare all handles with DECLARE_OLD_HANDLE to ease conversion to
STRICT.
parent
b065697a
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
include/ddeml.h
+4
-4
4 additions, 4 deletions
include/ddeml.h
include/vfw.h
+1
-1
1 addition, 1 deletion
include/vfw.h
include/windef.h
+41
-41
41 additions, 41 deletions
include/windef.h
include/winnt.h
+29
-10
29 additions, 10 deletions
include/winnt.h
include/winsvc.h
+2
-3
2 additions, 3 deletions
include/winsvc.h
with
77 additions
and
59 deletions
include/ddeml.h
+
4
−
4
View file @
45437038
...
...
@@ -205,10 +205,10 @@ extern "C" {
DECLARE_HANDLE
(
HCONVLIST
);
DECLARE_HANDLE
(
HCONV
);
DECLARE_HANDLE
(
HSZ
);
DECLARE_HANDLE
(
HDDEDATA
);
DECLARE_
OLD_
HANDLE
(
HCONVLIST
);
DECLARE_
OLD_
HANDLE
(
HCONV
);
DECLARE_
OLD_
HANDLE
(
HSZ
);
DECLARE_
OLD_
HANDLE
(
HDDEDATA
);
...
...
This diff is collapsed.
Click to expand it.
include/vfw.h
+
1
−
1
View file @
45437038
...
...
@@ -44,7 +44,7 @@ typedef struct IGetFrame IGetFrame,*PGETFRAME;
/* Installable Compressor Manager */
DECLARE_HANDLE
(
HIC
);
DECLARE_
OLD_
HANDLE
(
HIC
);
#ifdef __WINE__
/* HIC struct (same layout as Win95 one) */
...
...
This diff is collapsed.
Click to expand it.
include/windef.h
+
41
−
41
View file @
45437038
...
...
@@ -56,48 +56,48 @@ typedef HANDLE HMONITOR;
/* Handle types that exist both in Win16 and Win32. */
DECLARE_HANDLE
(
HACMDRIVERID
);
DECLARE_HANDLE
(
HACMDRIVER
);
DECLARE_HANDLE
(
HACMOBJ
);
DECLARE_HANDLE
(
HACMSTREAM
);
DECLARE_HANDLE
(
HMETAFILEPICT
);
DECLARE_HANDLE
(
HACCEL
);
DECLARE_HANDLE
(
HBITMAP
);
DECLARE_HANDLE
(
HBRUSH
);
DECLARE_HANDLE
(
HCOLORSPACE
);
DECLARE_HANDLE
(
HDC
);
DECLARE_HANDLE
(
HDROP
);
DECLARE_HANDLE
(
HDRVR
);
DECLARE_HANDLE
(
HDWP
);
DECLARE_HANDLE
(
HENHMETAFILE
);
DECLARE_
OLD_
HANDLE
(
HACMDRIVERID
);
DECLARE_
OLD_
HANDLE
(
HACMDRIVER
);
DECLARE_
OLD_
HANDLE
(
HACMOBJ
);
DECLARE_
OLD_
HANDLE
(
HACMSTREAM
);
DECLARE_
OLD_
HANDLE
(
HMETAFILEPICT
);
DECLARE_
OLD_
HANDLE
(
HACCEL
);
DECLARE_
OLD_
HANDLE
(
HBITMAP
);
DECLARE_
OLD_
HANDLE
(
HBRUSH
);
DECLARE_
OLD_
HANDLE
(
HCOLORSPACE
);
DECLARE_
OLD_
HANDLE
(
HDC
);
DECLARE_
OLD_
HANDLE
(
HDROP
);
DECLARE_
OLD_
HANDLE
(
HDRVR
);
DECLARE_
OLD_
HANDLE
(
HDWP
);
DECLARE_
OLD_
HANDLE
(
HENHMETAFILE
);
typedef
int
HFILE
;
DECLARE_HANDLE
(
HFONT
);
DECLARE_HANDLE
(
HICON
);
DECLARE_HANDLE
(
HINSTANCE
);
DECLARE_HANDLE
(
HKEY
);
DECLARE_HANDLE
(
HMENU
);
DECLARE_HANDLE
(
HMETAFILE
);
DECLARE_HANDLE
(
HMIDI
);
DECLARE_HANDLE
(
HMIDIIN
);
DECLARE_HANDLE
(
HMIDIOUT
);
DECLARE_HANDLE
(
HMIDISTRM
);
DECLARE_HANDLE
(
HMIXER
);
DECLARE_HANDLE
(
HMIXEROBJ
);
DECLARE_HANDLE
(
HMMIO
);
DECLARE_HANDLE
(
HPALETTE
);
DECLARE_HANDLE
(
HPEN
);
DECLARE_HANDLE
(
HQUEUE
);
DECLARE_HANDLE
(
HRGN
);
DECLARE_HANDLE
(
HRSRC
);
DECLARE_HANDLE
(
HTASK
);
DECLARE_HANDLE
(
HWAVE
);
DECLARE_HANDLE
(
HWAVEIN
);
DECLARE_HANDLE
(
HWAVEOUT
);
DECLARE_HANDLE
(
HWINSTA
);
DECLARE_HANDLE
(
HDESK
);
DECLARE_HANDLE
(
HWND
);
DECLARE_HANDLE
(
HKL
);
DECLARE_
OLD_
HANDLE
(
HFONT
);
DECLARE_
OLD_
HANDLE
(
HICON
);
DECLARE_
OLD_
HANDLE
(
HINSTANCE
);
DECLARE_
OLD_
HANDLE
(
HKEY
);
DECLARE_
OLD_
HANDLE
(
HMENU
);
DECLARE_
OLD_
HANDLE
(
HMETAFILE
);
DECLARE_
OLD_
HANDLE
(
HMIDI
);
DECLARE_
OLD_
HANDLE
(
HMIDIIN
);
DECLARE_
OLD_
HANDLE
(
HMIDIOUT
);
DECLARE_
OLD_
HANDLE
(
HMIDISTRM
);
DECLARE_
OLD_
HANDLE
(
HMIXER
);
DECLARE_
OLD_
HANDLE
(
HMIXEROBJ
);
DECLARE_
OLD_
HANDLE
(
HMMIO
);
DECLARE_
OLD_
HANDLE
(
HPALETTE
);
DECLARE_
OLD_
HANDLE
(
HPEN
);
DECLARE_
OLD_
HANDLE
(
HQUEUE
);
DECLARE_
OLD_
HANDLE
(
HRGN
);
DECLARE_
OLD_
HANDLE
(
HRSRC
);
DECLARE_
OLD_
HANDLE
(
HTASK
);
DECLARE_
OLD_
HANDLE
(
HWAVE
);
DECLARE_
OLD_
HANDLE
(
HWAVEIN
);
DECLARE_
OLD_
HANDLE
(
HWAVEOUT
);
DECLARE_
OLD_
HANDLE
(
HWINSTA
);
DECLARE_
OLD_
HANDLE
(
HDESK
);
DECLARE_
OLD_
HANDLE
(
HWND
);
DECLARE_
OLD_
HANDLE
(
HKL
);
/* Handle types that must remain interchangeable even with strict on */
...
...
This diff is collapsed.
Click to expand it.
include/winnt.h
+
29
−
10
View file @
45437038
...
...
@@ -317,24 +317,44 @@ typedef WORD LANGID;
* of WINE code operates on HANDLES as if they are UINTs. So to WINE
* they exist as UINTs but to the Winelib user who turns on strict,
* they exist as void*. If there is a size difference between UINT and
* void* then things get ugly. */
#ifdef STRICT
* void* then things get ugly.
*
* Here is the plan to convert Wine to STRICT:
*
* Types will be converted one at a time by volunteers who will compile
* Wine with STRICT turned on. Handles that have not been converted yet
* will be declared with DECLARE_OLD_HANDLE. Converted handles are
* declared with DECLARE_HANDLE.
* See the bug report 90 for more details:
* http://wine.codeweavers.com/bugzilla/show_bug.cgi?id=90
*/
/*
* when compiling Wine we always treat HANDLE as an UINT. Then when
* we're ready we'll remove the '!defined(__WINE__)' (the equivalent
* of converting it from DECLARE_OLD_HANDLE to DECLARE_HANDLE).
*/
#if defined(STRICT) && !defined(__WINE__)
typedef
VOID
*
HANDLE
;
#define DECLARE_OLD_HANDLE(a) \
typedef struct a##__ { int unused; } *a; \
typedef a *P##a, *LP##a
#else
typedef
UINT
HANDLE
;
#define DECLARE_OLD_HANDLE(a) \
typedef HANDLE a; \
typedef a *P##a, *LP##a
#endif
typedef
HANDLE
*
LPHANDLE
;
typedef
HANDLE
*
PHANDLE
,
*
LPHANDLE
;
#ifdef STRICT
#define DECLARE_HANDLE(a) \
typedef struct a##__ { int unused; } *a; \
typedef a *P##a; \
typedef a *LP##a
typedef struct a##__ { int unused; } *a; \
typedef a *P##a, *LP##a
#else
/*STRICT*/
#define DECLARE_HANDLE(a) \
typedef HANDLE a; \
typedef a *P##a; \
typedef a *LP##a
typedef HANDLE a; \
typedef a *P##a, *LP##a
#endif
/*STRICT*/
...
...
@@ -971,7 +991,6 @@ typedef struct _CONTEXT
#endif
typedef
CONTEXT
*
PCONTEXT
;
typedef
HANDLE
*
PHANDLE
;
#ifdef __WINE__
...
...
This diff is collapsed.
Click to expand it.
include/winsvc.h
+
2
−
3
View file @
45437038
...
...
@@ -80,9 +80,8 @@ extern "C" {
/* Handle types */
DECLARE_HANDLE
(
SC_HANDLE
);
DECLARE_HANDLE
(
SERVICE_STATUS_HANDLE
);
DECLARE_OLD_HANDLE
(
SC_HANDLE
);
DECLARE_OLD_HANDLE
(
SERVICE_STATUS_HANDLE
);
/* Service status structure */
...
...
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