drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2003-05-23 Danny Smith <dannysmith@users.sourceforge.net> 

* include/winuser.h (EnumDisplayDevices[AW]): Add prototypes.
	* include/wingdi.h (DISPLAY_DEVICE): UNICODE it.

2003-05-23  Andrew Dunbar <hippietrail@users.sourceforge.net>

	* include/wingdi.h (GCP_RESULTS[AW]) Correct type of
	lpGlyphs field to LPWSTR.
This commit is contained in:
Danny Smith 2003-05-23 08:07:05 +00:00
parent 733ae29980
commit ff462cb235
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
winsup/w32api/ChangeLog
View File

@ -1,3 +1,13 @@
2003-05-23 Danny Smith <dannysmith@users.sourceforge.net>
* include/winuser.h (EnumDisplayDevices[AW]): Add prototypes.
* include/wingdi.h (DISPLAY_DEVICE): UNICODE it.
2003-05-23 Andrew Dunbar <hippietrail@users.sourceforge.net>
* include/wingdi.h (GCP_RESULTS[AW]) Correct type of
lpGlyphs field to LPWSTR.
2003-05-21 Danny Smith <dannysmith@users.sourceforge.net> 2003-05-21 Danny Smith <dannysmith@users.sourceforge.net>
* include/wincrypt.h (PLAINTEXTKEYBLOB, OPAQUEKEYBLOB, * include/wincrypt.h (PLAINTEXTKEYBLOB, OPAQUEKEYBLOB,

18
winsup/w32api/include/wingdi.h
View File

@ -2037,7 +2037,7 @@ typedef struct tagGCP_RESULTSA {
INT *lpDx; INT *lpDx;
INT *lpCaretPos; INT *lpCaretPos;
LPSTR lpClass; LPSTR lpClass;
UINT *lpGlyphs; LPWSTR lpGlyphs;
UINT nGlyphs; UINT nGlyphs;
UINT nMaxFit; UINT nMaxFit;
} GCP_RESULTSA,*LPGCP_RESULTSA; } GCP_RESULTSA,*LPGCP_RESULTSA;
@ -2048,7 +2048,7 @@ typedef struct tagGCP_RESULTSW {
INT *lpDx; INT *lpDx;
INT *lpCaretPos; INT *lpCaretPos;
LPWSTR lpClass; LPWSTR lpClass;
UINT *lpGlyphs; LPWSTR lpGlyphs;
UINT nGlyphs; UINT nGlyphs;
UINT nMaxFit; UINT nMaxFit;
} GCP_RESULTSW,*LPGCP_RESULTSW; } GCP_RESULTSW,*LPGCP_RESULTSW;
@ -2377,14 +2377,22 @@ typedef struct _GRADIENT_RECT {
ULONG UpperLeft; ULONG UpperLeft;
ULONG LowerRight; ULONG LowerRight;
}GRADIENT_RECT,*PGRADIENT_RECT,*LPGRADIENT_RECT; }GRADIENT_RECT,*PGRADIENT_RECT,*LPGRADIENT_RECT;
typedef struct _DISPLAY_DEVICE { typedef struct _DISPLAY_DEVICEA {
DWORD cb;
CHAR DeviceName[32];
CHAR DeviceString[128];
DWORD StateFlags;
CHAR DeviceID[128];
CHAR DeviceKey[128];
} DISPLAY_DEVICEA, *PDISPLAY_DEVICEA, *LPDISPLAY_DEVICEA;
typedef struct _DISPLAY_DEVICEW {
DWORD cb; DWORD cb;
WCHAR DeviceName[32]; WCHAR DeviceName[32];
WCHAR DeviceString[128]; WCHAR DeviceString[128];
DWORD StateFlags; DWORD StateFlags;
WCHAR DeviceID[128]; WCHAR DeviceID[128];
WCHAR DeviceKey[128]; WCHAR DeviceKey[128];
} DISPLAY_DEVICE, *PDISPLAY_DEVICE; } DISPLAY_DEVICEW, *PDISPLAY_DEVICEW, *LPDISPLAY_DEVICEW;
typedef BOOL (CALLBACK *ABORTPROC)(HDC,int); typedef BOOL (CALLBACK *ABORTPROC)(HDC,int);
typedef int (CALLBACK *MFENUMPROC)(HDC,HANDLETABLE*,METARECORD*,int,LPARAM); typedef int (CALLBACK *MFENUMPROC)(HDC,HANDLETABLE*,METARECORD*,int,LPARAM);
@ -2789,6 +2797,7 @@ typedef NEWTEXTMETRICW NEWTEXTMETRIC,*PNEWTEXTMETRIC,*LPNEWTEXTMETRIC;
typedef NEWTEXTMETRICEXW NEWTEXTMETRICEX; typedef NEWTEXTMETRICEXW NEWTEXTMETRICEX;
typedef ENUMLOGFONTW ENUMLOGFONT,*LPENUMLOGFONT; typedef ENUMLOGFONTW ENUMLOGFONT,*LPENUMLOGFONT;
typedef ENUMLOGFONTEXW ENUMLOGFONTEX,*LPENUMLOGFONTEX; typedef ENUMLOGFONTEXW ENUMLOGFONTEX,*LPENUMLOGFONTEX;
typedef DISPLAY_DEVICEW DISPLAY_DEVICE, *PDISPLAY_DEVICE, *LPDISPLAY_DEVICE;
#define AddFontResource AddFontResourceW #define AddFontResource AddFontResourceW
#if (_WIN32_WINNT >= 0x0500) #if (_WIN32_WINNT >= 0x0500)
#define AddFontResourceEx AddFontResourceExW #define AddFontResourceEx AddFontResourceExW
@ -2857,6 +2866,7 @@ typedef NEWTEXTMETRICA NEWTEXTMETRIC,*PNEWTEXTMETRIC,*LPNEWTEXTMETRIC;
typedef NEWTEXTMETRICEXA NEWTEXTMETRICEX; typedef NEWTEXTMETRICEXA NEWTEXTMETRICEX;
typedef ENUMLOGFONTA ENUMLOGFONT,*LPENUMLOGFONT; typedef ENUMLOGFONTA ENUMLOGFONT,*LPENUMLOGFONT;
typedef ENUMLOGFONTEXA ENUMLOGFONTEX,*LPENUMLOGFONTEX; typedef ENUMLOGFONTEXA ENUMLOGFONTEX,*LPENUMLOGFONTEX;
typedef DISPLAY_DEVICEA DISPLAY_DEVICE, *PDISPLAY_DEVICE, *LPDISPLAY_DEVICE;
#define AddFontResource AddFontResourceA #define AddFontResource AddFontResourceA
#if (_WIN32_WINNT >= 0x0500) #if (_WIN32_WINNT >= 0x0500)
#define AddFontResourceEx AddFontResourceExA #define AddFontResourceEx AddFontResourceExA

