Changeset 2294 for trunk/src/user32/dc.cpp

Timestamp:

Jan 2, 2000, 9:20:03 PM (26 years ago)

Author:

sandervl

Message:

Implemented Set/GetWindowRgn (not activated)

File:

• trunk/src/user32/dc.cpp (modified) (4 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.31 1999-12-29 22:53:59 cbratschi Exp $ */
+/* $Id: dc.cpp,v 1.32 2000-01-02 20:20:01 sandervl Exp $ */
 
 /*
@@ -1428 +1428 @@
  *****************************************************************************/
 
-int WIN32API GetWindowRgn (HWND hWnd,
-                              HRGN hRgn)
-{
-  dprintf(("USER32:GetWindowRgn (%08xh,%08x) not implemented.\n",
-         hWnd,
-         hRgn));
-  //Attention: Win32 hwnd handle!
-
-  return (NULLREGION_W);
+int WIN32API GetWindowRgn(HWND hwnd, HRGN hRgn)
+{
+  Win32BaseWindow *window;
+  HRGN hWindowRegion;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("SetWindowContextHelpId, window %x not found", hwnd));
+        O32_SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
+    }
+    dprintf(("USER32:GetWindowRgn (%x,%x)", hwnd, hRgn));
+    hWindowRegion = window->GetWindowRegion();
+
+    return O32_CombineRgn(hRgn, hWindowRegion, 0, RGN_COPY_W);
 }
 /*****************************************************************************
@@ -1444 +1450 @@
  *             operating system permits drawing. The operating system does not
  *             display any portion of a window that lies outside of the window region
+ *             When this function is called, the system sends the WM_WINDOWPOSCHANGING and
+ *             WM_WINDOWPOSCHANGED messages to the window. 
+ *
  * Parameters: HWND  hWnd    handle to window whose window region is to be set
  *             HRGN  hRgn    handle to region
@@ -1456 +1465 @@
  *****************************************************************************/
 
-int WIN32API SetWindowRgn(HWND hWnd,
-                             HRGN hRgn,
-                             BOOL bRedraw)
-{
-  dprintf(("USER32:SetWindowRgn (%08xh,%08xh,%u) not implemented.\n",
-         hWnd,
-         hRgn,
-         bRedraw));
-  //Attention: Win32 hwnd handle!
-
-  return (0);
+int WIN32API SetWindowRgn(HWND hwnd,
+                          HRGN hRgn,
+                          BOOL bRedraw)
+{
+  Win32BaseWindow *window;
+  HRGN hWindowRegion;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("SetWindowContextHelpId, window %x not found", hwnd));
+        O32_SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
+    }
+    dprintf(("USER32:SetWindowRgn (%x,%x,%d)", hwnd, hRgn, bRedraw));
+    window->SetWindowRegion(hRgn);
+    if(bRedraw) {
+        RedrawWindow(hwnd, 0, 0, RDW_UPDATENOW_W);      
+    }
+//TODO:
+//  When this function is called, the system sends the WM_WINDOWPOSCHANGING and
+//  WM_WINDOWPOSCHANGED messages to the window. 
+    return 1;
 }
 //******************************************************************************