Changeset 8978

Timestamp:

Aug 9, 2002, 1:19:56 PM (23 years ago)

Author:

sandervl

Message:

Partly implemented GetGUIThreadInfo

Location:

trunk/src/user32

Files:

• dbgwrap.cpp (modified) (1 diff)
• user32.cpp (modified) (4 diffs)
• win32wndhandle.cpp (modified) (2 diffs)
• window.cpp (modified) (2 diffs)

trunk/src/user32/dbgwrap.cpp ¶

@@ -133 +133 @@
 BOOL WIN32API UserSignalProc(DWORD x1, DWORD x2, DWORD x3, DWORD x4);
 DWORD WIN32API RegisterTasklist (DWORD x);
-DWORD WIN32API GetGUIThreadInfo(DWORD arg1, DWORD arg2);
 HDESK WIN32API GetThreadDesktop(DWORD dwThreadId);
 BOOL WINAPI WINNLSEnableIME(HWND hwnd, BOOL bOpen);

trunk/src/user32/user32.cpp ¶

@@ -1 @@
-/* $Id: user32.cpp,v 1.122 2002-02-18 22:07:00 phaller Exp $ */
+/* $Id: user32.cpp,v 1.123 2002-08-09 11:19:56 sandervl Exp $ */
 
 /*
@@ -620 +620 @@
       case SPI_SETSCREENSAVETIMEOUT:
 */
+static int  dwScreenSaveTimeout = 180;
+static BOOL fScreenSaveActive   = FALSE;
 //******************************************************************************
 BOOL WIN32API SystemParametersInfoA(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni)
@@ -701 +703 @@
     case SPI_SCREENSAVERRUNNING:
         *(BOOL *)pvParam = FALSE;
+        break;
+
+    case SPI_GETSCREENSAVETIMEOUT:
+        if(pvParam) {
+            *(DWORD *)pvParam = dwScreenSaveTimeout;
+        }
+        break;
+
+    case SPI_SETSCREENSAVETIMEOUT:
+        if(pvParam) {
+            dwScreenSaveTimeout = *(DWORD *)pvParam;
+        }
+        break;
+
+    case SPI_GETSCREENSAVEACTIVE:
+        if(pvParam) {
+            *(BOOL *)pvParam = fScreenSaveActive;
+        }
+        break;
+
+    case SPI_SETSCREENSAVEACTIVE:
+        if(pvParam) {
+            fScreenSaveActive = *(BOOL *)pvParam;
+        }
         break;
 
@@ -2222 +2248 @@
 
 
-DWORD WIN32API GetGUIThreadInfo(DWORD arg1, DWORD arg2)
-{
-  dprintf(("USER32: GetGUIThreadInfo %x %x - empty stub!!", arg1, arg2));
-
-  return 0;
-}

trunk/src/user32/win32wndhandle.cpp ¶

@@ -1 @@
-/* $Id: win32wndhandle.cpp,v 1.15 2002-07-30 18:20:44 achimha Exp $ */
+/* $Id: win32wndhandle.cpp,v 1.16 2002-08-09 11:19:56 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -7 +7 @@
  *
  *
- * TODO: a linear list might not be the optimal implementation. Look
- *       into using some sort of tree
  * TODO: The table should be dynamically increased when necessary
  *       This is just a quick and dirty implementation 
  * TODO: Probably need to clean up the table when app closes
  *       (also store PID and remove all handles with PID of terminating app)
+ * TODO: a linear list might not be the optimal implementation. Look
+ *       into using some sort of tree (not important)
  * 
  * Project Odin Software License can be found in LICENSE.TXT

trunk/src/user32/window.cpp ¶

@@ -1 @@
-/* $Id: window.cpp,v 1.127 2002-07-30 17:46:58 achimha Exp $ */
+/* $Id: window.cpp,v 1.128 2002-08-09 11:19:56 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -857 +857 @@
     dprintf(("USER32: GetFocus %x\n", hwnd));
     return hwnd;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API GetGUIThreadInfo(DWORD dwThreadId, GUITHREADINFO *lpThreadInfo)
+{
+    dprintf(("!WARNING!: GetGUIThreadInfo not completely implemented!!"));
+
+    if(!lpThreadInfo || lpThreadInfo->cbSize != sizeof(GUITHREADINFO)) {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+    //dwThreadId == 0 -> current thread
+    if(!dwThreadId) dwThreadId = GetCurrentThreadId();
+
+    lpThreadInfo->flags;
+    lpThreadInfo->hwndActive  = GetActiveWindow();
+    if(lpThreadInfo->hwndActive) {
+        if(dwThreadId != GetWindowThreadProcessId(lpThreadInfo->hwndActive, NULL)) 
+        {//this thread doesn't own the active window (TODO: correct??)
+            lpThreadInfo->hwndActive = 0;
+        }
+    }
+    lpThreadInfo->hwndFocus      = GetFocus();
+    lpThreadInfo->hwndCapture    = GetCapture();
+    lpThreadInfo->flags          = 0;  //TODO:
+    lpThreadInfo->hwndMenuOwner  = 0;  //TODO: Handle to the window that owns any active menus
+    lpThreadInfo->hwndMoveSize   = 0;  //TODO: Handle to the window in a move or size loop.
+    lpThreadInfo->hwndCaret      = 0;  //TODO: Handle to the window that is displaying the caret
+    lpThreadInfo->rcCaret.left   = 0;
+    lpThreadInfo->rcCaret.top    = 0;
+    lpThreadInfo->rcCaret.right  = 0;
+    lpThreadInfo->rcCaret.bottom = 0;
+
+    SetLastError(ERROR_SUCCESS);
+    return TRUE;
 }
 //******************************************************************************