From 29b5ab412246bc384d5bf656ee02e038f36079ac Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Fri, 29 Jun 2001 19:34:35 +0000 Subject: [PATCH] Started moving common gdi32/w32k types into common header file. svn path=/trunk/; revision=2017 --- reactos/drivers/dd/vga/display/main/enable.c | 13 +-- reactos/include/ascii.h | 28 +++--- reactos/include/ddk/winddi.h | 32 +------ reactos/include/defines.h | 2 - reactos/include/ntos/gditypes.h | 91 ++++++++++++++++++++ reactos/include/structs.h | 60 ++++--------- reactos/include/unicode.h | 14 +-- reactos/include/win32k/dc.h | 2 +- reactos/lib/gdi32/misc/stubsa.c | 8 +- reactos/lib/gdi32/misc/stubsw.c | 8 +- reactos/lib/gdi32/objects/dc.c | 17 ++-- reactos/lib/gdi32/objects/pen.c | 2 +- reactos/lib/gdi32/objects/text.c | 11 +-- reactos/lib/user32/misc/desktop.c | 6 +- reactos/lib/user32/misc/stubs.c | 18 ++-- reactos/lib/user32/misc/winsta.c | 6 +- reactos/subsys/csrss/api/wapi.c | 4 +- reactos/subsys/win32k/objects/dc.c | 4 +- 18 files changed, 182 insertions(+), 144 deletions(-) create mode 100644 reactos/include/ntos/gditypes.h diff --git a/reactos/drivers/dd/vga/display/main/enable.c b/reactos/drivers/dd/vga/display/main/enable.c index 776aec7e223..0fe843aae8b 100644 --- a/reactos/drivers/dd/vga/display/main/enable.c +++ b/reactos/drivers/dd/vga/display/main/enable.c @@ -1,9 +1,9 @@ /* * 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 $ * */ @@ -13,7 +13,7 @@ #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); @@ -184,7 +184,7 @@ DHPDEV VGADDIEnablePDEV(IN DEVMODEW *DM, // 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; @@ -203,7 +203,7 @@ VOID VGADDICompletePDEV(IN DHPDEV PDev, } -VOID VGADDIAssertMode(IN DHPDEV DPev, +BOOL VGADDIAssertMode(IN DHPDEV DPev, IN BOOL Enable) { PPDEV ppdev = (PPDEV)DPev; @@ -235,6 +235,7 @@ VOID VGADDIAssertMode(IN DHPDEV DPev, } } + return TRUE; } VOID VGADDIDisablePDEV(IN DHPDEV PDev) diff --git a/reactos/include/ascii.h b/reactos/include/ascii.h index 9efdfe3cba8..62309727a5d 100644 --- a/reactos/include/ascii.h +++ b/reactos/include/ascii.h @@ -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 diff --git a/reactos/include/ddk/winddi.h b/reactos/include/ddk/winddi.h index 7dd883096c7..5f0a34fa8da 100644 --- a/reactos/include/ddk/winddi.h +++ b/reactos/include/ddk/winddi.h @@ -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, diff --git a/reactos/include/defines.h b/reactos/include/defines.h index 7339106f9d6..09d05a5f80b 100644 --- a/reactos/include/defines.h +++ b/reactos/include/defines.h @@ -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) diff --git a/reactos/include/ntos/gditypes.h b/reactos/include/ntos/gditypes.h new file mode 100644 index 00000000000..e9691a9b722 --- /dev/null +++ b/reactos/include/ntos/gditypes.h @@ -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 + * 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 diff --git a/reactos/include/structs.h b/reactos/include/structs.h index c52f38af80e..3df5cb83cbc 100644 --- a/reactos/include/structs.h +++ b/reactos/include/structs.h @@ -43,6 +43,7 @@ #include #include #include +#include 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; diff --git a/reactos/include/unicode.h b/reactos/include/unicode.h index 13b8617000e..c3b1fb8f251 100644 --- a/reactos/include/unicode.h +++ b/reactos/include/unicode.h @@ -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 diff --git a/reactos/include/win32k/dc.h b/reactos/include/win32k/dc.h index f09dda28943..e6436949108 100644 --- a/reactos/include/win32k/dc.h +++ b/reactos/include/win32k/dc.h @@ -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); diff --git a/reactos/lib/gdi32/misc/stubsa.c b/reactos/lib/gdi32/misc/stubsa.c index a09fe743651..e845587aadc 100644 --- a/reactos/lib/gdi32/misc/stubsa.c +++ b/reactos/lib/gdi32/misc/stubsa.c @@ -1,4 +1,4 @@ -/* $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 * @@ -44,7 +44,7 @@ CreateICA( LPCSTR a0, LPCSTR a1, LPCSTR a2, - CONST DEVMODE * a3 + CONST DEVMODEA * a3 ) { SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -84,7 +84,7 @@ DeviceCapabilitiesExA( LPCSTR a1, WORD a2, LPSTR a3, - CONST DEVMODE *a4 + CONST DEVMODEA *a4 ) { SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -297,7 +297,7 @@ HDC STDCALL ResetDCA( HDC a0, - CONST DEVMODE *a1 + CONST DEVMODEA *a1 ) { SetLastError(ERROR_CALL_NOT_IMPLEMENTED); diff --git a/reactos/lib/gdi32/misc/stubsw.c b/reactos/lib/gdi32/misc/stubsw.c index d3edb79b259..b823ead042f 100644 --- a/reactos/lib/gdi32/misc/stubsw.c +++ b/reactos/lib/gdi32/misc/stubsw.c @@ -1,4 +1,4 @@ -/* $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 * @@ -42,7 +42,7 @@ CreateICW( LPCWSTR a0, LPCWSTR a1, LPCWSTR a2, - CONST DEVMODE * a3 + CONST DEVMODEW * a3 ) { SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -82,7 +82,7 @@ DeviceCapabilitiesExW( LPCWSTR a1, WORD a2, LPWSTR a3, - CONST DEVMODE *a4 + CONST DEVMODEW *a4 ) { SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -295,7 +295,7 @@ HDC STDCALL ResetDCW( HDC a0, - CONST DEVMODE *a1 + CONST DEVMODEW *a1 ) { SetLastError(ERROR_CALL_NOT_IMPLEMENTED); diff --git a/reactos/lib/gdi32/objects/dc.c b/reactos/lib/gdi32/objects/dc.c index 62da33789cc..dd08ea9daa8 100644 --- a/reactos/lib/gdi32/objects/dc.c +++ b/reactos/lib/gdi32/objects/dc.c @@ -13,12 +13,13 @@ CreateDCA ( 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 @@ -44,6 +45,12 @@ CreateDCA ( } else OutputU.Buffer = NULL; + if (NULL != lpInitData) + { +// lpInitDataW = HeapAllocMem( + } else + lpInitDataW = NULL; + /* * Call the Unicode version * of CreateDC. @@ -53,8 +60,8 @@ CreateDCA ( DriverU.Buffer, DeviceU.Buffer, OutputU.Buffer, - lpInitData - ); + NULL); +// lpInitDataW); /* * Free Unicode parameters. */ @@ -75,14 +82,14 @@ CreateDCW ( LPCWSTR lpwszDriver, LPCWSTR lpwszDevice, LPCWSTR lpwszOutput, - CONST DEVMODE * lpInitData + CONST DEVMODEW * lpInitData ) { return W32kCreateDC ( lpwszDriver, lpwszDevice, lpwszOutput, - lpInitData + (PDEVMODEW)lpInitData ); } diff --git a/reactos/lib/gdi32/objects/pen.c b/reactos/lib/gdi32/objects/pen.c index 822874d4d54..db41cf19868 100644 --- a/reactos/lib/gdi32/objects/pen.c +++ b/reactos/lib/gdi32/objects/pen.c @@ -18,5 +18,5 @@ HPEN STDCALL CreatePenIndirect(CONST LOGPEN *lgpn) { - return W32kCreatePenIndirect(lgpn); + return W32kCreatePenIndirect((CONST PLOGPEN)lgpn); } diff --git a/reactos/lib/gdi32/objects/text.c b/reactos/lib/gdi32/objects/text.c index c66e48c5e6b..1e9e14c802f 100644 --- a/reactos/lib/gdi32/objects/text.c +++ b/reactos/lib/gdi32/objects/text.c @@ -160,7 +160,7 @@ CreateFontIndirectA( { ANSI_STRING StringA; UNICODE_STRING StringU; - BOOL ret; + HFONT ret; LOGFONT tlf; RtlInitAnsiString(&StringA, (LPSTR)lf->lfFaceName); @@ -168,7 +168,7 @@ CreateFontIndirectA( memcpy(&tlf, lf, sizeof(LOGFONT)); memcpy(&tlf.lfFaceName, &StringU.Buffer, StringU.Length); - ret = CreateFontIndirectW(&lf); + ret = CreateFontIndirectW((CONST LOGFONT *)&lf); RtlFreeUnicodeString(&StringU); @@ -181,7 +181,7 @@ CreateFontIndirectW( CONST LOGFONT *lf ) { - return W32kCreateFontIndirect(lf); + return W32kCreateFontIndirect((CONST LPLOGFONT)lf); } HFONT @@ -205,7 +205,7 @@ CreateFontA( { ANSI_STRING StringA; UNICODE_STRING StringU; - BOOL ret; + HFONT ret; LOGFONT tlf; RtlInitAnsiString(&StringA, (LPSTR)Face); @@ -217,9 +217,6 @@ CreateFontA( RtlFreeUnicodeString(&StringU); return ret; - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; } HFONT diff --git a/reactos/lib/user32/misc/desktop.c b/reactos/lib/user32/misc/desktop.c index baaae27a86a..d7f1c44ffa2 100644 --- a/reactos/lib/user32/misc/desktop.c +++ b/reactos/lib/user32/misc/desktop.c @@ -1,4 +1,4 @@ -/* $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 @@ -26,7 +26,7 @@ STDCALL CreateDesktopA( LPCSTR lpszDesktop, LPCSTR lpszDevice, - LPDEVMODE pDevmode, + LPDEVMODEA pDevmode, DWORD dwFlags, ACCESS_MASK dwDesiredAccess, LPSECURITY_ATTRIBUTES lpsa) @@ -60,7 +60,7 @@ STDCALL CreateDesktopW( LPCWSTR lpszDesktop, LPCWSTR lpszDevice, - LPDEVMODE pDevmode, + LPDEVMODEW pDevmode, DWORD dwFlags, ACCESS_MASK dwDesiredAccess, LPSECURITY_ATTRIBUTES lpsa) diff --git a/reactos/lib/user32/misc/stubs.c b/reactos/lib/user32/misc/stubs.c index 0a648d5c303..436abc081df 100644 --- a/reactos/lib/user32/misc/stubs.c +++ b/reactos/lib/user32/misc/stubs.c @@ -1,4 +1,4 @@ -/* $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 @@ -188,7 +188,7 @@ ChangeClipboardChain( LONG STDCALL ChangeDisplaySettingsA( - LPDEVMODE lpDevMode, + LPDEVMODEA lpDevMode, DWORD dwflags) { return 0; @@ -198,7 +198,7 @@ LONG STDCALL ChangeDisplaySettingsExA( LPCSTR lpszDeviceName, - LPDEVMODE lpDevMode, + LPDEVMODEA lpDevMode, HWND hwnd, DWORD dwflags, LPVOID lParam) @@ -210,7 +210,7 @@ LONG STDCALL ChangeDisplaySettingsExW( LPCWSTR lpszDeviceName, - LPDEVMODE lpDevMode, + LPDEVMODEW lpDevMode, HWND hwnd, DWORD dwflags, LPVOID lParam) @@ -221,7 +221,7 @@ ChangeDisplaySettingsExW( LONG STDCALL ChangeDisplaySettingsW( - LPDEVMODE lpDevMode, + LPDEVMODEW lpDevMode, DWORD dwflags) { return 0; @@ -1573,7 +1573,7 @@ STDCALL EnumDisplaySettingsA( LPCSTR lpszDeviceName, DWORD iModeNum, - LPDEVMODE lpDevMode) + LPDEVMODEA lpDevMode) { return FALSE; } @@ -1583,7 +1583,7 @@ STDCALL EnumDisplaySettingsExA( LPCSTR lpszDeviceName, DWORD iModeNum, - LPDEVMODE lpDevMode, + LPDEVMODEW lpDevMode, DWORD dwFlags) { return FALSE; @@ -1594,7 +1594,7 @@ STDCALL EnumDisplaySettingsExW( LPCWSTR lpszDeviceName, DWORD iModeNum, - LPDEVMODE lpDevMode, + LPDEVMODEA lpDevMode, DWORD dwFlags) { return FALSE; @@ -1605,7 +1605,7 @@ STDCALL EnumDisplaySettingsW( LPCWSTR lpszDeviceName, DWORD iModeNum, - LPDEVMODE lpDevMode) + LPDEVMODEW lpDevMode) { return FALSE; } diff --git a/reactos/lib/user32/misc/winsta.c b/reactos/lib/user32/misc/winsta.c index fff139160f7..1075bd2428e 100644 --- a/reactos/lib/user32/misc/winsta.c +++ b/reactos/lib/user32/misc/winsta.c @@ -1,4 +1,4 @@ -/* $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 @@ -61,7 +61,7 @@ CreateWindowStationW( { UNICODE_STRING WindowStationName; - RtlInitAnsiString(&WindowStationName, lpwinsta); + RtlInitUnicodeString(&WindowStationName, lpwinsta); return NtUserCreateWindowStation( &WindowStationName, @@ -131,7 +131,7 @@ OpenWindowStationW( { UNICODE_STRING WindowStationName; - RtlInitAnsiString(&WindowStationName, lpszWinSta); + RtlInitUnicodeString(&WindowStationName, lpszWinSta); return NtUserOpenWindowStation(&WindowStationName, dwDesiredAccess); } diff --git a/reactos/subsys/csrss/api/wapi.c b/reactos/subsys/csrss/api/wapi.c index e0f22afe607..d1d9b6968d5 100644 --- a/reactos/subsys/csrss/api/wapi.c +++ b/reactos/subsys/csrss/api/wapi.c @@ -1,4 +1,4 @@ -/* $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 * @@ -75,7 +75,7 @@ static void Thread_Api2(HANDLE ServerPort) 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; diff --git a/reactos/subsys/win32k/objects/dc.c b/reactos/subsys/win32k/objects/dc.c index 8e276267631..0dfbef0ca82 100644 --- a/reactos/subsys/win32k/objects/dc.c +++ b/reactos/subsys/win32k/objects/dc.c @@ -1,4 +1,4 @@ -/* $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 * @@ -812,7 +812,7 @@ DC_GET_VAL_EX( W32kGetViewportOrgEx, vportOrgX, vportOrgY, POINT ) 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; }