marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added stub implementation for EnumDisplayDevices*.

oldstable
Marcus Meissner 1999-09-19 12:09:23 +00:00 committed by Alexandre Julliard
parent eb71e50491
commit 8388f67523
4 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/wingdi.h
View File

@ -2993,6 +2993,30 @@ typedef struct _RGNDATA {
typedef BOOL (CALLBACK* ABORTPROC)(HDC, INT);
typedef struct {
DWORD cb;
BYTE DeviceName[32];
BYTE DeviceString[128];
DWORD StateFlags;
} DISPLAY_DEVICEA,*PDISPLAY_DEVICEA,*LPDISPLAY_DEVICEA;
typedef struct {
DWORD cb;
WCHAR DeviceName[32];
WCHAR DeviceString[128];
DWORD StateFlags;
} DISPLAY_DEVICEW,*PDISPLAY_DEVICEW,*LPDISPLAY_DEVICEW;
DECL_WINELIB_TYPE_AW(DISPLAY_DEVICE);
DECL_WINELIB_TYPE_AW(PDISPLAY_DEVICE);
DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE);
/* DISPLAY_DEVICE.StateFlags (?)*/
#define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001
#define DISPLAY_DEVICE_MULTI_DRIVER 0x00000002
#define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004
#define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008
#define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010
#include "poppack.h"
INT WINAPI AbortDoc(HDC);

3
include/winuser.h
View File

@ -2898,6 +2898,9 @@ HACCEL WINAPI CreateAcceleratorTableW(LPACCEL,INT);
HICON WINAPI CreateIconIndirect(LPICONINFO);
BOOL WINAPI DestroyAcceleratorTable(HACCEL);
BOOL WINAPI EnumDisplayMonitors(HDC,LPRECT,MONITORENUMPROC,LPARAM);
BOOL WINAPI EnumDisplayDevicesA(LPVOID,DWORD,LPDISPLAY_DEVICEA,DWORD);
BOOL WINAPI EnumDisplayDevicesW(LPVOID,DWORD,LPDISPLAY_DEVICEW,DWORD);
#define EnumDisplayDevices WINELIB_NAME_AW(EnumDisplayDevices)
INT WINAPI EnumPropsExA(HWND,PROPENUMPROCEXA,LPARAM);
INT WINAPI EnumPropsExW(HWND,PROPENUMPROCEXW,LPARAM);
#define EnumPropsEx WINELIB_NAME_AW(EnumPropsEx)

4
relay32/user32.spec
View File

@ -185,8 +185,8 @@ init MAIN_UserInit
181 stub EnumDesktopsW
182 stub EnumDisplayDeviceModesA
183 stub EnumDisplayDeviceModesW
184 stub EnumDisplayDevicesA
185 stub EnumDisplayDevicesW
184 stdcall EnumDisplayDevicesA(ptr long ptr long) EnumDisplayDevicesA
185 stdcall EnumDisplayDevicesW(ptr long ptr long) EnumDisplayDevicesW
186 stdcall EnumPropsA(long ptr) EnumPropsA
187 stdcall EnumPropsExA(long ptr long) EnumPropsExA
188 stdcall EnumPropsExW(long ptr long) EnumPropsExW

36
windows/user.c
View File

@ -409,6 +409,42 @@ BOOL WINAPI EnumDisplaySettingsW(LPCWSTR name,DWORD n,LPDEVMODEW devmode) {
return ret;
}
/***********************************************************************
* EnumDisplayDevicesA (USER32.184)
*/
BOOL WINAPI EnumDisplayDevicesA(
LPVOID unused,DWORD i,LPDISPLAY_DEVICEA lpDisplayDevice,DWORD dwFlags
) {
if (i)
return FALSE;
FIXME_(system)("(%p,%ld,%p,0x%08lx), stub!\n",unused,i,lpDisplayDevice,dwFlags);
strcpy(lpDisplayDevice->DeviceName,"X11");
strcpy(lpDisplayDevice->DeviceString,"X 11 Windowing System");
lpDisplayDevice->StateFlags =
DISPLAY_DEVICE_ATTACHED_TO_DESKTOP |
DISPLAY_DEVICE_PRIMARY_DEVICE |
DISPLAY_DEVICE_VGA_COMPATIBLE;
return TRUE;
}
/***********************************************************************
* EnumDisplayDevicesW (USER32.185)
*/
BOOL WINAPI EnumDisplayDevicesW(
LPVOID unused,DWORD i,LPDISPLAY_DEVICEW lpDisplayDevice,DWORD dwFlags
) {
if (i)
return FALSE;
FIXME_(system)("(%p,%ld,%p,0x%08lx), stub!\n",unused,i,lpDisplayDevice,dwFlags);
lstrcpyAtoW(lpDisplayDevice->DeviceName,"X11");
lstrcpyAtoW(lpDisplayDevice->DeviceString,"X 11 Windowing System");
lpDisplayDevice->StateFlags =
DISPLAY_DEVICE_ATTACHED_TO_DESKTOP |
DISPLAY_DEVICE_PRIMARY_DEVICE |
DISPLAY_DEVICE_VGA_COMPATIBLE;
return TRUE;
}
/***********************************************************************
* SetEventHook (USER.321)
*