Changeset 331 for trunk/src

Timestamp:

Jul 18, 1999, 7:12:52 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

Location:

trunk/src/user32/new

Files:

• makefile (modified) (3 diffs)
• winacc.cpp (deleted)
• winaccel.cpp (added)
• window.cpp (modified) (9 diffs)
• windowmsg.cpp (modified) (2 diffs)
• winscrollbar.cpp (added)

trunk/src/user32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.9 1999-07-18 17:12:02 sandervl Exp $
+# $Id: makefile,v 1.10 1999-07-18 17:12:52 sandervl Exp $
 
 #
@@ -30 +30 @@
         windowword.obj gen_object.obj oslibwin.obj win32wndchild.obj \
         controls.obj button.obj oslibutil.obj oslibmsg.obj windlg.obj \
-        winprop.obj wingdi.obj oslibgdi.obj winacc.obj winscrollbar.obj
+        winprop.obj wingdi.obj oslibgdi.obj winaccel.obj winscrollbar.obj
 
 
@@ -80 +80 @@
 windowclass.obj: windowclass.cpp win32class.h win32wnd.h win32wndchild.h
 windowword.obj:  windowword.cpp win32class.h win32wnd.h win32dlg.h win32wndchild.h
-winacc.obj:     winacc.cpp
+winaccel.obj:     winaccel.cpp
 winscrollbar.obj: winscrollbar.cpp
 

trunk/src/user32/new/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.5 1999-07-18 10:39:52 sandervl Exp $ */
+/* $Id: window.cpp,v 1.6 1999-07-18 17:12:03 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -19 +19 @@
 #include <misc.h>
 #include <win32wnd.h>
+#include <oslibwin.h>
+#include "user32.h"
+#include "icon.h"
+#include "usrcall.h"
 
 //******************************************************************************
@@ -378 +382 @@
 //******************************************************************************
 //******************************************************************************
+BOOL WIN32API SetWindowPlacement( HWND arg1, const WINDOWPLACEMENT *  arg2)
+{
+    dprintf(("USER32:  SetWindowPlacement\n"));
+    return O32_SetWindowPlacement(arg1, arg2);
+}
+//******************************************************************************
+//******************************************************************************
 BOOL WIN32API IsWindow( HWND hwnd)
 {
@@ -418 +429 @@
     return window->IsWindowVisible();
 }
+//******************************************************************************
+//******************************************************************************
+HWND WIN32API SetFocus( HWND hwnd)
+{
+ HWND lastFocus;
+
+    dprintf(("USER32:  SetFocus\n"));
+
+    lastFocus = GetFocus();
+    hwnd = Win32Window::Win32ToOS2Handle(hwnd);
+    return (OSLibWinSetFocus(OSLIB_HWND_DESKTOP,hwnd)) ? lastFocus:0;
+}
+//******************************************************************************
+//******************************************************************************
+HWND WIN32API GetFocus(void)
+{
+    HWND hwnd;
+//    dprintf(("USER32:  GetFocus\n"));
+
+    hwnd = OSLibWinQueryFocus(OSLIB_HWND_DESKTOP);
+    return Win32Window::OS2ToWin32Handle(hwnd);
+}
+//******************************************************************************
+//******************************************************************************
 /***********************************************************************
  *           GetInternalWindowPos   (USER32.245)
@@ -434 +469 @@
     if (O32_GetWindowPlacement( hwnd, &wndpl ))
     {
-   if (rectWnd) *rectWnd = wndpl.rcNormalPosition;
-   if (ptIcon)  *ptIcon = wndpl.ptMinPosition;
-   return wndpl.showCmd;
+        if (rectWnd) *rectWnd = wndpl.rcNormalPosition;
+        if (ptIcon)  *ptIcon = wndpl.ptMinPosition;
+        return wndpl.showCmd;
     }
     return 0;
@@ -541 +576 @@
    return(rc);
 }
+/*******************************************************************
+ *      InternalGetWindowText    (USER32.326)
+ */
+int WIN32API InternalGetWindowText(HWND   hwnd,
+                                   LPWSTR lpString,
+                                   INT    nMaxCount )
+{
+    dprintf(("USER32: InternalGetWindowText(%08xh,%08xh,%08xh) not properly implemented.\n",
+             hwnd,
+             lpString,
+             nMaxCount));
+
+    return GetWindowTextW(hwnd,lpString,nMaxCount);
+}
 //******************************************************************************
 //******************************************************************************
@@ -562 +611 @@
 //******************************************************************************
 //******************************************************************************
