ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved Multimonitor API declarations to windows.h.

This commit is contained in:
Turchanov Sergey 1998-10-18 11:56:35 +00:00 committed by Alexandre Julliard
parent 86f5d82f2f
commit 656eb96577
5 changed files with 73 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ddraw.h
View File

@ -684,7 +684,6 @@ DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK)
typedef HRESULT (CALLBACK * LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID); typedef HRESULT (CALLBACK * LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID);
typedef HRESULT (CALLBACK * LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID); typedef HRESULT (CALLBACK * LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID);
typedef HANDLE32 HMONITOR;
typedef BOOL32 (CALLBACK * LPDDENUMCALLBACKEX32A)(GUID *, LPSTR, LPSTR, LPVOID, HMONITOR); typedef BOOL32 (CALLBACK * LPDDENUMCALLBACKEX32A)(GUID *, LPSTR, LPSTR, LPVOID, HMONITOR);
typedef BOOL32 (CALLBACK * LPDDENUMCALLBACKEX32W)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR); typedef BOOL32 (CALLBACK * LPDDENUMCALLBACKEX32W)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR);
DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX) DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX)

65
include/multimon.h
View File

@ -1,65 +0,0 @@
/*
* Multimonitor APIs
*
* Copyright 1998 Turchanov Sergey
*/
#ifndef __WINE_MULTIMON_H
#define __WINE_MULTIMON_H
#define MONITOR_DEFAULTTONULL 0x00000000
#define MONITOR_DEFAULTTOPRIMARY 0x00000001
#define MONITOR_DEFAULTTONEAREST 0x00000002
#define HMONITOR HANDLE32
HMONITOR WINAPI MonitorFromPoint(POINT32 pt, DWORD dwFlags);
HMONITOR WINAPI MonitorFromRect(LPRECT32 lprc, DWORD dwFlags);
HMONITOR WINAPI MonitorFromWindow(HWND32 hwnd, DWORD dwFlags);
#define MONITORINFOF_PRIMARY 0x00000001
#ifndef CCHDEVICENAME
#define CCHDEVICENAME 32
#endif
typedef struct tagMONITORINFO
{
DWORD cbSize;
RECT32 rcMonitor;
RECT32 rcWork;
DWORD dwFlags;
} MONITORINFO, *LPMONITORINFO;
typedef struct tagMONITORINFOEX32A
{
MONITORINFO dummy;
CHAR szDevice[CCHDEVICENAME];
} MONITORINFOEX32A, *LPMONITORINFOEX32A;
typedef struct tagMONITORINFOEX32W
{
MONITORINFO dummy;
WCHAR szDevice[CCHDEVICENAME];
} MONITORINFOEX32W, *LPMONITORINFOEX32W;
DECL_WINELIB_TYPE_AW (MONITOINFOEX)
DECL_WINELIB_TYPE_AW (LPMONITORINFOEXW)
BOOL32 WINAPI GetMonitorInfo32A(HMONITOR hMonitor, LPMONITORINFO lpmi);
BOOL32 WINAPI GetMonitorInfo32W(HMONITOR hMonitor, LPMONITORINFO lpmi);
#define GetMonitorInfo WINELIB_NAME_AW(GetMonitorInfo)
typedef BOOL32 (CALLBACK* MONITORENUMPROC)(HMONITOR, HDC32, LPRECT32, LPARAM);
BOOL32 WINAPI EnumDisplayMonitors(
HDC32 hdc,
LPRECT32 lprcClip,
MONITORENUMPROC lpfnEnum,
LPARAM dwData);
#endif __WINE_MULTIMON_H

87
include/windows.h
View File

