/*
* entry.c
*
- * $Revision: 1.13 $
- * $Author: jfilby $
- * $Date: 2001/05/26 08:21:02 $
+ * $Revision: 1.14 $
+ * $Author: ekohl $
+ * $Date: 2001/06/29 19:32:50 $
*
*/
#define DBG_PREFIX "VGADDI: "
-VOID VGADDIAssertMode(IN DHPDEV DPev,
+BOOL VGADDIAssertMode(IN DHPDEV DPev,
IN BOOL Enable);
VOID VGADDICompletePDEV(IN DHPDEV PDev,
IN HDEV Dev);
// FIXME: fill out DevCaps
// FIXME: full out DevInfo
- devinfoVGA.hpalDefault = EngCreatePalette(PAL_INDEXED, 16, (PULONG)(VGApalette.PaletteEntry), 0, 0, 0);
+ devinfoVGA.hpalDefault = EngCreatePalette(PAL_INDEXED, 16, (PULONG*)(VGApalette.PaletteEntry), 0, 0, 0);
*DI = devinfoVGA;
}
-VOID VGADDIAssertMode(IN DHPDEV DPev,
+BOOL VGADDIAssertMode(IN DHPDEV DPev,
IN BOOL Enable)
{
PPDEV ppdev = (PPDEV)DPev;
}
}
+ return TRUE;
}
VOID VGADDIDisablePDEV(IN DHPDEV PDev)
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(
DWORD dwFlags,
WINBOOL fInherit,
DWORD dwDesiredAccess);
-
+
WINBOOL
STDCALL
EnumDesktopsA(
HWINSTA hwinsta,
DESKTOPENUMPROC lpEnumFunc,
LPARAM lParam);
-
+
HWINSTA
STDCALL
CreateWindowStationA(
LONG
STDCALL
ChangeDisplaySettingsA(
- LPDEVMODE lpDevMode,
+ LPDEVMODEA lpDevMode,
DWORD dwFlags);
WINBOOL
EnumDisplaySettingsA(
LPCSTR lpszDeviceName,
DWORD iModeNum,
- LPDEVMODE lpDevMode);
-
+ LPDEVMODEA lpDevMode);
+
WINBOOL
STDCALL
SystemParametersInfoA(
UINT uiParam,
PVOID pvParam,
UINT fWinIni);
-
+
int
STDCALL
AddFontResourceA(LPCSTR);
HDC
STDCALL
-CreateICA(LPCSTR, LPCSTR , LPCSTR , CONST DEVMODE *);
+CreateICA(LPCSTR, LPCSTR , LPCSTR , CONST DEVMODEA *);
HDC
STDCALL
int
STDCALL
DeviceCapabilitiesA(LPCSTR, LPCSTR, WORD,
- LPSTR, CONST DEVMODE *);
+ LPSTR, CONST DEVMODEA *);
int
STDCALL
HDC
STDCALL
-ResetDCA(HDC, CONST DEVMODE *);
+ResetDCA(HDC, CONST DEVMODEA *);
WINBOOL
STDCALL
HDC
STDCALL
-CreateDCA(LPCSTR, LPCSTR , LPCSTR , CONST DEVMODE *);
+CreateDCA(LPCSTR, LPCSTR , LPCSTR , CONST DEVMODEA *);
DWORD
STDCALL
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;
*/
/* GDI --> DDI calls */
-VOID DrvAssertMode(IN DHPDEV PDev,
+BOOL DrvAssertMode(IN DHPDEV PDev,
IN BOOL ShouldEnable);
BOOL DrvBitBlt(IN PSURFOBJ DestSurface,
IN PSURFOBJ SrcSurface,
#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)
--- /dev/null
+/*
+ * COPYRIGHT: See COPYING in the top level directory
+ * PROJECT: ReactOS kernel
+ * FILE: include/ntos/gditypes.h
+ * PURPOSE: Common GDI definitions
+ * PROGRAMMER: Eric Kohl <ekohl@rz-online.de>
+ * 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 */
\ No newline at end of file
#include <ntos/file.h>
#include <ntos/ps.h>
#include <ntos/disk.h>
+#include <ntos/gditypes.h>
typedef struct _VALENT
{
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;
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;
CreateDesktopW(
LPCWSTR lpszDesktop,
LPCWSTR lpszDevice,
- LPDEVMODE pDevmode,
+ LPDEVMODEW pDevmode,
DWORD dwFlags,
ACCESS_MASK dwDesiredAccess,
LPSECURITY_ATTRIBUTES lpsa);
LONG
STDCALL
ChangeDisplaySettingsW(
- LPDEVMODE lpDevMode,
+ LPDEVMODEW lpDevMode,
DWORD dwFlags);
WINBOOL
EnumDisplaySettingsW(
LPCWSTR lpszDeviceName,
DWORD iModeNum,
- LPDEVMODE lpDevMode);
+ LPDEVMODEW lpDevMode);
WINBOOL
STDCALL
HDC
STDCALL
-CreateICW(LPCWSTR, LPCWSTR , LPCWSTR , CONST DEVMODE *);
+CreateICW(LPCWSTR, LPCWSTR , LPCWSTR , CONST DEVMODEW *);
HDC
STDCALL
int
STDCALL
DeviceCapabilitiesW(LPCWSTR, LPCWSTR, WORD,
- LPWSTR, CONST DEVMODE *);
+ LPWSTR, CONST DEVMODEW *);
int
STDCALL
HDC
STDCALL
-ResetDCW(HDC, CONST DEVMODE *);
+ResetDCW(HDC, CONST DEVMODEW *);
WINBOOL
STDCALL
HDC
STDCALL
-CreateDCW(LPCWSTR, LPCWSTR , LPCWSTR , CONST DEVMODE *);
+CreateDCW(LPCWSTR, LPCWSTR , LPCWSTR , CONST DEVMODEW *);
HFONT
STDCALL
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);
-/* $Id: stubsa.c,v 1.5 2001/05/02 12:35:06 jfilby Exp $
+/* $Id: stubsa.c,v 1.6 2001/06/29 19:29:48 ekohl Exp $
*
* reactos/lib/gdi32/misc/stubs.c
*
LPCSTR a0,
LPCSTR a1,
LPCSTR a2,
- CONST DEVMODE * a3
+ CONST DEVMODEA * a3
)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
LPCSTR a1,
WORD a2,
LPSTR a3,
- CONST DEVMODE *a4
+ CONST DEVMODEA *a4
)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
STDCALL
ResetDCA(
HDC a0,
- CONST DEVMODE *a1
+ CONST DEVMODEA *a1
)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-/* $Id: stubsw.c,v 1.4 2001/05/02 12:35:06 jfilby Exp $
+/* $Id: stubsw.c,v 1.5 2001/06/29 19:29:48 ekohl Exp $
*
* reactos/lib/gdi32/misc/stubs.c
*
LPCWSTR a0,
LPCWSTR a1,
LPCWSTR a2,
- CONST DEVMODE * a3
+ CONST DEVMODEW * a3
)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
LPCWSTR a1,
WORD a2,
LPWSTR a3,
- CONST DEVMODE *a4
+ CONST DEVMODEW *a4
)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
STDCALL
ResetDCW(
HDC a0,
- CONST DEVMODE *a1
+ CONST DEVMODEW *a1
)
{
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
LPCSTR lpszDriver,
LPCSTR lpszDevice,
LPCSTR lpszOutput,
- CONST DEVMODE * lpInitData
+ CONST DEVMODEA * lpInitData
)
{
ANSI_STRING DriverA, DeviceA, OutputA;
UNICODE_STRING DriverU, DeviceU, OutputU;
HDC hDC;
+ DEVMODEW *lpInitDataW;
/*
* If needed, convert to Unicode
} else
OutputU.Buffer = NULL;
+ if (NULL != lpInitData)
+ {
+// lpInitDataW = HeapAllocMem(
+ } else
+ lpInitDataW = NULL;
+
/*
* Call the Unicode version
* of CreateDC.
DriverU.Buffer,
DeviceU.Buffer,
OutputU.Buffer,
- lpInitData
- );
+ NULL);
+// lpInitDataW);
/*
* Free Unicode parameters.
*/
LPCWSTR lpwszDriver,
LPCWSTR lpwszDevice,
LPCWSTR lpwszOutput,
- CONST DEVMODE * lpInitData
+ CONST DEVMODEW * lpInitData
)
{
return W32kCreateDC (
lpwszDriver,
lpwszDevice,
lpwszOutput,
- lpInitData
+ (PDEVMODEW)lpInitData
);
}
STDCALL
CreatePenIndirect(CONST LOGPEN *lgpn)
{
- return W32kCreatePenIndirect(lgpn);
+ return W32kCreatePenIndirect((CONST PLOGPEN)lgpn);
}
{
ANSI_STRING StringA;
UNICODE_STRING StringU;
- BOOL ret;
+ HFONT ret;
LOGFONT tlf;
RtlInitAnsiString(&StringA, (LPSTR)lf->lfFaceName);
memcpy(&tlf, lf, sizeof(LOGFONT));
memcpy(&tlf.lfFaceName, &StringU.Buffer, StringU.Length);
- ret = CreateFontIndirectW(&lf);
+ ret = CreateFontIndirectW((CONST LOGFONT *)&lf);
RtlFreeUnicodeString(&StringU);
CONST LOGFONT *lf
)
{
- return W32kCreateFontIndirect(lf);
+ return W32kCreateFontIndirect((CONST LPLOGFONT)lf);
}
HFONT
{
ANSI_STRING StringA;
UNICODE_STRING StringU;
- BOOL ret;
+ HFONT ret;
LOGFONT tlf;
RtlInitAnsiString(&StringA, (LPSTR)Face);
RtlFreeUnicodeString(&StringU);
return ret;
-
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
}
HFONT
-/* $Id: desktop.c,v 1.1 2001/06/12 17:50:27 chorns Exp $
+/* $Id: desktop.c,v 1.2 2001/06/29 19:31:59 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll
CreateDesktopA(
LPCSTR lpszDesktop,
LPCSTR lpszDevice,
- LPDEVMODE pDevmode,
+ LPDEVMODEA pDevmode,
DWORD dwFlags,
ACCESS_MASK dwDesiredAccess,
LPSECURITY_ATTRIBUTES lpsa)
CreateDesktopW(
LPCWSTR lpszDesktop,
LPCWSTR lpszDevice,
- LPDEVMODE pDevmode,
+ LPDEVMODEW pDevmode,
DWORD dwFlags,
ACCESS_MASK dwDesiredAccess,
LPSECURITY_ATTRIBUTES lpsa)
-/* $Id: stubs.c,v 1.4 2001/06/18 03:05:54 phreak Exp $
+/* $Id: stubs.c,v 1.5 2001/06/29 19:31:59 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll
LONG
STDCALL
ChangeDisplaySettingsA(
- LPDEVMODE lpDevMode,
+ LPDEVMODEA lpDevMode,
DWORD dwflags)
{
return 0;
STDCALL
ChangeDisplaySettingsExA(
LPCSTR lpszDeviceName,
- LPDEVMODE lpDevMode,
+ LPDEVMODEA lpDevMode,
HWND hwnd,
DWORD dwflags,
LPVOID lParam)
STDCALL
ChangeDisplaySettingsExW(
LPCWSTR lpszDeviceName,
- LPDEVMODE lpDevMode,
+ LPDEVMODEW lpDevMode,
HWND hwnd,
DWORD dwflags,
LPVOID lParam)
LONG
STDCALL
ChangeDisplaySettingsW(
- LPDEVMODE lpDevMode,
+ LPDEVMODEW lpDevMode,
DWORD dwflags)
{
return 0;
EnumDisplaySettingsA(
LPCSTR lpszDeviceName,
DWORD iModeNum,
- LPDEVMODE lpDevMode)
+ LPDEVMODEA lpDevMode)
{
return FALSE;
}
EnumDisplaySettingsExA(
LPCSTR lpszDeviceName,
DWORD iModeNum,
- LPDEVMODE lpDevMode,
+ LPDEVMODEW lpDevMode,
DWORD dwFlags)
{
return FALSE;
EnumDisplaySettingsExW(
LPCWSTR lpszDeviceName,
DWORD iModeNum,
- LPDEVMODE lpDevMode,
+ LPDEVMODEA lpDevMode,
DWORD dwFlags)
{
return FALSE;
EnumDisplaySettingsW(
LPCWSTR lpszDeviceName,
DWORD iModeNum,
- LPDEVMODE lpDevMode)
+ LPDEVMODEW lpDevMode)
{
return FALSE;
}
-/* $Id: winsta.c,v 1.1 2001/06/12 17:50:27 chorns Exp $
+/* $Id: winsta.c,v 1.2 2001/06/29 19:31:59 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll
{
UNICODE_STRING WindowStationName;
- RtlInitAnsiString(&WindowStationName, lpwinsta);
+ RtlInitUnicodeString(&WindowStationName, lpwinsta);
return NtUserCreateWindowStation(
&WindowStationName,
{
UNICODE_STRING WindowStationName;
- RtlInitAnsiString(&WindowStationName, lpszWinSta);
+ RtlInitUnicodeString(&WindowStationName, lpszWinSta);
return NtUserOpenWindowStation(&WindowStationName, dwDesiredAccess);
}
-/* $Id: wapi.c,v 1.12 2001/06/23 19:20:01 phreak Exp $
+/* $Id: wapi.c,v 1.13 2001/06/29 19:33:39 ekohl Exp $
*
* reactos/subsys/csrss/api/wapi.c
*
if ( LpcRequest.Header.MessageType == LPC_PORT_CLOSED )
{
- CsrFreeProcessData( LpcRequest.Header.Cid.UniqueProcess );
+ CsrFreeProcessData( (ULONG)LpcRequest.Header.Cid.UniqueProcess );
NtClose(ServerPort);
NtTerminateThread(NtCurrentThread(), STATUS_SUCCESS);
continue;
-/* $Id: dc.c,v 1.23 2001/06/25 09:30:06 ekohl Exp $
+/* $Id: dc.c,v 1.24 2001/06/29 19:34:35 ekohl Exp $
*
* DC.C - Device context functions
*
DC_GET_VAL_EX( W32kGetWindowExtEx, wndExtX, wndExtY, SIZE )
DC_GET_VAL_EX( W32kGetWindowOrgEx, wndOrgX, wndOrgY, POINT )
-HDC STDCALL W32kResetDC(HDC hDC, CONST DEVMODE *InitData)
+HDC STDCALL W32kResetDC(HDC hDC, CONST DEVMODEW *InitData)
{
UNIMPLEMENTED;
}