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

Timestamp:

Oct 17, 1999, 6:42:40 PM (26 years ago)

Author:

sandervl

Message:

Implemented SetWindowPlacement + bugfixes

File:

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

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.17 1999-10-17 15:46:10 sandervl Exp $ */
+/* $Id: window.cpp,v 1.18 1999-10-17 16:42:40 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -147 +147 @@
         {
           sprintf(tmpClassA,"#%d", (int) className);
-          AsciiToUnicode(tmpClassA, tmpClassW);
+          AsciiToUnicode(tmpClassA, tmpClassW);
           classAtom = GlobalFindAtomW(tmpClassW);
           className = (LPCWSTR)tmpClassW;
@@ -463 +463 @@
     if(!window) {
         dprintf(("SetWindowPos, window %x not found", hwnd));
-    SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
         return 0;
     }
@@ -471 +471 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API SetWindowPlacement( HWND arg1, const WINDOWPLACEMENT *  arg2)
-{
-    dprintf(("USER32:  SetWindowPlacement\n"));
-    return O32_SetWindowPlacement(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API GetWindowPlacement( HWND arg1, LPWINDOWPLACEMENT arg2)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  GetWindowPlacement\n");
-#endif
-    return O32_GetWindowPlacement(arg1, arg2);
+BOOL WIN32API SetWindowPlacement(HWND hwnd, const WINDOWPLACEMENT *winpos)
+{
+  Win32BaseWindow *window;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("SetWindowPlacement, window %x not found", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
+    }
+    return window->SetWindowPlacement((WINDOWPLACEMENT *)winpos);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API GetWindowPlacement(HWND hwnd, LPWINDOWPLACEMENT arg2)
+{
+    dprintf(("USER32:  GetWindowPlacement\n"));
+    return O32_GetWindowPlacement(Win32BaseWindow::Win32ToOS2FrameHandle(hwnd), arg2);
 }
 //******************************************************************************