Changeset 5935 for trunk/src/user32/timer.cpp

Timestamp:

Jun 9, 2001, 4:50:26 PM (24 years ago)

Author:

sandervl

Message:

reference count (window + class objects) rewrite

File:

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

trunk/src/user32/timer.cpp

@@ -1 @@
-/* $Id: timer.cpp,v 1.12 2000-03-13 13:10:48 sandervl Exp $ */
+/* $Id: timer.cpp,v 1.13 2001-06-09 14:50:20 sandervl Exp $ */
 
 /*
@@ -113 +113 @@
     int i;
     TIMER *pTimer;
+    HWND hwndOS2;
     Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
 
-    if (hwnd && !wnd) return 0;
+    if (hwnd && !wnd) {
+        dprintf(("TIMER_SetTimer invalid window handle %x", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE_W);
+        return 0;
+    }
+
+    hwndOS2 = hwnd ? wnd->getOS2WindowHandle() : 0;
+    if(wnd) RELEASE_WNDOBJ(wnd);
+    wnd = NULL;
 
     EnterCriticalSection ();
@@ -147 +156 @@
         pTimer->id      = id;
         pTimer->proc    = proc;
-        pTimer->PMhwnd  = hwnd ? wnd->getOS2WindowHandle() : NULLHANDLE;
+        pTimer->PMhwnd  = hwnd ? hwndOS2 : NULLHANDLE;
         pTimer->PMid    = WinStartTimer (GetThreadHAB(), pTimer->PMhwnd,
                                          i + 1, timeout);
@@ -199 +208 @@
 VOID TIMER_KillTimerFromWindow(HWND hwnd)
 {
-    Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
     int i;
     TIMER * pTimer;
 
-    if (hwnd && !wnd) return;
+    if (!IsWindow(hwnd)) return;
 
     EnterCriticalSection();