[Win32k|User32]

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

diff --git a/reactos/subsystems/win32/win32k/ntuser/clipboard.c b/reactos/subsystems/win32/win32k/ntuser/clipboard.c
index 81a7667..538cf25 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/clipboard.c
+++ b/reactos/subsystems/win32/win32k/ntuser/clipboard.c
@@ -17,9 +17,9 @@
 
 PTHREADINFO      ClipboardThread;
 PTHREADINFO      ClipboardOwnerThread;
-PWINDOW_OBJECT  ClipboardWindow;
-PWINDOW_OBJECT  ClipboardViewerWindow;
-PWINDOW_OBJECT  ClipboardOwnerWindow;
+PWND  ClipboardWindow;
+PWND  ClipboardViewerWindow;
+PWND  ClipboardOwnerWindow;
 BOOL            sendDrawClipboardMsg;
 BOOL            recentlySetClipboard;
 BOOL            delayedRender;
@@ -38,7 +38,7 @@ DWORD synthesizedDataSize;
 /* return the pointer to the prev window of the finded window,
    if NULL does not exists in the chain */
 PCLIPBOARDCHAINELEMENT FASTCALL
-IntIsWindowInChain(PWINDOW_OBJECT window)
+IntIsWindowInChain(PWND window)
 {
     PCLIPBOARDCHAINELEMENT wce = WindowsChain;
 
@@ -60,14 +60,14 @@ VOID FASTCALL printChain(VOID)
     PCLIPBOARDCHAINELEMENT wce2 = WindowsChain;
     while (wce2)
     {
-        DPRINT1("chain: %p\n", wce2->window->hSelf);
+        DPRINT1("chain: %p\n", wce2->window->head.h);
         wce2 = wce2->next;
     }
 }
 
 /* the new window always have to be the first in the chain */
 PCLIPBOARDCHAINELEMENT FASTCALL
-IntAddWindowToChain(PWINDOW_OBJECT window)
+IntAddWindowToChain(PWND window)
 {
     PCLIPBOARDCHAINELEMENT wce = NULL;
 
@@ -96,7 +96,7 @@ exit_addChain:
 }
 
 PCLIPBOARDCHAINELEMENT FASTCALL
