Changeset 1818 for trunk/src

Timestamp:

Nov 23, 1999, 8:34:19 PM (26 years ago)

Author:

sandervl

Message:

display api fixes

Location:

trunk/src/user32

Files:

• Makefile (modified) (3 diffs)
• USER32.DEF (modified) (2 diffs)
• display.cpp (added)
• pmwindow.cpp (modified) (4 diffs)
• pmwindow.h (modified) (2 diffs)
• user32.cpp (modified) (2 diffs)
• user32exp.def (modified) (1 diff)

trunk/src/user32/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.43 1999-11-09 19:23:16 sandervl Exp $
+# $Id: Makefile,v 1.44 1999-11-23 19:34:19 sandervl Exp $
 
 #
@@ -33 +33 @@
         icon.obj hook.obj hooks.obj winmenu.obj winkeyboard.obj \
         defwndproc.obj syscolor.obj char.obj initterm.obj \
-        uitools.obj unknown.obj spy.obj wndmsg.obj \
+        uitools.obj unknown.obj spy.obj wndmsg.obj display.obj \
         pmwindow.obj pmframe.obj win32class.obj win32wnd.obj win32dlg.obj \
         msgbox.obj window.obj windowmsg.obj windowclass.obj win32wbase.obj \
@@ -156 +156 @@
 winmouse.obj:   winmouse.cpp winmouse.h oslibmsg.h pmwindow.h win32wbase.h
 winkeyboard.obj: winkeyboard.cpp $(PDWIN32_INCLUDE)\winkeyboard.h
+display.obj: display.cpp pmwindow.h
 
 clean:

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.20 1999-11-10 14:16:44 sandervl Exp $
+; $Id: USER32.DEF,v 1.21 1999-11-23 19:34:18 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -610 +610 @@
     wvsprintfW                 = _wvsprintfW@12              @580
 
+    ChangeDisplaySettingsExA   = _ChangeDisplaySettingsExA@20 @604
+    ChangeDisplaySettingsExW   = _ChangeDisplaySettingsExW@20 @605
+
 ;------------
 ; Windows 98

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.54 1999-11-17 17:04:53 cbratschi Exp $ */
+/* $Id: pmwindow.cpp,v 1.55 1999-11-23 19:34:19 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -12 +12 @@
 #define INCL_WIN
 #define INCL_GPI
+#define INCL_DEV                /* Device Function definitions  */
+#define INCL_GPICONTROL         /* GPI control Functions        */
 
 #include <os2wrap.h>
@@ -39 +41 @@
 ULONG ScreenWidth  = 0;
 ULONG ScreenHeight = 0;
+ULONG ScreenBitsPerPel = 0;
 
 //Used for key translation while processing WM_CHAR message
@@ -175 +178 @@
    ScreenWidth  = desktopRectl.xRight;
    ScreenHeight = desktopRectl.yTop;
+   
+    
+   HDC   hdc;              /* Device-context handle                */
+   /* context data structure */
+   DEVOPENSTRUC dop = {NULL, "DISPLAY", NULL, NULL, NULL, NULL,
+                       NULL, NULL, NULL};
+ 
+   /* create memory device context */
+   hdc = DevOpenDC(hab, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&dop, NULLHANDLE);
+   DevQueryCaps(hdc, CAPS_COLOR_BITCOUNT, 1, (PLONG)&ScreenBitsPerPel);
+   DevCloseDC(hdc);
 
    dprintf(("InitPM: Desktop (%d,%d)", ScreenWidth, ScreenHeight));

trunk/src/user32/pmwindow.h

@@ -1 @@
-/* $Id: pmwindow.h,v 1.4 1999-11-08 13:44:14 sandervl Exp $ */
+/* $Id: pmwindow.h,v 1.5 1999-11-23 19:34:19 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -21 +21 @@
 extern ULONG ScreenWidth;
 extern ULONG ScreenHeight;
+extern ULONG ScreenBitsPerPel;
 
 #endif

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.54 1999-11-14 16:35:55 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.55 1999-11-23 19:34:19 sandervl Exp $ */
 
 /*
@@ -1924 +1924 @@
 /* Device Context Functions */
 