4
winsup/w32api/include/winuser.h
View File

@ -2959,6 +2959,8 @@ BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
#ifndef NOGDI #ifndef NOGDI
BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA); BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA);
BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW); BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW);
BOOL WINAPI EnumDisplayDevicesA(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD);
BOOL WINAPI EnumDisplayDevicesA(LPCWSTR,DWORD,PDISPLAY_DEVICEW,DWORD);
#endif #endif
int WINAPI EnumPropsA(HWND,PROPENUMPROCA); int WINAPI EnumPropsA(HWND,PROPENUMPROCA);
int WINAPI EnumPropsW(HWND,PROPENUMPROCW); int WINAPI EnumPropsW(HWND,PROPENUMPROCW);
@ -3519,6 +3521,7 @@ typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
#define ChangeDisplaySettings ChangeDisplaySettingsW #define ChangeDisplaySettings ChangeDisplaySettingsW
#define CreateDesktop CreateDesktopW #define CreateDesktop CreateDesktopW
#define EnumDisplaySettings EnumDisplaySettingsW #define EnumDisplaySettings EnumDisplaySettingsW
#define EnumDisplayDevices EnumDisplayDevicesW
#endif /* NOGDI */ #endif /* NOGDI */
#else /* UNICODE */ #else /* UNICODE */
#define EDITWORDBREAKPROC EDITWORDBREAKPROCA #define EDITWORDBREAKPROC EDITWORDBREAKPROCA
@ -3675,6 +3678,7 @@ typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
#define ChangeDisplaySettings ChangeDisplaySettingsA #define ChangeDisplaySettings ChangeDisplaySettingsA
#define CreateDesktop CreateDesktopA #define CreateDesktop CreateDesktopA
#define EnumDisplaySettings EnumDisplaySettingsA #define EnumDisplaySettings EnumDisplaySettingsA
#define EnumDisplayDevices EnumDisplayDevicesA
#endif /* NOGDI */ #endif /* NOGDI */
#endif /* UNICODE */ #endif /* UNICODE */
#endif /* RC_INVOKED */ #endif /* RC_INVOKED */