@ -5477,6 +5477,14 @@ typedef struct {
/* File creation flags /* File creation flags
*/ */
#define FILE_FLAG_WRITE_THROUGH 0x80000000UL
#define FILE_FLAG_OVERLAPPED 0x40000000L
#define FILE_FLAG_NO_BUFFERING 0x20000000L
#define FILE_FLAG_RANDOM_ACCESS 0x10000000L
#define FILE_FLAG_SEQUENTIAL_SCAN 0x08000000L
#define FILE_FLAG_DELETE_ON_CLOSE 0x04000000L
#define FILE_FLAG_BACKUP_SEMANTICS 0x02000000L
#define FILE_FLAG_POSIX_SEMANTICS 0x01000000L
#define CREATE_NEW 1 #define CREATE_NEW 1
#define CREATE_ALWAYS 2 #define CREATE_ALWAYS 2
#define OPEN_EXISTING 3 #define OPEN_EXISTING 3
@ -5505,17 +5513,21 @@ typedef struct
/* File attribute flags /* File attribute flags
*/ */
#define FILE_ATTRIBUTE_READONLY 0x0001 #define FILE_SHARE_READ 0x00000001L
#define FILE_ATTRIBUTE_HIDDEN 0x0002 #define FILE_SHARE_WRITE 0x00000002L
#define FILE_ATTRIBUTE_SYSTEM 0x0004 #define FILE_SHARE_DELETE 0x00000004L
#define FILE_ATTRIBUTE_LABEL 0x0008 /* Not in Windows API */ #define FILE_ATTRIBUTE_READONLY 0x00000001L
#define FILE_ATTRIBUTE_DIRECTORY 0x0010 #define FILE_ATTRIBUTE_HIDDEN 0x00000002L
#define FILE_ATTRIBUTE_ARCHIVE 0x0020 #define FILE_ATTRIBUTE_SYSTEM 0x00000004L
#define FILE_ATTRIBUTE_NORMAL 0x0080 #define FILE_ATTRIBUTE_LABEL 0x00000008L /* Not in Windows API */
#define FILE_ATTRIBUTE_TEMPORARY 0x0100 #define FILE_ATTRIBUTE_DIRECTORY 0x00000010L
#define FILE_ATTRIBUTE_ATOMIC_WRITE 0x0200 #define FILE_ATTRIBUTE_ARCHIVE 0x00000020L
#define FILE_ATTRIBUTE_XACTION_WRITE 0x0400 #define FILE_ATTRIBUTE_NORMAL 0x00000080L
#define FILE_ATTRIBUTE_COMPRESSED 0x0800 #define FILE_ATTRIBUTE_TEMPORARY 0x00000100L
#define FILE_ATTRIBUTE_ATOMIC_WRITE 0x00000200L
#define FILE_ATTRIBUTE_XACTION_WRITE 0x00000400L
#define FILE_ATTRIBUTE_COMPRESSED 0x00000800L
#define FILE_ATTRIBUTE_OFFLINE 0x00001000L
/* File alignments (NT) */ /* File alignments (NT) */
#define FILE_BYTE_ALIGNMENT 0x00000000 #define FILE_BYTE_ALIGNMENT 0x00000000
@ -5832,12 +5844,17 @@ typedef struct _SYSTEM_POWER_STATUS
/* loadflags to LoadImage */ /* loadflags to LoadImage */
#define LR_DEFAULTCOLOR 0x0000 #define LR_DEFAULTCOLOR 0x0000
#define LR_MONOCHROME 0x0001 #define LR_MONOCHROME 0x0001
#define LR_COPYRETURNONORG 0x0002 #define LR_COLOR 0x0002
#define LR_COPYDELETEORC 0x0004 #define LR_COPYRETURNORG 0x0004
#define LR_COPYFROMRESOURCE 0x0008 #define LR_COPYDELETEORG 0x0008
#define LR_LOADFROMFILE 0x0010 #define LR_LOADFROMFILE 0x0010
#define LR_LOADREALSIZE 0x0020 #define LR_LOADTRANSPARENT 0x0020
#define LR_DEFAULTSIZE 0x0040
#define LR_VGA_COLOR 0x0080
#define LR_LOADMAP3DCOLORS 0x1000 #define LR_LOADMAP3DCOLORS 0x1000
#define LR_CREATEDIBSECTION 0x2000
#define LR_COPYFROMRESOURCE 0x4000
#define LR_SHARED 0x8000
/* Flags for PolyDraw and GetPath */ /* Flags for PolyDraw and GetPath */
#define PT_CLOSEFIGURE 0x0001 #define PT_CLOSEFIGURE 0x0001
@ -6460,6 +6477,36 @@ typedef struct _SEGINFO {
UINT16 reserved[2]; UINT16 reserved[2];
} SEGINFO; } SEGINFO;
#define MONITOR_DEFAULTTONULL 0x00000000
#define MONITOR_DEFAULTTOPRIMARY 0x00000001
#define MONITOR_DEFAULTTONEAREST 0x00000002
#define MONITORINFOF_PRIMARY 0x00000001
typedef struct tagMONITORINFO
{
DWORD cbSize;
RECT32 rcMonitor;
RECT32 rcWork;
DWORD dwFlags;
} MONITORINFO, *LPMONITORINFO;
typedef struct tagMONITORINFOEX32A
{
MONITORINFO dummy;
CHAR szDevice[CCHDEVICENAME];
} MONITORINFOEX32A, *LPMONITORINFOEX32A;
typedef struct tagMONITORINFOEX32W
{
MONITORINFO dummy;
WCHAR szDevice[CCHDEVICENAME];
} MONITORINFOEX32W, *LPMONITORINFOEX32W;
DECL_WINELIB_TYPE_AW(MONITORINFOEX)
DECL_WINELIB_TYPE_AW(LPMONITORINFOEX)
typedef BOOL32 (CALLBACK *MONITORENUMPROC)(HMONITOR,HDC32,LPRECT32,LPARAM);
#pragma pack(4) #pragma pack(4)
@ -6684,6 +6731,7 @@ BOOL32 WINAPI DuplicateHandle(HANDLE32,HANDLE32,HANDLE32,HANDLE32*,DWORD,BO
BOOL32 WINAPI EnumDateFormats32A(DATEFMT_ENUMPROC32A lpDateFmtEnumProc, LCID Locale, DWORD dwFlags); BOOL32 WINAPI EnumDateFormats32A(DATEFMT_ENUMPROC32A lpDateFmtEnumProc, LCID Locale, DWORD dwFlags);
BOOL32 WINAPI EnumDateFormats32W(DATEFMT_ENUMPROC32W lpDateFmtEnumProc, LCID Locale, DWORD dwFlags); BOOL32 WINAPI EnumDateFormats32W(DATEFMT_ENUMPROC32W lpDateFmtEnumProc, LCID Locale, DWORD dwFlags);
#define EnumDateFormats WINELIB_NAME_AW(EnumDateFormats) #define EnumDateFormats WINELIB_NAME_AW(EnumDateFormats)
BOOL32 WINAPI EnumDisplayMonitors(HDC32,LPRECT32,MONITORENUMPROC,LPARAM);
INT32 WINAPI EnumPropsEx32A(HWND32,PROPENUMPROCEX32A,LPARAM); INT32 WINAPI EnumPropsEx32A(HWND32,PROPENUMPROCEX32A,LPARAM);
INT32 WINAPI EnumPropsEx32W(HWND32,PROPENUMPROCEX32W,LPARAM); INT32 WINAPI EnumPropsEx32W(HWND32,PROPENUMPROCEX32W,LPARAM);
#define EnumPropsEx WINELIB_NAME_AW(EnumPropsEx) #define EnumPropsEx WINELIB_NAME_AW(EnumPropsEx)
@ -6803,6 +6851,9 @@ BOOL32 WINAPI GetMenuItemInfo32A(HMENU32,UINT32,BOOL32,MENUITEMINFO32A*);
BOOL32 WINAPI GetMenuItemInfo32W(HMENU32,UINT32,BOOL32,MENUITEMINFO32W*); BOOL32 WINAPI GetMenuItemInfo32W(HMENU32,UINT32,BOOL32,MENUITEMINFO32W*);
#define GetMenuItemInfo WINELIB_NAME_AW(GetMenuItemInfo) #define GetMenuItemInfo WINELIB_NAME_AW(GetMenuItemInfo)
UINT32 WINAPI GetMetaFileBitsEx(HMETAFILE32,UINT32,LPVOID); UINT32 WINAPI GetMetaFileBitsEx(HMETAFILE32,UINT32,LPVOID);
BOOL32 WINAPI GetMonitorInfo32A(HMONITOR,LPMONITORINFO);
BOOL32 WINAPI GetMonitorInfo32W(HMONITOR,LPMONITORINFO);
#define GetMonitorInfo WINELIB_NAME_AW(GetMonitorInfo)
BOOL32 WINAPI GetNumberOfConsoleInputEvents(HANDLE32,LPDWORD); BOOL32 WINAPI GetNumberOfConsoleInputEvents(HANDLE32,LPDWORD);
BOOL32 WINAPI GetNumberOfConsoleMouseButtons(LPDWORD); BOOL32 WINAPI GetNumberOfConsoleMouseButtons(LPDWORD);
DWORD WINAPI GetObjectType(HANDLE32); DWORD WINAPI GetObjectType(HANDLE32);
@ -6871,6 +6922,9 @@ INT32 WINAPI MessageBoxEx32A(HWND32,LPCSTR,LPCSTR,UINT32,WORD);
INT32 WINAPI MessageBoxEx32W(HWND32,LPCWSTR,LPCWSTR,UINT32,WORD); INT32 WINAPI MessageBoxEx32W(HWND32,LPCWSTR,LPCWSTR,UINT32,WORD);
#define MessageBoxEx WINELIB_NAME_AW(MessageBoxEx) #define MessageBoxEx WINELIB_NAME_AW(MessageBoxEx)
BOOL32 WINAPI ModifyWorldTransform(HDC32,const XFORM *, DWORD); BOOL32 WINAPI ModifyWorldTransform(HDC32,const XFORM *, DWORD);
HMONITOR WINAPI MonitorFromPoint(POINT32,DWORD);
HMONITOR WINAPI MonitorFromRect(LPRECT32,DWORD);
HMONITOR WINAPI MonitorFromWindow(HWND32,DWORD);
BOOL32 WINAPI MoveFile32A(LPCSTR,LPCSTR); BOOL32 WINAPI MoveFile32A(LPCSTR,LPCSTR);
BOOL32 WINAPI MoveFile32W(LPCWSTR,LPCWSTR); BOOL32 WINAPI MoveFile32W(LPCWSTR,LPCWSTR);
#define MoveFile WINELIB_NAME_AW(MoveFile) #define MoveFile WINELIB_NAME_AW(MoveFile)
@ -7411,6 +7465,9 @@ HDC32 WINAPI CreateIC32W(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODE32W*);
HICON16 WINAPI CreateIcon16(HINSTANCE16,INT16,INT16,BYTE,BYTE,LPCVOID,LPCVOID); HICON16 WINAPI CreateIcon16(HINSTANCE16,INT16,INT16,BYTE,BYTE,LPCVOID,LPCVOID);
HICON32 WINAPI CreateIcon32(HINSTANCE32,INT32,INT32,BYTE,BYTE,LPCVOID,LPCVOID); HICON32 WINAPI CreateIcon32(HINSTANCE32,INT32,INT32,BYTE,BYTE,LPCVOID,LPCVOID);
#define CreateIcon WINELIB_NAME(CreateIcon) #define CreateIcon WINELIB_NAME(CreateIcon)
HICON16 WINAPI CreateIconFromResource16(LPBYTE,UINT16,BOOL16,DWORD);
HICON32 WINAPI CreateIconFromResource32(LPBYTE,UINT32,BOOL32,DWORD);
#define CreateIconFromResource WINELIB_NAME(CreateIconFromResource)
HICON16 WINAPI CreateIconFromResourceEx16(LPBYTE,UINT16,BOOL16,DWORD,INT16,INT16,UINT16); HICON16 WINAPI CreateIconFromResourceEx16(LPBYTE,UINT16,BOOL16,DWORD,INT16,INT16,UINT16);
HICON32 WINAPI CreateIconFromResourceEx32(LPBYTE,UINT32,BOOL32,DWORD,INT32,INT32,UINT32); HICON32 WINAPI CreateIconFromResourceEx32(LPBYTE,UINT32,BOOL32,DWORD,INT32,INT32,UINT32);
#define CreateIconFromResourceEx WINELIB_NAME(CreateIconFromResourceEx) #define CreateIconFromResourceEx WINELIB_NAME(CreateIconFromResourceEx)

1
include/wintypes.h
View File

@ -97,6 +97,7 @@ typedef DWORD ACCESS_MASK;
typedef ACCESS_MASK REGSAM; typedef ACCESS_MASK REGSAM;
typedef HANDLE32 HHOOK; typedef HANDLE32 HHOOK;
typedef HANDLE32 HKEY; typedef HANDLE32 HKEY;
typedef HANDLE32 HMONITOR;
typedef DWORD LCID; typedef DWORD LCID;
typedef WORD LANGID; typedef WORD LANGID;
typedef DWORD LCTYPE; typedef DWORD LCTYPE;

2
windows/multimon.c
View File

@ -5,8 +5,6 @@
*/ */
#include "windows.h" #include "windows.h"
#include "multimon.h"
#define xPRIMARY_MONITOR ((HMONITOR)0x12340042) #define xPRIMARY_MONITOR ((HMONITOR)0x12340042)