ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 12:23:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Started moving common gdi32/w32k types into common header file.

Browse Source 
svn path=/trunk/; revision=2017
This commit is contained in:
Eric Kohl
2001-06-29 19:34:35 +00:00
parent 8a477f58d7
commit 29b5ab4122
18 changed files with 182 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/include/ascii.h
+14 -14
View File
@@ -999,22 +999,22 @@ STDCALL
LoadKeyboardLayoutA(
LPCSTR pwszKLID,
UINT Flags);
WINBOOL
STDCALL
GetKeyboardLayoutNameA(
LPSTR pwszKLID);
HDESK
STDCALL
CreateDesktopA(
LPCSTR lpszDesktop,
LPCSTR lpszDevice,
LPDEVMODE pDevmode,
LPDEVMODEA pDevmode,
DWORD dwFlags,
ACCESS_MASK dwDesiredAccess,
LPSECURITY_ATTRIBUTES lpsa);
HDESK
STDCALL
OpenDesktopA(
@@ -1022,14 +1022,14 @@ OpenDesktopA(
DWORD dwFlags,
WINBOOL fInherit,
DWORD dwDesiredAccess);
WINBOOL
STDCALL
EnumDesktopsA(
HWINSTA hwinsta,
DESKTOPENUMPROC lpEnumFunc,
LPARAM lParam);
HWINSTA
STDCALL
CreateWindowStationA(
@@ -1808,7 +1808,7 @@ WinHelpA(
LONG
STDCALL
ChangeDisplaySettingsA(
LPDEVMODE lpDevMode,
LPDEVMODEA lpDevMode,
DWORD dwFlags);
WINBOOL
@@ -1816,8 +1816,8 @@ STDCALL
EnumDisplaySettingsA(
LPCSTR lpszDeviceName,
DWORD iModeNum,
LPDEVMODE lpDevMode);
LPDEVMODEA lpDevMode);
WINBOOL
STDCALL
SystemParametersInfoA(
@@ -1825,7 +1825,7 @@ SystemParametersInfoA(
UINT uiParam,
PVOID pvParam,
UINT fWinIni);
int
STDCALL
AddFontResourceA(LPCSTR);
@@ -1840,7 +1840,7 @@ CreateFontIndirectA(CONST LOGFONT *);
HDC
STDCALL
CreateICA(LPCSTR, LPCSTR , LPCSTR , CONST DEVMODE *);
CreateICA(LPCSTR, LPCSTR , LPCSTR , CONST DEVMODEA *);
HDC
STDCALL
@@ -1853,7 +1853,7 @@ CreateScalableFontResourceA(DWORD, LPCSTR, LPCSTR, LPCSTR);
int
STDCALL
DeviceCapabilitiesA(LPCSTR, LPCSTR, WORD,
LPSTR, CONST DEVMODE *);
LPSTR, CONST DEVMODEA *);
int
STDCALL
@@ -1934,7 +1934,7 @@ GetCharacterPlacementA(HDC, LPCSTR, int, int, LPGCP_RESULTS, DWORD);
HDC
STDCALL
ResetDCA(HDC, CONST DEVMODE *);
ResetDCA(HDC, CONST DEVMODEA *);
WINBOOL
STDCALL
@@ -2136,7 +2136,7 @@ DialogBoxIndirectParamA(hInstance, lpTemplate, hWndParent, lpDialogFunc, 0L)
HDC
STDCALL
CreateDCA(LPCSTR, LPCSTR , LPCSTR , CONST DEVMODE *);
CreateDCA(LPCSTR, LPCSTR , LPCSTR , CONST DEVMODEA *);
DWORD
STDCALL
reactos/include/ddk/winddi.h
+1 -31
View File
@@ -514,36 +514,6 @@ typedef struct _GDIINFO
ULONG ulPanningVertRes;
} GDIINFO, *PGDIINFO;
typedef struct _DEVMODEW
{
WCHAR dmDeviceName[DMMAXDEVICENAME];
WORD dmSpecVersion;
WORD dmDriverVersion;
WORD dmSize;
WORD dmDriverExtra;
DWORD dmFields;
short dmOrientation;
short dmPaperSize;
short dmPaperLength;
short dmPaperWidth;
short dmScale;
short dmCopies;
short dmDefaultSource;
short dmPrintQuality;
short dmColor;
short dmDuplex;
short dmYResolution;
short dmTTOption;
short dmCollate;
WCHAR dmFormName[DMMAXFORMNAME];
WORD dmLogPixels;
DWORD dmBitsPerPel;
DWORD dmPelsWidth;
DWORD dmPelsHeight;
DWORD dmDisplayFlags;
DWORD dmDisplayFrequency;
} DEVMODEW, *PDEVMODEW;
typedef struct _BRUSHOBJ
{
ULONG iSolidColor;
@@ -709,7 +679,7 @@ typedef struct _XFORMOBJ
*/
/* GDI --> DDI calls */
VOID DrvAssertMode(IN DHPDEV PDev,
BOOL DrvAssertMode(IN DHPDEV PDev,
IN BOOL ShouldEnable);
BOOL DrvBitBlt(IN PSURFOBJ DestSurface,
IN PSURFOBJ SrcSurface,
reactos/include/defines.h
-2
View File
@@ -75,8 +75,6 @@ extern "C" {
#define ELF_VENDOR_SIZE (4)
#define MAX_DEFAULTCHAR (2)
#define MAX_LEADBYTES (12)
#define CCHDEVICENAME (32)
#define CCHFORMNAME (32)
#define MENU_TEXT_LEN (40)
#define MAX_LANA (254)
#define NCBNAMSZ (16)
reactos/include/ntos/gditypes.h
+91
View File
@@ -0,0 +1,91 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* FILE: include/ntos/gditypes.h
* PURPOSE: Common GDI definitions
* PROGRAMMER: Eric Kohl <[email protected]>
* UPDATE HISTORY:
* 25/06/2001: Created
*/
#ifndef __INCLUDE_NTOS_GDITYPES_H
#define __INCLUDE_NTOS_GDITYPES_H
#define CCHDEVICENAME (32)
#define CCHFORMNAME (32)
typedef struct _devicemodeA
{
BYTE dmDeviceName[CCHDEVICENAME];
WORD dmSpecVersion;
WORD dmDriverVersion;
WORD dmSize;
WORD dmDriverExtra;
DWORD dmFields;
short dmOrientation;
short dmPaperSize;
short dmPaperLength;
short dmPaperWidth;
short dmScale;
short dmCopies;
short dmDefaultSource;
short dmPrintQuality;
short dmColor;
short dmDuplex;
short dmYResolution;
short dmTTOption;
short dmCollate;
BYTE dmFormName[CCHFORMNAME];
WORD dmLogPixels;
DWORD dmBitsPerPel;
DWORD dmPelsWidth;
DWORD dmPelsHeight;
DWORD dmDisplayFlags;
DWORD dmDisplayFrequency;
DWORD dmICMMethod;
DWORD dmICMIntent;
DWORD dmMediaType;
DWORD dmDitherType;
DWORD dmICCManufacturer;
DWORD dmICCModel;
} DEVMODEA,*LPDEVMODEA,*PDEVMODEA;
typedef struct _devicemodeW
{
WCHAR dmDeviceName[CCHDEVICENAME];
WORD dmSpecVersion;
WORD dmDriverVersion;
WORD dmSize;
WORD dmDriverExtra;
DWORD dmFields;
short dmOrientation;
short dmPaperSize;
short dmPaperLength;
short dmPaperWidth;
short dmScale;
short dmCopies;
short dmDefaultSource;
short dmPrintQuality;
short dmColor;
short dmDuplex;
short dmYResolution;
short dmTTOption;
short dmCollate;
WCHAR dmFormName[CCHFORMNAME];
WORD dmLogPixels;
DWORD dmBitsPerPel;
DWORD dmPelsWidth;
DWORD dmPelsHeight;
DWORD dmDisplayFlags;
DWORD dmDisplayFrequency;
DWORD dmICMMethod;
DWORD dmICMIntent;
DWORD dmMediaType;
DWORD dmDitherType;
DWORD dmICCManufacturer;
DWORD dmICCModel;
} DEVMODEW,*LPDEVMODEW,*PDEVMODEW;
#endif /* __INCLUDE_NTOS_GDITYPES_H */
/* EOF */
reactos/include/structs.h
+17 -43
View File
@@ -43,6 +43,7 @@
#include <ntos/file.h>
#include <ntos/ps.h>
#include <ntos/disk.h>
#include <ntos/gditypes.h>
typedef struct _VALENT
{
@@ -903,42 +904,7 @@ typedef struct _DEV_BROADCAST_VOLUME {
USHORT dbcv_flags;
} DEV_BROADCAST_VOLUME;
typedef DEV_BROADCAST_VOLUME *PDEV_BROADCAST_VOLUME;
typedef struct _devicemode {
BCHAR dmDeviceName[CCHDEVICENAME];
WORD dmSpecVersion;
WORD dmDriverVersion;
WORD dmSize;
WORD dmDriverExtra;
DWORD dmFields;
short dmOrientation;
short dmPaperSize;
short dmPaperLength;
short dmPaperWidth;
short dmScale;
short dmCopies;
short dmDefaultSource;
short dmPrintQuality;
short dmColor;
short dmDuplex;
short dmYResolution;
short dmTTOption;
short dmCollate;
BCHAR dmFormName[CCHFORMNAME];
WORD dmLogPixels;
DWORD dmBitsPerPel;
DWORD dmPelsWidth;
DWORD dmPelsHeight;
DWORD dmDisplayFlags;
DWORD dmDisplayFrequency;
DWORD dmICMMethod;
DWORD dmICMIntent;
DWORD dmMediaType;
DWORD dmDitherType;
DWORD dmICCManufacturer;
DWORD dmICCModel;
} DEVMODE, *LPDEVMODE;
typedef struct tagDEVNAMES {
WORD wDriverOffset;
WORD wDeviceOffset;
@@ -3061,13 +3027,21 @@ typedef struct tagPD {
HANDLE hPrintTemplate;
HANDLE hSetupTemplate;
} PRINTDLG PACKED, *LPPRINTDLG PACKED;
typedef struct _PRINTER_DEFAULTS {
LPTSTR pDatatype;
LPDEVMODE pDevMode;
ACCESS_MASK DesiredAccess;
} PRINTER_DEFAULTS;
typedef struct _PRINTER_DEFAULTSA
{
LPTSTR pDatatype;
LPDEVMODEA pDevMode;
ACCESS_MASK DesiredAccess;
} PRINTER_DEFAULTSA, *PPRINTER_DEFAULTSA, *LPPRINTER_DEFAULTSA;
typedef struct _PRINTER_DEFAULTSW
{
LPTSTR pDatatype;
LPDEVMODEA pDevMode;
ACCESS_MASK DesiredAccess;
} PRINTER_DEFAULTSW, *PPRINTER_DEFAULTSW, *LPPRINTER_DEFAULTSW;
typedef struct _PRINTER_INFO_1 {
DWORD Flags;
LPTSTR pDescription;
reactos/include/unicode.h
+7 -7
View File
@@ -1011,7 +1011,7 @@ STDCALL
CreateDesktopW(
LPCWSTR lpszDesktop,
LPCWSTR lpszDevice,
LPDEVMODE pDevmode,
LPDEVMODEW pDevmode,
DWORD dwFlags,
ACCESS_MASK dwDesiredAccess,
LPSECURITY_ATTRIBUTES lpsa);
@@ -1809,7 +1809,7 @@ WinHelpW(
LONG
STDCALL
ChangeDisplaySettingsW(
LPDEVMODE lpDevMode,
LPDEVMODEW lpDevMode,
DWORD dwFlags);
WINBOOL
@@ -1817,7 +1817,7 @@ STDCALL
EnumDisplaySettingsW(
LPCWSTR lpszDeviceName,
DWORD iModeNum,
LPDEVMODE lpDevMode);
LPDEVMODEW lpDevMode);
WINBOOL
STDCALL
@@ -1847,7 +1847,7 @@ CreateFontW(int, int, int, int, int, DWORD,
HDC
STDCALL
CreateICW(LPCWSTR, LPCWSTR , LPCWSTR , CONST DEVMODE *);
CreateICW(LPCWSTR, LPCWSTR , LPCWSTR , CONST DEVMODEW *);
HDC
STDCALL
@@ -1860,7 +1860,7 @@ CreateScalableFontResourceW(DWORD, LPCWSTR, LPCWSTR, LPCWSTR);
int
STDCALL
DeviceCapabilitiesW(LPCWSTR, LPCWSTR, WORD,
LPWSTR, CONST DEVMODE *);
LPWSTR, CONST DEVMODEW *);
int
STDCALL
@@ -1941,7 +1941,7 @@ GetCharacterPlacementW(HDC, LPCWSTR, int, int, LPGCP_RESULTS, DWORD);
HDC
STDCALL
ResetDCW(HDC, CONST DEVMODE *);
ResetDCW(HDC, CONST DEVMODEW *);
WINBOOL
STDCALL
@@ -2153,7 +2153,7 @@ DialogBoxIndirectParamW(hInstance, lpTemplate, hWndParent, lpDialogFunc, 0L)
HDC
STDCALL
CreateDCW(LPCWSTR, LPCWSTR , LPCWSTR , CONST DEVMODE *);
CreateDCW(LPCWSTR, LPCWSTR , LPCWSTR , CONST DEVMODEW *);
HFONT
STDCALL
reactos/include/win32k/dc.h
+1 -1
View File
@@ -206,7 +206,7 @@ BOOL STDCALL W32kGetViewportExtEx(HDC hDC, LPSIZE viewportExt);
BOOL STDCALL W32kGetViewportOrgEx(HDC hDC, LPPOINT viewportOrg);
BOOL STDCALL W32kGetWindowExtEx(HDC hDC, LPSIZE windowExt);
BOOL STDCALL W32kGetWindowOrgEx(HDC hDC, LPPOINT windowOrg);
HDC STDCALL W32kResetDC(HDC hDC, CONST DEVMODE *InitData);
HDC STDCALL W32kResetDC(HDC hDC, CONST DEVMODEW *InitData);
BOOL STDCALL W32kRestoreDC(HDC hDC, INT SavedDC);
INT STDCALL W32kSaveDC(HDC hDC);
HGDIOBJ STDCALL W32kSelectObject(HDC hDC, HGDIOBJ hGDIObj);