-BOOL WIN32API GetMonitorInfoA(HMONITOR,LPMONITORINFO)
-{
-#ifdef DEBUG
-  WriteLog("USER32:  GetMonitorInfoA not supported!!\n");
-#endif
-  return(FALSE);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API GetMonitorInfoW(HMONITOR,LPMONITORINFO)
-{
-#ifdef DEBUG
-  WriteLog("USER32:  GetMonitorInfoW not supported!!\n");
-#endif
-  return(FALSE);
-}
-//******************************************************************************
-//******************************************************************************
-HMONITOR WIN32API MonitorFromWindow(HWND hwnd, DWORD dwFlags)
-{
-#ifdef DEBUG
-  WriteLog("USER32:  MonitorFromWindow not correctly supported??\n");
-#endif
-  //Attention: Win32 hwnd!
-
-  return(0);
-}
-//******************************************************************************
-//******************************************************************************
-HMONITOR WIN32API MonitorFromRect(LPRECT rect, DWORD dwFlags)
-{
-#ifdef DEBUG
-  WriteLog("USER32:  MonitorFromRect not correctly supported??\n");
-#endif
-  return(0);
-}
-//******************************************************************************
-//******************************************************************************
-HMONITOR WIN32API MonitorFromPoint(POINT point, DWORD dwflags)
-{
-#ifdef DEBUG
-  WriteLog("USER32:  MonitorFromPoint not correctly supported??\n");
-#endif
-  return(0);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API EnumDisplayMonitors(HDC,LPRECT,MONITORENUMPROC,LPARAM)
-{
-#ifdef DEBUG
-  WriteLog("USER32:  EnumDisplayMonitors not supported??\n");
-#endif
-  return(FALSE);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API EnumDisplaySettingsA(LPCSTR lpszDeviceName, DWORD iModeNum,
-                      LPDEVMODEA lpDevMode)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  EnumDisplaySettingsA FAKED\n");
-#endif
-    switch(iModeNum) {
-    case 0:
-        lpDevMode->dmBitsPerPel       = 16;
-        lpDevMode->dmPelsWidth        = 768;
-        lpDevMode->dmPelsHeight       = 1024;
-        lpDevMode->dmDisplayFlags     = 0;
-        lpDevMode->dmDisplayFrequency = 70;
-        break;
-    case 1:
-        lpDevMode->dmBitsPerPel       = 16;
-        lpDevMode->dmPelsWidth        = 640;
-        lpDevMode->dmPelsHeight       = 480;
-        lpDevMode->dmDisplayFlags     = 0;
-        lpDevMode->dmDisplayFrequency = 70;
-        break;
-    default:
-        return(FALSE);
-    }
-    return(TRUE);
-}
-/*****************************************************************************
- * Name      : BOOL WIN32API EnumDisplaySettingsW
- * Purpose   : The EnumDisplaySettings function obtains information about one
- *             of a display device's graphics modes. You can obtain information
- *             for all of a display device's graphics modes by making a series
- *             of calls to this function.
- * Parameters: LPCTSTR   lpszDeviceName specifies the display device
- *             DWORD     iModeNum       specifies the graphics mode
- *             LPDEVMODE lpDevMode      points to structure to receive settings
- * Variables :
- * Result    : If the function succeeds, the return value is TRUE.
- *             If the function fails, the return value is FALSE.
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
- *****************************************************************************/
-BOOL WIN32API EnumDisplaySettingsW(LPCSTR     lpszDeviceName,
-                                      DWORD      iModeNum,
-                                      LPDEVMODEW lpDevMode)
-{
-  dprintf(("USER32:EnumDisplaySettingsW (%s,%08xh,%08x) not implemented.\n",
-         lpszDeviceName,
-         iModeNum,
-         lpDevMode));
-
-  return (EnumDisplaySettingsA(lpszDeviceName,
-                               iModeNum,
-                               (LPDEVMODEA)lpDevMode));
-}
-//******************************************************************************
-//******************************************************************************
-LONG WIN32API ChangeDisplaySettingsA(LPDEVMODEA  lpDevMode, DWORD dwFlags)
-{
-#ifdef DEBUG
-    if(lpDevMode) {
-        WriteLog("USER32:  ChangeDisplaySettingsA FAKED %X\n", dwFlags);
-        WriteLog("USER32:  ChangeDisplaySettingsA lpDevMode->dmBitsPerPel %d\n", lpDevMode->dmBitsPerPel);
-        WriteLog("USER32:  ChangeDisplaySettingsA lpDevMode->dmPelsWidth  %d\n", lpDevMode->dmPelsWidth);
-        WriteLog("USER32:  ChangeDisplaySettingsA lpDevMode->dmPelsHeight %d\n", lpDevMode->dmPelsHeight);
-    }
-#endif
-    return(DISP_CHANGE_SUCCESSFUL);
-}
-/*****************************************************************************
- * Name      : LONG WIN32API ChangeDisplaySettingsW
- * Purpose   : The ChangeDisplaySettings function changes the display settings
- *             to the specified graphics mode.
- * Parameters: LPDEVMODEW lpDevModeW
- *             DWORD      dwFlags
- * Variables :
- * Result    : DISP_CHANGE_SUCCESSFUL The settings change was successful.
- *             DISP_CHANGE_RESTART    The computer must be restarted in order for the graphics mode to work.
- *             DISP_CHANGE_BADFLAGS   An invalid set of flags was passed in.
- *             DISP_CHANGE_FAILED     The display driver failed the specified graphics mode.
- *             DISP_CHANGE_BADMODE    The graphics mode is not supported.
- *             DISP_CHANGE_NOTUPDATED Unable to write settings to the registry.
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
- *****************************************************************************/
-LONG WIN32API ChangeDisplaySettingsW(LPDEVMODEW lpDevMode,
-                                        DWORD      dwFlags)
-{
-  dprintf(("USER32:ChangeDisplaySettingsW(%08xh,%08x) not implemented.\n",
-         lpDevMode,
-         dwFlags));
-
-  return (ChangeDisplaySettingsA((LPDEVMODEA)lpDevMode,
-                                  dwFlags));
-}
 
 /* Window Station and Desktop Functions */

trunk/src/user32/user32exp.def

@@ -565 +565 @@
     _wvsprintfA@12                            @579
     _wvsprintfW@12                            @580
+    _ChangeDisplaySettingsExA@20              @604
+    _ChangeDisplaySettingsExW@20              @605
     _GetMenuInfo@8                            @800
     _SetMenuInfo@8                            @801