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.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index bd87b83..0139cdd 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -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>
 
        * include/wincrypt.h (PLAINTEXTKEYBLOB, OPAQUEKEYBLOB,

diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h
index 5c57f7f..d9b4894 100644 (file)
--- a/winsup/w32api/include/wingdi.h
+++ b/winsup/w32api/include/wingdi.h
@@ -2037,7 +2037,7 @@ typedef struct tagGCP_RESULTSA {
        INT *lpDx;
        INT *lpCaretPos;
        LPSTR lpClass;
-       UINT *lpGlyphs;
+       LPWSTR lpGlyphs;
        UINT nGlyphs;
        UINT nMaxFit;
 } GCP_RESULTSA,*LPGCP_RESULTSA;
@@ -2048,7 +2048,7 @@ typedef struct tagGCP_RESULTSW {
        INT *lpDx;
        INT *lpCaretPos;
        LPWSTR lpClass;
-       UINT *lpGlyphs;
+       LPWSTR lpGlyphs;
        UINT nGlyphs;
        UINT nMaxFit;
 } GCP_RESULTSW,*LPGCP_RESULTSW;
@@ -2377,14 +2377,22 @@ typedef struct _GRADIENT_RECT {
        ULONG UpperLeft;
        ULONG LowerRight;
 }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;
   WCHAR DeviceName[32];
   WCHAR DeviceString[128];
   DWORD StateFlags;
   WCHAR DeviceID[128];
   WCHAR DeviceKey[128];
-} DISPLAY_DEVICE, *PDISPLAY_DEVICE;
+} DISPLAY_DEVICEW, *PDISPLAY_DEVICEW, *LPDISPLAY_DEVICEW;
 
 typedef BOOL (CALLBACK *ABORTPROC)(HDC,int);
 typedef int (CALLBACK *MFENUMPROC)(HDC,HANDLETABLE*,METARECORD*,int,LPARAM);
@@ -2789,6 +2797,7 @@ typedef NEWTEXTMETRICW NEWTEXTMETRIC,*PNEWTEXTMETRIC,*LPNEWTEXTMETRIC;
 typedef NEWTEXTMETRICEXW NEWTEXTMETRICEX;
 typedef ENUMLOGFONTW ENUMLOGFONT,*LPENUMLOGFONT;
 typedef ENUMLOGFONTEXW ENUMLOGFONTEX,*LPENUMLOGFONTEX;
+typedef DISPLAY_DEVICEW DISPLAY_DEVICE, *PDISPLAY_DEVICE, *LPDISPLAY_DEVICE;
 #define AddFontResource AddFontResourceW
 #if (_WIN32_WINNT >= 0x0500)
 #define AddFontResourceEx AddFontResourceExW
@@ -2857,6 +2866,7 @@ typedef NEWTEXTMETRICA NEWTEXTMETRIC,*PNEWTEXTMETRIC,*LPNEWTEXTMETRIC;
 typedef NEWTEXTMETRICEXA NEWTEXTMETRICEX;
 typedef ENUMLOGFONTA ENUMLOGFONT,*LPENUMLOGFONT;
 typedef ENUMLOGFONTEXA ENUMLOGFONTEX,*LPENUMLOGFONTEX;
+typedef DISPLAY_DEVICEA DISPLAY_DEVICE, *PDISPLAY_DEVICE, *LPDISPLAY_DEVICE;
 #define AddFontResource AddFontResourceA
 #if (_WIN32_WINNT >= 0x0500)
 #define AddFontResourceEx AddFontResourceExA

diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 95be10e..84f6dfb 100644 (file)
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -2959,6 +2959,8 @@ BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
 #ifndef NOGDI
 BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA);
 BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW);
+BOOL WINAPI EnumDisplayDevicesA(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD);
+BOOL WINAPI EnumDisplayDevicesA(LPCWSTR,DWORD,PDISPLAY_DEVICEW,DWORD);
 #endif
 int WINAPI EnumPropsA(HWND,PROPENUMPROCA);
 int WINAPI EnumPropsW(HWND,PROPENUMPROCW);
@@ -3519,6 +3521,7 @@ typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
 #define ChangeDisplaySettings ChangeDisplaySettingsW
 #define CreateDesktop CreateDesktopW
 #define EnumDisplaySettings EnumDisplaySettingsW
+#define EnumDisplayDevices  EnumDisplayDevicesW
 #endif /* NOGDI */
 #else /* UNICODE */
 #define EDITWORDBREAKPROC EDITWORDBREAKPROCA
@@ -3675,6 +3678,7 @@ typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
 #define ChangeDisplaySettings ChangeDisplaySettingsA
 #define CreateDesktop CreateDesktopA
 #define EnumDisplaySettings EnumDisplaySettingsA
+#define EnumDisplayDevices  EnumDisplayDevicesA
 #endif /* NOGDI */
 #endif /* UNICODE */
 #endif /* RC_INVOKED */