[CMAKE]

[reactos.git] / subsystems / win32 / win32k / ntuser / prop.c

diff --git a/subsystems/win32/win32k/ntuser/prop.c b/subsystems/win32/win32k/ntuser/prop.c
index 5e032a6..56e221d 100644 (file)
--- a/subsystems/win32/win32k/ntuser/prop.c
+++ b/subsystems/win32/win32k/ntuser/prop.c
@@ -35,13 +35,13 @@
 /* STATIC FUNCTIONS **********************************************************/
 
 PPROPERTY FASTCALL
-IntGetProp(PWINDOW_OBJECT Window, ATOM Atom)
+IntGetProp(PWND Window, ATOM Atom)
 {
    PLIST_ENTRY ListEntry;
    PPROPERTY Property;
 
-   ListEntry = Window->Wnd->PropListHead.Flink;
-   while (ListEntry != &Window->Wnd->PropListHead)
+   ListEntry = Window->PropListHead.Flink;
+   while (ListEntry != &Window->PropListHead)
    {
       Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry);
       if (Property->Atom == Atom)
@@ -54,7 +54,7 @@ IntGetProp(PWINDOW_OBJECT Window, ATOM Atom)
 }
 
 BOOL FASTCALL
-IntRemoveProp(PWINDOW_OBJECT Window, ATOM Atom)
+IntRemoveProp(PWND Window, ATOM Atom)
 {
    PPROPERTY Prop;
    Prop = IntGetProp(Window, Atom);
@@ -65,12 +65,12 @@ IntRemoveProp(PWINDOW_OBJECT Window, ATOM Atom)
    }
    RemoveEntryList(&Prop->PropListEntry);
    UserHeapFree(Prop);
-   Window->Wnd->PropListItems--;
+   Window->PropListItems--;
    return TRUE;
 }
 
 BOOL FASTCALL
-IntSetProp(PWINDOW_OBJECT pWnd, ATOM Atom, HANDLE Data)
+IntSetProp(PWND pWnd, ATOM Atom, HANDLE Data)
 {
    PPROPERTY Prop;
 
@@ -84,8 +84,8 @@ IntSetProp(PWINDOW_OBJECT pWnd, ATOM Atom, HANDLE Data)
          return FALSE;
       }
       Prop->Atom = Atom;
-      InsertTailList(&pWnd->Wnd->PropListHead, &Prop->PropListEntry);
-      pWnd->Wnd->PropListItems++;
+      InsertTailList(&pWnd->PropListHead, &Prop->PropListEntry);
+      pWnd->PropListItems++;
    }
 
    Prop->Data = Data;
@@ -100,7 +100,7 @@ NtUserBuildPropList(HWND hWnd,
                     DWORD BufferSize,
                     DWORD *Count)
 {
-   PWINDOW_OBJECT Window;
+   PWND Window;
    PPROPERTY Property;
    PLIST_ENTRY ListEntry;
    PROPLISTITEM listitem, *li;
@@ -125,8 +125,8 @@ NtUserBuildPropList(HWND hWnd,
 
       /* copy list */
       li = (PROPLISTITEM *)Buffer;
-      ListEntry = Window->Wnd->PropListHead.Flink;
-      while((BufferSize >= sizeof(PROPLISTITEM)) && (ListEntry != &Window->Wnd->PropListHead))
+      ListEntry = Window->PropListHead.Flink;
+      while((BufferSize >= sizeof(PROPLISTITEM)) && (ListEntry != &Window->PropListHead))
       {
          Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry);
          listitem.Atom = Property->Atom;
@@ -147,7 +147,7 @@ NtUserBuildPropList(HWND hWnd,
    }
    else
    {
-      Cnt = Window->Wnd->PropListItems * sizeof(PROPLISTITEM);
+      Cnt = Window->PropListItems * sizeof(PROPLISTITEM);
    }
 
    if(Count)
@@ -170,7 +170,7 @@ CLEANUP:
 HANDLE APIENTRY
 NtUserRemoveProp(HWND hWnd, ATOM Atom)
 {
-   PWINDOW_OBJECT Window;
+   PWND Window;
    PPROPERTY Prop;
    HANDLE Data;
    DECLARE_RETURN(HANDLE);
@@ -192,7 +192,7 @@ NtUserRemoveProp(HWND hWnd, ATOM Atom)
    Data = Prop->Data;
    RemoveEntryList(&Prop->PropListEntry);
    UserHeapFree(Prop);
-   Window->Wnd->PropListItems--;
+   Window->PropListItems--;
 
    RETURN(Data);
 
@@ -205,7 +205,7 @@ CLEANUP:
 BOOL APIENTRY
 NtUserSetProp(HWND hWnd, ATOM Atom, HANDLE Data)
 {
-   PWINDOW_OBJECT Window;
+   PWND Window;
    DECLARE_RETURN(BOOL);
 
    DPRINT("Enter NtUserSetProp\n");