+HWND WIN32API GetDesktopWindow(void)
+{
+    dprintf(("USER32:  GetDesktopWindow\n"));
+    return OSLIB_HWND_DESKTOP;
+}
+//******************************************************************************
+//******************************************************************************
 HWND WIN32API FindWindowA(LPCSTR arg1, LPCSTR arg2)
 {
@@ -580 +636 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API FlashWindow( HWND arg1, BOOL  arg2)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  FlashWindow\n");
-#endif
-    return O32_FlashWindow(arg1, arg2);
+BOOL WIN32API FlashWindow(HWND hwnd, BOOL fFlash)
+{
+    dprintf(("FlashWindow %x %d\n", hwnd, fFlash));
+    return OSLibWinFlashWindow(Win32Window::Win32ToOS2Handle(hwnd), fFlash);
 }
 //******************************************************************************
@@ -786 +840 @@
 //******************************************************************************
 //******************************************************************************
+BOOL WIN32API EnumThreadWindows(DWORD dwThreadId, WNDENUMPROC lpfn, LPARAM lParam)
+{
+ BOOL                rc;
+ EnumWindowCallback *callback = new EnumWindowCallback(lpfn, lParam);
+
+  dprintf(("USER32:  EnumThreadWindows\n"));
+  //CB: replace
+  rc = O32_EnumThreadWindows(dwThreadId, callback->GetOS2Callback(), (LPARAM)callback);
+  if(callback)
+    delete callback;
+  return(rc);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API GetUpdateRect( HWND hwnd, PRECT lpRect, BOOL  bErase)
+{
+    dprintf(("GetUpdateRect %x %d\n", hwnd, bErase));
+    if (!lpRect) return FALSE;
+
+    return OSLibWinQueryUpdateRect(Win32Window::Win32ToOS2Handle(hwnd), (PVOID)&lpRect);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API EnableScrollBar( HWND arg1, INT arg2, UINT  arg3)
+{
+#ifdef DEBUG
+    WriteLog("USER32:  EnableScrollBar\n");
+#endif
+    //CB: implement in window class
+    return O32_EnableScrollBar(arg1, arg2, arg3);
+}
+//******************************************************************************
+//******************************************************************************
+UINT WIN32API ArrangeIconicWindows( HWND arg1)
+{
+#ifdef DEBUG
+    WriteLog("USER32:  ArrangeIconicWindows\n");
+#endif
+    return O32_ArrangeIconicWindows(arg1);
+}
+//******************************************************************************
+//restores iconized window to previous size/position
+//******************************************************************************
+BOOL WIN32API OpenIcon(HWND hwnd)
+{
+#ifdef DEBUG
+  WriteLog("USER32:  OpenIcon\n");
+#endif
+  if(!IsIconic(hwnd))
+        return FALSE;
+  ShowWindow(hwnd, SW_SHOWNORMAL);
+  return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API ShowOwnedPopups( HWND arg1, BOOL  arg2)
+{
+    dprintf(("USER32:  ShowOwnedPopups\n"));
+    return O32_ShowOwnedPopups(arg1, arg2);
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/new/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.6 1999-07-17 11:52:24 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.7 1999-07-18 17:12:03 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -414 +414 @@
   return (FALSE);
 }
-//******************************************************************************
-//******************************************************************************
+/*****************************************************************************
+ * Name      : long WIN32API BroadcastSystemMessage
+ * Purpose   : The BroadcastSystemMessage function sends a message to the given
+ *             recipients. The recipients can be applications, installable
+ *             drivers, Windows-based network drivers, system-level device
+ *             drivers, or any combination of these system components.
+ * Parameters: DWORD   dwFlags,
+               LPDWORD lpdwRecipients,
+               UINT    uiMessage,
+               WPARAM  wParam,
+               LPARAM  lParam
+ * Variables :
+ * Result    : If the function succeeds, the return value is a positive value.
+ *             If the function is unable to broadcast the message, the return value is -1.
+ *             If the dwFlags parameter is BSF_QUERY and at least one recipient returned FALSE to the corresponding message, the return value is zero.
+ * Remark    :
+ * Status    : UNTESTED STUB
+ *
+ * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
+ *****************************************************************************/
+
+long WIN32API BroadcastSystemMessage(DWORD   dwFlags,
+                                        LPDWORD lpdwRecipients,
+                                        UINT    uiMessage,
+                                        WPARAM  wParam,
+                                        LPARAM  lParam)
+{
+  dprintf(("USER32:BroadcastSystemMessage(%08xh,%08xh,%08xh,%08xh,%08x) not implemented.\n",
+        dwFlags,
+        lpdwRecipients,
+        uiMessage,
+        wParam,
+        lParam));
+
+  return (-1);
+}
+//******************************************************************************
+//******************************************************************************