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
Johnny Cai
wine
Commits
5e4b7de1
Commit
5e4b7de1
authored
24 years ago
by
Francois Gouget
Committed by
Alexandre Julliard
24 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Completed/corrected the list of include files.
Handle WIN32_LEAN_AND_MEAN and the NOxxx macros.
parent
6371e832
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/windows.h
+51
-5
51 additions, 5 deletions
include/windows.h
include/winnt.h
+2
-0
2 additions, 0 deletions
include/winnt.h
include/winsock.h
+10
-3
10 additions, 3 deletions
include/winsock.h
with
63 additions
and
8 deletions
include/windows.h
+
51
−
5
View file @
5e4b7de1
...
...
@@ -5,21 +5,67 @@
extern
"C"
{
#endif
/* All the basic includes */
/* #include "excpt.h" */
#include
"windef.h"
#include
"winbase.h"
#include
"wingdi.h"
#include
"winuser.h"
#include
"winnls.h"
#include
"wincon.h"
#include
"winver.h"
#include
"winreg.h"
#include
"winnetwk.h"
#include
"winver.h"
/* Not so essential ones */
#ifndef WIN32_LEAN_AND_MEAN
#include
"cderr.h"
#include
"dde.h"
#include
"ddeml.h"
#include
"dlgs.h"
#include
"lzexpand.h"
#include
"shellapi.h"
#include
"ole2.h"
#include
"winnls.h"
#include
"objbase.h"
#include
"mmsystem.h"
/* #include "nb30.h" */
#include
"rpc.h"
#include
"shellapi.h"
/* #include "winperf.h" */
#include
"winsock2.h"
/* #include "mswsock.h" */
#ifndef NOCRYPT
#include
"wincrypt.h"
#endif
/* !NOCRYPT */
#ifndef NOGDI
#include
"commdlg.h"
#include
"winspool.h"
#ifdef INC_OLE1
#include
"ole.h"
#else
#include
"ole2.h"
#endif
#endif
/* !NOGDI */
#endif
/* !WIN32_LEAN_AND_MEAN */
#ifdef INC_OLE2
#include
"ole2.h"
#endif
/* INC_OLE2 */
#ifndef NOSERVICE
#include
"winsvc.h"
#endif
/* !NOSERVICE */
#ifndef NOMCX
#include
"mcx.h"
#endif
/* !NOMCX */
#ifndef NOIMM
#include
"imm.h"
#endif
/* !NOIMM */
#if 0
Where does this belong? Nobody uses this stuff anyway.
...
...
This diff is collapsed.
Click to expand it.
include/winnt.h
+
2
−
0
View file @
5e4b7de1
...
...
@@ -3096,6 +3096,8 @@ typedef enum _CM_ERROR_CONTROL_TYPE
#define RtlFillMemory(Destination, Length, Fill) memset((Destination),(Fill),(Length))
#define RtlZeroMemory(Destination, Length) memset((Destination),0,(Length))
#include
"guiddef.h"
#include
"poppack.h"
#endif
/* __WINE_WINNT_H */
This diff is collapsed.
Click to expand it.
include/winsock.h
+
10
−
3
View file @
5e4b7de1
...
...
@@ -7,16 +7,22 @@
#ifndef _WINSOCKAPI_
#define _WINSOCKAPI_
#ifndef RC_INVOKED
#include
<sys/types.h>
/* Solaris
kludge
*/
/* Solaris
uses these macro names
*/
#undef FSHIFT
#undef PAGESIZE
#undef TRANSPARENT
#include
<netinet/in.h>
/* Restore the Windows values */
#ifdef _WINUSER_
#undef FSHIFT
#undef PAGESIZE
#define FSHIFT 0x04
#endif
#ifdef _WINGDI_
#undef TRANSPARENT
#define TRANSPARENT 1
#endif
#include
<arpa/inet.h>
#include
<sys/time.h>
...
...
@@ -24,6 +30,7 @@
#include
<netdb.h>
#include
<sys/socket.h>
#include
<sys/ioctl.h>
#endif
/* RC_INVOKED */
#include
"windef.h"
...
...
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