[ros-diffs] [jimtabor] 54599: - Fix return properties from atom.

Author: jimtabor
Date: Mon Dec  5 07:43:29 2011
New Revision: 54599

URL: http://svn.reactos.org/svn/reactos?rev=54599&view=rev
Log:
- Fix return properties from atom.

Modified:
    trunk/reactos/subsystems/win32/win32k/eng/engwindow.c
    trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c
    trunk/reactos/subsystems/win32/win32k/ntuser/windc.c

Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] Mon Dec  5 07:43:29
2011
@@ -135,14 +135,19 @@
   PWND  Window,
   FLONG           flChanged)
 {
+  PPROPERTY pprop;
   WNDGDI *Current;
   HWND hWnd;
 
   ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL);
 
   hWnd = Window->head.h;
-  Current = (WNDGDI *)IntGetProp(Window, AtomWndObj);
-
+  pprop = IntGetProp(Window, AtomWndObj);
+  if (!pprop)
+  {
+     return;
+  }
+  Current = (WNDGDI *)pprop->Data;
   if ( gcountPWO &&
        Current &&
        Current->Hwnd == hWnd &&

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Mon Dec  5
07:43:29 2011
@@ -633,7 +633,7 @@
          
          UserDerefObjectCo(Window);
          UserLeave();
-         return (DWORD)HelpId;
+         return (DWORD)HelpId->Data;
       }
       case HWND_ROUTINE_REGISTERSHELLHOOKWINDOW:
          if (IntIsWindow(hWnd))

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Mon Dec  5 07:43:29
2011
@@ -973,12 +973,15 @@
   PWNDGDI pWndgdi;
   PWND Wnd;
   HWND hWnd;
+  PPROPERTY pprop;
 
   hWnd = IntWindowFromDC(hdc);
 
   if (hWnd && !(Wnd = UserGetWindowObject(hWnd)))
   {
-     pWndgdi = (WNDGDI *)IntGetProp(Wnd, AtomWndObj);
+     pprop = IntGetProp(Wnd, AtomWndObj);
+
+     pWndgdi = (WNDGDI *)pprop->Data;
 
      if ( pWndgdi && pWndgdi->Hwnd == hWnd )
      {