Changeset 1839 for trunk/src/user32/window.cpp

Timestamp:

Nov 25, 1999, 8:22:04 PM (26 years ago)

Author:

sandervl

Message:

desktop + misc fixes

File:

• trunk/src/user32/window.cpp (modified) (5 diffs)

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.37 1999-11-21 16:22:14 achimha Exp $ */
+/* $Id: window.cpp,v 1.38 1999-11-25 19:22:04 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -1120 +1120 @@
     pDWP = (DWP *) hdwp;
     if (!pDWP) {
-    dprintf(("**EndDeferWindowPos invalid parameter\n"));
+        dprintf(("**EndDeferWindowPos invalid parameter\n"));
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
@@ -1462 +1462 @@
 DWORD WIN32API GetWindowThreadProcessId(HWND hWnd, PDWORD  lpdwProcessId)
 {
-    dprintf(("USER32:  GetWindowThreadProcessId"));
+    dprintf2(("USER32:  GetWindowThreadProcessId"));
     hWnd = Win32BaseWindow::Win32ToOS2Handle(hWnd);
 
@@ -1471 +1471 @@
 DWORD WIN32API GetWindowContextHelpId(HWND hwnd)
 {
-  dprintf(("USER32:  GetWindowContextHelpId, not implemented\n"));
-  hwnd = Win32BaseWindow::Win32ToOS2Handle(hwnd);
-
-  return(0);
+  Win32BaseWindow *window;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("GetWindowContextHelpId, window %x not found", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
+    }
+    dprintf(("GetWindowContextHelpId %x", hwnd));
+    return window->getWindowContextHelpId();
 }
 //******************************************************************************
@@ -1480 +1486 @@
 BOOL WIN32API SetWindowContextHelpId(HWND hwnd, DWORD dwContextHelpId)
 {
-  dprintf(("USER32:  SetWindowContextHelpId, not implemented"));
-  hwnd = Win32BaseWindow::Win32ToOS2Handle(hwnd);
-
-  return(TRUE);
-}
-//******************************************************************************
-//******************************************************************************
+  Win32BaseWindow *window;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("SetWindowContextHelpId, window %x not found", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
+    }
+    dprintf(("SetWindowContextHelpId %x %d", hwnd, dwContextHelpId));
+    window->setWindowContextHelpId(dwContextHelpId);
+    return(TRUE);
+}
+//******************************************************************************
+//******************************************************************************