-IntRemoveWindowFromChain(PWINDOW_OBJECT window)
+IntRemoveWindowFromChain(PWND window)
 {
     PCLIPBOARDCHAINELEMENT wce = WindowsChain;
        PCLIPBOARDCHAINELEMENT *link = &WindowsChain;
@@ -345,7 +345,7 @@ intIsClipboardOpenByMe(VOID)
 
 /* IntClipboardFreeWindow it's called when a window was destroyed */
 VOID FASTCALL
-IntClipboardFreeWindow(PWINDOW_OBJECT window)
+IntClipboardFreeWindow(PWND window)
 {
     /* called from co_UserFreeWindow in window.c */
     /* check if clipboard is not locked by this window, if yes, unlock it */
@@ -377,7 +377,7 @@ BOOL APIENTRY
 NtUserOpenClipboard(HWND hWnd, DWORD Unknown1)
 {
 
-    PWINDOW_OBJECT Window;
+    PWND Window;
     BOOL ret = FALSE;
 
     UserEnterExclusive();
@@ -392,7 +392,7 @@ NtUserOpenClipboard(HWND hWnd, DWORD Unknown1)
         {
             if  (ClipboardOwnerWindow)
             {
-                if (ClipboardOwnerWindow->hSelf == hWnd)
+                if (ClipboardOwnerWindow->head.h == hWnd)
                 {
                     ret = TRUE;
                 }
@@ -485,7 +485,7 @@ NtUserGetOpenClipboardWindow(VOID)
 
     if (ClipboardWindow)
     {
-        ret = ClipboardWindow->hSelf;
+        ret = ClipboardWindow->head.h;
     }
 
     UserLeave();
@@ -498,7 +498,7 @@ NtUserChangeClipboardChain(HWND hWndRemove, HWND hWndNewNext)
 {
     BOOL ret = FALSE;
     PCLIPBOARDCHAINELEMENT w = NULL;
-    PWINDOW_OBJECT removeWindow;
+    PWND removeWindow;
     UserEnterExclusive();
 
     removeWindow = UserGetWindowObject(hWndRemove);
@@ -521,9 +521,9 @@ NtUserChangeClipboardChain(HWND hWndRemove, HWND hWndNewNext)
         // then they do the chain
 
         /* WindowsChain->window may be NULL */
-        LPARAM lparam = WindowsChain->window == NULL ? 0 : (LPARAM)WindowsChain->window->hSelf;
-        DPRINT1("Message: WM_CHANGECBCHAIN to %p", WindowsChain->window->hSelf);
-        co_IntSendMessage(WindowsChain->window->hSelf, WM_CHANGECBCHAIN, (WPARAM)hWndRemove, lparam);
+        LPARAM lparam = WindowsChain->window == NULL ? 0 : (LPARAM)WindowsChain->window->head.h;
+        DPRINT1("Message: WM_CHANGECBCHAIN to %p", WindowsChain->window->head.h);
+        co_IntSendMessage(WindowsChain->window->head.h, WM_CHANGECBCHAIN, (WPARAM)hWndRemove, lparam);
     }
 
     UserLeave();
@@ -572,8 +572,8 @@ NtUserEmptyClipboard(VOID)
 
     if (ret && ClipboardOwnerWindow)
     {
-        DPRINT("Clipboard: WM_DESTROYCLIPBOARD to %p", ClipboardOwnerWindow->hSelf);
-        co_IntSendMessage( ClipboardOwnerWindow->hSelf, WM_DESTROYCLIPBOARD, 0, 0);
+        DPRINT("Clipboard: WM_DESTROYCLIPBOARD to %p", ClipboardOwnerWindow->head.h);
+        co_IntSendMessage( ClipboardOwnerWindow->head.h, WM_DESTROYCLIPBOARD, 0, 0);
     }
 
     UserLeave();
@@ -603,8 +603,8 @@ NtUserGetClipboardData(UINT uFormat, PVOID pBuffer)
                     /* tell owner what data needs to be rendered */
                     if (ClipboardOwnerWindow)
                     {
-                        ASSERT(ClipboardOwnerWindow->hSelf);
-                        co_IntSendMessage(ClipboardOwnerWindow->hSelf, WM_RENDERFORMAT, (WPARAM)uFormat, 0);
+                        ASSERT(ClipboardOwnerWindow->head.h);
+                        co_IntSendMessage(ClipboardOwnerWindow->head.h, WM_RENDERFORMAT, (WPARAM)uFormat, 0);
                         data = intIsFormatAvailable(uFormat);
                         ASSERT(data->size);
                         ret = (HANDLE)(ULONG_PTR)data->size;
@@ -754,7 +754,7 @@ NtUserGetClipboardOwner(VOID)
 
     if (ClipboardOwnerWindow)
     {
-        ret = ClipboardOwnerWindow->hSelf;
+        ret = ClipboardOwnerWindow->head.h;
     }
 
     UserLeave();
@@ -771,7 +771,7 @@ NtUserGetClipboardViewer(VOID)
 
     if (WindowsChain)
     {
-        ret = WindowsChain->window->hSelf;
+        ret = WindowsChain->window->head.h;
     }
 
     UserLeave();
@@ -1037,7 +1037,7 @@ NtUserSetClipboardViewer(HWND hWndNewViewer)
 {
     HWND ret = NULL;
     PCLIPBOARDCHAINELEMENT newWC = NULL;
-    PWINDOW_OBJECT window;
+    PWND window;
 
     UserEnterExclusive();
 
@@ -1053,7 +1053,7 @@ NtUserSetClipboardViewer(HWND hWndNewViewer)
                 if (newWC->next)
                 {
                     // return the next HWND available window in the chain
-                    ret = newWC->next->window->hSelf;
+                    ret = newWC->next->window->head.h;
                 }
             }
         }