diff --git a/reactos/dll/win32/user32/include/user32.h b/reactos/dll/win32/user32/include/user32.h index cfcaba8c4be..9c6545d7e77 100644 --- a/reactos/dll/win32/user32/include/user32.h +++ b/reactos/dll/win32/user32/include/user32.h @@ -109,11 +109,11 @@ GetThreadDesktopInfo(VOID) } PCALLPROC FASTCALL ValidateCallProc(HANDLE hCallProc); -PWINDOW FASTCALL ValidateHwnd(HWND hwnd); -PWINDOW FASTCALL ValidateHwndOrDesk(HWND hwnd); -PWINDOW FASTCALL GetThreadDesktopWnd(VOID); +PWND FASTCALL ValidateHwnd(HWND hwnd); +PWND FASTCALL ValidateHwndOrDesk(HWND hwnd); +PWND FASTCALL GetThreadDesktopWnd(VOID); PVOID FASTCALL ValidateHandleNoErr(HANDLE handle, UINT uType); -PWINDOW FASTCALL ValidateHwndNoErr(HWND hwnd); +PWND FASTCALL ValidateHwndNoErr(HWND hwnd); VOID FASTCALL GetConnected(VOID); BOOL FASTCALL DefSetText(HWND hWnd, PCWSTR String, BOOL Ansi); -BOOL FASTCALL TestWindowProcess(PWINDOW); +BOOL FASTCALL TestWindowProcess(PWND); diff --git a/reactos/dll/win32/user32/include/window.h b/reactos/dll/win32/user32/include/window.h index 0ac6e2a1e57..2e88d9a9dd2 100644 --- a/reactos/dll/win32/user32/include/window.h +++ b/reactos/dll/win32/user32/include/window.h @@ -40,7 +40,7 @@ BOOL UserDrawSysMenuButton( HWND hWnd, HDC hDC, LPRECT, BOOL down ); void UserGetFrameSize(ULONG Style, ULONG ExStyle, SIZE *Size); void -UserGetInsideRectNC(PWINDOW Wnd, RECT *rect); +UserGetInsideRectNC(PWND Wnd, RECT *rect); DWORD SCROLL_HitTest( HWND hwnd, INT nBar, POINT pt, BOOL bDragging ); diff --git a/reactos/dll/win32/user32/misc/misc.c b/reactos/dll/win32/user32/misc/misc.c index 7ce85849f17..716a47cf60c 100644 --- a/reactos/dll/win32/user32/misc/misc.c +++ b/reactos/dll/win32/user32/misc/misc.c @@ -268,7 +268,7 @@ IsGUIThread( BOOL FASTCALL -TestWindowProcess(PWINDOW Wnd) +TestWindowProcess(PWND Wnd) { if (Wnd->ti == (PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) return TRUE; @@ -440,11 +440,11 @@ ValidateCallProc(HANDLE hCallProc) // // Validate a window handle and return the pointer to the object. // -PWINDOW +PWND FASTCALL ValidateHwnd(HWND hwnd) { - PWINDOW Wnd; + PWND Wnd; PCLIENTINFO ClientInfo = GetWin32ClientInfo(); ASSERT(ClientInfo != NULL); @@ -479,11 +479,11 @@ ValidateHwnd(HWND hwnd) // // Validate a window handle and return the pointer to the object. // -PWINDOW +PWND FASTCALL ValidateHwndNoErr(HWND hwnd) { - PWINDOW Wnd; + PWND Wnd; PCLIENTINFO ClientInfo = GetWin32ClientInfo(); ASSERT(ClientInfo != NULL); @@ -515,11 +515,11 @@ ValidateHwndNoErr(HWND hwnd) return NULL; } -PWINDOW +PWND FASTCALL GetThreadDesktopWnd(VOID) { - PWINDOW Wnd = GetThreadDesktopInfo()->Wnd; + PWND Wnd = GetThreadDesktopInfo()->Wnd; if (Wnd != NULL) Wnd = DesktopPtrToUser(Wnd); return Wnd; @@ -528,7 +528,7 @@ GetThreadDesktopWnd(VOID) // // Validate a window handle and return the pointer to the object. // -PWINDOW +PWND FASTCALL ValidateHwndOrDesk(HWND hwnd) { diff --git a/reactos/dll/win32/user32/windows/class.c b/reactos/dll/win32/user32/windows/class.c index 1bed4ac1033..02bbc8f18ef 100644 --- a/reactos/dll/win32/user32/windows/class.c +++ b/reactos/dll/win32/user32/windows/class.c @@ -194,8 +194,8 @@ GetClassInfoW( DWORD WINAPI GetClassLongA(HWND hWnd, int nIndex) { - PWINDOW Wnd; - PWINDOWCLASS Class; + PWND Wnd; + PCLS Class; ULONG_PTR Ret = 0; TRACE("%p %d\n", hWnd, nIndex); @@ -307,8 +307,8 @@ GetClassLongA(HWND hWnd, int nIndex) DWORD WINAPI GetClassLongW ( HWND hWnd, int nIndex ) { - PWINDOW Wnd; - PWINDOWCLASS Class; + PWND Wnd; + PCLS Class; ULONG_PTR Ret = 0; TRACE("%p %d\n", hWnd, nIndex); @@ -500,7 +500,7 @@ LONG WINAPI GetWindowLongA ( HWND hWnd, int nIndex ) { - PWINDOW Wnd; + PWND Wnd; Wnd = ValidateHwnd(hWnd); if (Wnd == NULL) @@ -557,7 +557,7 @@ LONG WINAPI GetWindowLongW(HWND hWnd, int nIndex) { - PWINDOW Wnd; + PWND Wnd; Wnd = ValidateHwnd(hWnd); if (Wnd == NULL) diff --git a/reactos/dll/win32/user32/windows/defwnd.c b/reactos/dll/win32/user32/windows/defwnd.c index 2b6684df86c..4a328f59891 100644 --- a/reactos/dll/win32/user32/windows/defwnd.c +++ b/reactos/dll/win32/user32/windows/defwnd.c @@ -115,7 +115,7 @@ DefSetText(HWND hWnd, PCWSTR String, BOOL Ansi) } void -UserGetInsideRectNC(PWINDOW Wnd, RECT *rect) +UserGetInsideRectNC(PWND Wnd, RECT *rect) { ULONG Style; ULONG ExStyle; @@ -262,7 +262,7 @@ DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam, ULONG Style) } static LONG -DefWndStartSizeMove(HWND hWnd, PWINDOW Wnd, WPARAM wParam, POINT *capturePoint) +DefWndStartSizeMove(HWND hWnd, PWND Wnd, WPARAM wParam, POINT *capturePoint) { LONG hittest = 0; POINT pt; @@ -409,7 +409,7 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam) DWORD dwPoint = GetMessagePos(); BOOL DragFullWindows = FALSE; HWND hWndParent = NULL; - PWINDOW Wnd; + PWND Wnd; Wnd = ValidateHwnd(hwnd); if (!Wnd) @@ -1616,7 +1616,7 @@ User32DefWindowProc(HWND hWnd, case WM_QUERYUISTATE: { LRESULT Ret = 0; - PWINDOW Wnd = ValidateHwnd(hWnd); + PWND Wnd = ValidateHwnd(hWnd); if (Wnd != NULL) { if (Wnd->HideFocus) @@ -1632,7 +1632,7 @@ User32DefWindowProc(HWND hWnd, BOOL AlwaysShowCues = FALSE; WORD Action = LOWORD(wParam); WORD Flags = HIWORD(wParam); - PWINDOW Wnd; + PWND Wnd; SystemParametersInfoW(SPI_GETKEYBOARDCUES, 0, &AlwaysShowCues, 0); if (AlwaysShowCues) @@ -1694,7 +1694,7 @@ User32DefWindowProc(HWND hWnd, { /* We're a child window and we need to pass this message down until we reach the root */ - hWnd = UserHMGetHandle((PWINDOW)DesktopPtrToUser(Wnd->spwndParent)); + hWnd = UserHMGetHandle((PWND)DesktopPtrToUser(Wnd->spwndParent)); } else { @@ -1714,7 +1714,7 @@ User32DefWindowProc(HWND hWnd, BOOL AlwaysShowCues = FALSE; WORD Action = LOWORD(wParam); WORD Flags = HIWORD(wParam); - PWINDOW Wnd; + PWND Wnd; SystemParametersInfoW(SPI_GETKEYBOARDCUES, 0, &AlwaysShowCues, 0); if (AlwaysShowCues) @@ -1870,7 +1870,7 @@ DefWindowProcA(HWND hWnd, LPARAM lParam) { LRESULT Result = 0; - PWINDOW Wnd; + PWND Wnd; SPY_EnterMessage(SPY_DEFWNDPROC, hWnd, Msg, wParam, lParam); switch (Msg) @@ -2019,7 +2019,7 @@ DefWindowProcW(HWND hWnd, LPARAM lParam) { LRESULT Result = 0; - PWINDOW Wnd; + PWND Wnd; SPY_EnterMessage(SPY_DEFWNDPROC, hWnd, Msg, wParam, lParam); switch (Msg) diff --git a/reactos/dll/win32/user32/windows/dialog.c b/reactos/dll/win32/user32/windows/dialog.c index d3f52d16fdf..c6d8d4f4d7b 100644 --- a/reactos/dll/win32/user32/windows/dialog.c +++ b/reactos/dll/win32/user32/windows/dialog.c @@ -146,7 +146,7 @@ const struct builtin_class_descr DIALOG_builtin_class = */ DIALOGINFO * DIALOG_get_info( HWND hWnd, BOOL create ) { - PWINDOW pWindow; + PWND pWindow; DIALOGINFO* dlgInfo = (DIALOGINFO *)GetWindowLongPtrW( hWnd, DWLP_ROS_DIALOGINFO ); if(!dlgInfo && create) diff --git a/reactos/dll/win32/user32/windows/menu.c b/reactos/dll/win32/user32/windows/menu.c index c32a55ec7c3..37d62035d5e 100644 --- a/reactos/dll/win32/user32/windows/menu.c +++ b/reactos/dll/win32/user32/windows/menu.c @@ -566,7 +566,7 @@ MenuDrawMenuItem(HWND hWnd, PROSMENUINFO MenuInfo, HWND WndOwner, HDC Dc, PWCHAR Text; BOOL flat_menu = FALSE; int bkgnd; - PWINDOW Wnd = ValidateHwnd(hWnd); + PWND Wnd = ValidateHwnd(hWnd); if (!Wnd) return; diff --git a/reactos/dll/win32/user32/windows/message.c b/reactos/dll/win32/user32/windows/message.c index ec98e5b7bf0..214cbb92b4c 100644 --- a/reactos/dll/win32/user32/windows/message.c +++ b/reactos/dll/win32/user32/windows/message.c @@ -1304,7 +1304,7 @@ CallWindowProcW(WNDPROC lpPrevWndFunc, static LRESULT WINAPI -IntCallMessageProc(IN PWINDOW Wnd, IN HWND hWnd, IN UINT Msg, IN WPARAM wParam, IN LPARAM lParam, IN BOOL Ansi) +IntCallMessageProc(IN PWND Wnd, IN HWND hWnd, IN UINT Msg, IN WPARAM wParam, IN LPARAM lParam, IN BOOL Ansi) { WNDPROC WndProc; BOOL IsAnsi; @@ -1335,7 +1335,7 @@ DispatchMessageA(CONST MSG *lpmsg) { LRESULT Ret = 0; MSG UnicodeMsg; - PWINDOW Wnd; + PWND Wnd; if (lpmsg->hwnd != NULL) { @@ -1396,7 +1396,7 @@ LRESULT WINAPI DispatchMessageW(CONST MSG *lpmsg) { LRESULT Ret = 0; - PWINDOW Wnd; + PWND Wnd; if (lpmsg->hwnd != NULL) { @@ -1797,7 +1797,7 @@ SendMessageW(HWND Wnd, if (Wnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) { - PWINDOW Window; + PWND Window; PW32THREADINFO ti = GetW32ThreadInfo(); Window = ValidateHwnd(Wnd); @@ -1861,7 +1861,7 @@ SendMessageA(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) if (Wnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) { - PWINDOW Window; + PWND Window; PW32THREADINFO ti = GetW32ThreadInfo(); Window = ValidateHwnd(Wnd); diff --git a/reactos/dll/win32/user32/windows/prop.c b/reactos/dll/win32/user32/windows/prop.c index df964e2886f..4bcc942a400 100644 --- a/reactos/dll/win32/user32/windows/prop.c +++ b/reactos/dll/win32/user32/windows/prop.c @@ -43,7 +43,7 @@ IntGetProp(HWND hWnd, ATOM Atom) { PLIST_ENTRY ListEntry, temp; PPROPERTY Property; - PWINDOW pWnd; + PWND pWnd; int i; pWnd = ValidateHwnd(hWnd); diff --git a/reactos/dll/win32/user32/windows/window.c b/reactos/dll/win32/user32/windows/window.c index 92fab7abab6..ea8d4392543 100644 --- a/reactos/dll/win32/user32/windows/window.c +++ b/reactos/dll/win32/user32/windows/window.c @@ -515,7 +515,7 @@ EndDeferWindowPos(HDWP hWinPosInfo) HWND WINAPI GetDesktopWindow(VOID) { - PWINDOW Wnd; + PWND Wnd; HWND Ret = NULL; _SEH2_TRY @@ -838,7 +838,7 @@ HWND WINAPI GetAncestor(HWND hwnd, UINT gaFlags) { HWND Ret = NULL; - PWINDOW Ancestor, Wnd; + PWND Ancestor, Wnd; Wnd = ValidateHwnd(hwnd); if (!Wnd) @@ -882,7 +882,7 @@ GetAncestor(HWND hwnd, UINT gaFlags) BOOL WINAPI GetClientRect(HWND hWnd, LPRECT lpRect) { - PWINDOW Wnd = ValidateHwnd(hWnd); + PWND Wnd = ValidateHwnd(hWnd); if (Wnd != NULL) { @@ -902,7 +902,7 @@ GetClientRect(HWND hWnd, LPRECT lpRect) HWND WINAPI GetLastActivePopup(HWND hWnd) { - PWINDOW Wnd; + PWND Wnd; HWND Ret = hWnd; Wnd = ValidateHwnd(hWnd); @@ -929,7 +929,7 @@ GetLastActivePopup(HWND hWnd) HWND WINAPI GetParent(HWND hWnd) { - PWINDOW Wnd, WndParent; + PWND Wnd, WndParent; HWND Ret = NULL; Wnd = ValidateHwnd(hWnd); @@ -989,7 +989,7 @@ HWND WINAPI GetWindow(HWND hWnd, UINT uCmd) { - PWINDOW Wnd, FoundWnd; + PWND Wnd, FoundWnd; HWND Ret = NULL; Wnd = ValidateHwnd(hWnd); @@ -1095,7 +1095,7 @@ BOOL WINAPI GetWindowRect(HWND hWnd, LPRECT lpRect) { - PWINDOW Wnd = ValidateHwnd(hWnd); + PWND Wnd = ValidateHwnd(hWnd); if (Wnd != NULL) { @@ -1113,7 +1113,7 @@ GetWindowRect(HWND hWnd, int WINAPI GetWindowTextA(HWND hWnd, LPSTR lpString, int nMaxCount) { - PWINDOW Wnd; + PWND Wnd; PCWSTR Buffer; INT Length = 0; @@ -1203,7 +1203,7 @@ GetWindowTextLengthW(HWND hWnd) int WINAPI GetWindowTextW(HWND hWnd, LPWSTR lpString, int nMaxCount) { - PWINDOW Wnd; + PWND Wnd; PCWSTR Buffer; INT Length = 0; @@ -1264,7 +1264,7 @@ GetWindowThreadProcessId(HWND hWnd, { DWORD Ret = 0; PW32THREADINFO ti; - PWINDOW pWnd = ValidateHwnd(hWnd); + PWND pWnd = ValidateHwnd(hWnd); if (!pWnd) return Ret; @@ -1298,7 +1298,7 @@ BOOL WINAPI IsChild(HWND hWndParent, HWND hWnd) { - PWINDOW WndParent, Wnd; + PWND WndParent, Wnd; BOOL Ret = FALSE; WndParent = ValidateHwnd(hWndParent); @@ -1341,7 +1341,7 @@ IsChild(HWND hWndParent, BOOL WINAPI IsIconic(HWND hWnd) { - PWINDOW Wnd = ValidateHwnd(hWnd); + PWND Wnd = ValidateHwnd(hWnd); if (Wnd != NULL) return (Wnd->style & WS_MINIMIZE) != 0; @@ -1356,7 +1356,7 @@ IsIconic(HWND hWnd) BOOL WINAPI IsWindow(HWND hWnd) { - PWINDOW Wnd = ValidateHwndNoErr(hWnd); + PWND Wnd = ValidateHwndNoErr(hWnd); if (Wnd != NULL) { /* FIXME: If window is being destroyed return FALSE! */ @@ -1373,7 +1373,7 @@ IsWindow(HWND hWnd) BOOL WINAPI IsWindowUnicode(HWND hWnd) { - PWINDOW Wnd = ValidateHwnd(hWnd); + PWND Wnd = ValidateHwnd(hWnd); if (Wnd != NULL) return Wnd->Unicode; @@ -1389,7 +1389,7 @@ BOOL WINAPI IsWindowVisible(HWND hWnd) { BOOL Ret = FALSE; - PWINDOW Wnd = ValidateHwnd(hWnd); + PWND Wnd = ValidateHwnd(hWnd); if (Wnd != NULL) { @@ -1678,7 +1678,7 @@ WindowFromPoint(POINT Point) int WINAPI MapWindowPoints(HWND hWndFrom, HWND hWndTo, LPPOINT lpPoints, UINT cPoints) { - PWINDOW FromWnd, ToWnd; + PWND FromWnd, ToWnd; POINT Delta; UINT i; @@ -1709,7 +1709,7 @@ MapWindowPoints(HWND hWndFrom, HWND hWndTo, LPPOINT lpPoints, UINT cPoints) BOOL WINAPI ScreenToClient(HWND hWnd, LPPOINT lpPoint) { - PWINDOW Wnd, DesktopWnd; + PWND Wnd, DesktopWnd; Wnd = ValidateHwnd(hWnd); if (!Wnd) @@ -1730,7 +1730,7 @@ ScreenToClient(HWND hWnd, LPPOINT lpPoint) BOOL WINAPI ClientToScreen(HWND hWnd, LPPOINT lpPoint) { - PWINDOW Wnd, DesktopWnd; + PWND Wnd, DesktopWnd; Wnd = ValidateHwnd(hWnd); if (!Wnd) diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/include/reactos/win32k/ntuser.h index b80b4aaaf9e..41a999dc68f 100644 --- a/reactos/include/reactos/win32k/ntuser.h +++ b/reactos/include/reactos/win32k/ntuser.h @@ -3,7 +3,7 @@ typedef struct _PROCESSINFO *PPROCESSINFO; struct _W32THREADINFO; -struct _WINDOW; +struct _WND; typedef struct _LARGE_UNICODE_STRING { @@ -75,7 +75,7 @@ typedef struct _DESKTOPINFO HWND hTaskManWindow; HWND hProgmanWindow; HWND hShellWindow; - struct _WINDOW *Wnd; + struct _WND *Wnd; union { @@ -107,9 +107,9 @@ typedef struct _CALLPROC #define CSF_CACHEDSMICON 0x0040 #define CSF_WIN40COMPAT 0x0080 -typedef struct _WINDOWCLASS +typedef struct _CLS { - struct _WINDOWCLASS *pclsNext; + struct _CLS *pclsNext; RTL_ATOM atomClassName; ATOM atomNVClassName; DWORD fnid; // New ClassId @@ -119,8 +119,8 @@ typedef struct _WINDOWCLASS PSTR lpszClientAnsiMenuName; PWSTR lpszClientUnicodeMenuName; PCALLPROC spcpdFirst; - struct _WINDOWCLASS *pclsBase; - struct _WINDOWCLASS *pclsClone; + struct _CLS *pclsBase; + struct _CLS *pclsClone; ULONG cWndReferenceCount; UINT style; WNDPROC lpfnWndProc; @@ -145,7 +145,7 @@ typedef struct _WINDOWCLASS UINT Global : 1; // CS_GLOBALCLASS UINT MenuNameIsString : 1; UINT NotUsed : 27; -} WINDOWCLASS, *PWINDOWCLASS; +} CLS, *PCLS; // State Flags !Not Implemented! @@ -239,7 +239,7 @@ typedef struct _WINDOWCLASS #define WS_EX2_CONSOLEWINDOW 0X00000400 #define WS_EX2_CHILDNOACTIVATE 0X00000800 -typedef struct _WINDOW +typedef struct _WND { USER_OBJHDR hdr; /* FIXME: Move out of the structure once new handle manager is implemented */ /* NOTE: This structure is located in the desktop heap and will @@ -259,11 +259,11 @@ typedef struct _WINDOW /* Handle of the module that created the window. */ HINSTANCE hModule; DWORD fnid; - struct _WINDOW *spwndNext; - struct _WINDOW *spwndPrev; - struct _WINDOW *spwndParent; - struct _WINDOW *spwndChild; - struct _WINDOW *spwndOwner; + struct _WND *spwndNext; + struct _WND *spwndPrev; + struct _WND *spwndParent; + struct _WND *spwndChild; + struct _WND *spwndOwner; RECT rcWindow; RECT rcClient; WNDPROC lpfnWndProc; @@ -276,7 +276,7 @@ typedef struct _WINDOW }; /* Pointer to the window class. */ - PWINDOWCLASS pcls; + PCLS pcls; HRGN hrgnUpdate; /* Property list head.*/ LIST_ENTRY PropListHead; @@ -291,12 +291,12 @@ typedef struct _WINDOW /* Size of the extra data associated with the window. */ ULONG cbwndExtra; HWND hWndLastActive; - struct _WINDOW *spwndLastActive; + struct _WND *spwndLastActive; //HIMC hImc; // Input context associated with this window. LONG dwUserData; //PACTIVATION_CONTEXT pActCtx; //PD3DMATRIX pTransForm; - struct _WINDOW *spwndClipboardListener; + struct _WND *spwndClipboardListener; DWORD ExStyle2; struct @@ -312,7 +312,7 @@ typedef struct _WINDOW UINT InternalPosInitialized : 1; UINT HideFocus : 1; // WS_EX_UISTATEFOCUSRECTHIDDEN ? UINT HideAccel : 1; // WS_EX_UISTATEKBACCELHIDDEN ? -} WINDOW, *PWINDOW; +} WND, *PWND; typedef struct _PFNCLIENT { diff --git a/reactos/subsystems/win32/win32k/include/class.h b/reactos/subsystems/win32/win32k/include/class.h index 8cb81d3039b..cb80a826d24 100644 --- a/reactos/subsystems/win32/win32k/include/class.h +++ b/reactos/subsystems/win32/win32k/include/class.h @@ -44,13 +44,13 @@ UserGetCallProcInfo(IN HANDLE hCallProc, void FASTCALL DestroyProcessClasses(PW32PROCESS Process ); -PWINDOWCLASS -IntReferenceClass(IN OUT PWINDOWCLASS BaseClass, - IN OUT PWINDOWCLASS *ClassLink, +PCLS +IntReferenceClass(IN OUT PCLS BaseClass, + IN OUT PCLS *ClassLink, IN PDESKTOP Desktop); VOID -IntDereferenceClass(IN OUT PWINDOWCLASS Class, +IntDereferenceClass(IN OUT PCLS Class, IN PDESKTOPINFO Desktop, IN PPROCESSINFO pi); @@ -66,7 +66,7 @@ UserUnregisterClass(IN PUNICODE_STRING ClassName, IN HINSTANCE hInstance); ULONG_PTR -UserGetClassLongPtr(IN PWINDOWCLASS Class, +UserGetClassLongPtr(IN PCLS Class, IN INT Index, IN BOOL Ansi); @@ -74,10 +74,10 @@ RTL_ATOM IntGetClassAtom(IN PUNICODE_STRING ClassName, IN HINSTANCE hInstance OPTIONAL, IN PPROCESSINFO pi OPTIONAL, - OUT PWINDOWCLASS *BaseClass OPTIONAL, - OUT PWINDOWCLASS **Link OPTIONAL); + OUT PCLS *BaseClass OPTIONAL, + OUT PCLS **Link OPTIONAL); -PWINDOWCLASS +PCLS FASTCALL IntCreateClass(IN CONST WNDCLASSEXW* lpwcx, IN PUNICODE_STRING ClassName, @@ -88,7 +88,7 @@ IntCreateClass(IN CONST WNDCLASSEXW* lpwcx, IN PPROCESSINFO pi); PCALLPROC -UserFindCallProc(IN PWINDOWCLASS Class, +UserFindCallProc(IN PCLS Class, IN WNDPROC WndProc, IN BOOL bUnicode); @@ -97,7 +97,7 @@ UserRegisterSystemClasses(IN ULONG Count, IN PREGISTER_SYSCLASS SystemClasses); VOID -UserAddCallProcToClass(IN OUT PWINDOWCLASS Class, +UserAddCallProcToClass(IN OUT PCLS Class, IN PCALLPROC CallProc); BOOL diff --git a/reactos/subsystems/win32/win32k/include/desktop.h b/reactos/subsystems/win32/win32k/include/desktop.h index 4fc68234e4a..6eb6ba78ea0 100644 --- a/reactos/subsystems/win32/win32k/include/desktop.h +++ b/reactos/subsystems/win32/win32k/include/desktop.h @@ -28,12 +28,12 @@ typedef struct _DESKTOP PWIN32HEAP pheapDesktop; PSECTION_OBJECT DesktopHeapSection; PDESKTOPINFO DesktopInfo; - PWINDOW spwndMessage; + PWND spwndMessage; } DESKTOP, *PDESKTOP; extern PDESKTOP InputDesktop; extern HDESK InputDesktopHandle; -extern PWINDOWCLASS DesktopWindowClass; +extern PCLS DesktopWindowClass; extern HDC ScreenDeviceContext; extern BOOL g_PaintDesktopVersion; diff --git a/reactos/subsystems/win32/win32k/include/win32.h b/reactos/subsystems/win32/win32k/include/win32.h index 6fbc05f0277..12f53802686 100644 --- a/reactos/subsystems/win32/win32k/include/win32.h +++ b/reactos/subsystems/win32/win32k/include/win32.h @@ -101,9 +101,9 @@ typedef struct _PROCESSINFO W32PROCESS XzyxW32Process; /* Place holder. */ /* ReactOS */ HINSTANCE hModUser; - PWINDOWCLASS LocalClassList; - PWINDOWCLASS GlobalClassList; - PWINDOWCLASS SystemClassList; + PCLS LocalClassList; + PCLS GlobalClassList; + PCLS SystemClassList; UINT RegisteredSysClasses : 1; diff --git a/reactos/subsystems/win32/win32k/include/window.h b/reactos/subsystems/win32/win32k/include/window.h index 9c9a97a02e5..239103714ac 100644 --- a/reactos/subsystems/win32/win32k/include/window.h +++ b/reactos/subsystems/win32/win32k/include/window.h @@ -15,7 +15,7 @@ typedef struct _WINDOW_OBJECT *PWINDOW_OBJECT; extern ATOM AtomMessage; -BOOL FASTCALL UserUpdateUiState(PWINDOW Wnd, WPARAM wParam); +BOOL FASTCALL UserUpdateUiState(PWND Wnd, WPARAM wParam); typedef struct _WINDOW_OBJECT { @@ -23,7 +23,7 @@ typedef struct _WINDOW_OBJECT is a pointer to the WINDOW structure that eventually replaces the WINDOW_OBJECT structure! USER32 expects this pointer to be here until WINDOW_OBJECT has completely been superseded! */ - PWINDOW Wnd; + PWND Wnd; /* Pointer to the thread information */ PW32THREADINFO ti; @@ -171,7 +171,7 @@ IntDefWindowProc( PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam, VOID FASTCALL IntNotifyWinEvent(DWORD, HWND, LONG, LONG); -PWINDOW APIENTRY co_IntCreateWindowEx(DWORD,PUNICODE_STRING,PUNICODE_STRING,DWORD,LONG,LONG,LONG,LONG,HWND,HMENU,HINSTANCE,LPVOID,DWORD,BOOL); +PWND APIENTRY co_IntCreateWindowEx(DWORD,PUNICODE_STRING,PUNICODE_STRING,DWORD,LONG,LONG,LONG,LONG,HWND,HMENU,HINSTANCE,LPVOID,DWORD,BOOL); #endif /* _WIN32K_WINDOW_H */ /* EOF */ diff --git a/reactos/subsystems/win32/win32k/ntuser/class.c b/reactos/subsystems/win32/win32k/ntuser/class.c index 51a3c7f0baa..d1a9d7d8f5d 100644 --- a/reactos/subsystems/win32/win32k/ntuser/class.c +++ b/reactos/subsystems/win32/win32k/ntuser/class.c @@ -75,7 +75,7 @@ LockupFnIdToiCls(int FnId, int *iCls ) /* WINDOWCLASS ***************************************************************/ static VOID -IntFreeClassMenuName(IN OUT PWINDOWCLASS Class) +IntFreeClassMenuName(IN OUT PCLS Class) { /* free the menu name, if it was changed and allocated */ if (Class->MenuName != NULL && Class->MenuNameIsString) @@ -87,7 +87,7 @@ IntFreeClassMenuName(IN OUT PWINDOWCLASS Class) } static VOID -IntDestroyClass(IN OUT PWINDOWCLASS Class) +IntDestroyClass(IN OUT PCLS Class) { /* there shouldn't be any clones anymore */ ASSERT(Class->cWndReferenceCount == 0); @@ -135,7 +135,7 @@ IntDestroyClass(IN OUT PWINDOWCLASS Class) /* clean all process classes. all process windows must cleaned first!! */ void FASTCALL DestroyProcessClasses(PW32PROCESS Process ) { - PWINDOWCLASS Class; + PCLS Class; PPROCESSINFO pi = (PPROCESSINFO)Process; if (pi != NULL) @@ -239,7 +239,7 @@ IntDeregisterClassAtom(IN RTL_ATOM Atom) } PCALLPROC -UserFindCallProc(IN PWINDOWCLASS Class, +UserFindCallProc(IN PCLS Class, IN WNDPROC WndProc, IN BOOL bUnicode) { @@ -261,10 +261,10 @@ UserFindCallProc(IN PWINDOWCLASS Class, } VOID -UserAddCallProcToClass(IN OUT PWINDOWCLASS Class, +UserAddCallProcToClass(IN OUT PCLS Class, IN PCALLPROC CallProc) { - PWINDOWCLASS BaseClass; + PCLS BaseClass; ASSERT(CallProc->Next == NULL); @@ -283,7 +283,7 @@ UserAddCallProcToClass(IN OUT PWINDOWCLASS Class, } static BOOL -IntSetClassAtom(IN OUT PWINDOWCLASS Class, +IntSetClassAtom(IN OUT PCLS Class, IN PUNICODE_STRING ClassName) { RTL_ATOM Atom = (RTL_ATOM)0; @@ -314,7 +314,7 @@ IntSetClassAtom(IN OUT PWINDOWCLASS Class, } static WNDPROC -IntGetClassWndProc(IN PWINDOWCLASS Class, +IntGetClassWndProc(IN PCLS Class, IN PPROCESSINFO pi, IN BOOL Ansi) { @@ -332,7 +332,7 @@ IntGetClassWndProc(IN PWINDOWCLASS Class, } else { - PWINDOWCLASS BaseClass; + PCLS BaseClass; /* make sure the call procedures are located on the desktop of the base class! */ @@ -387,7 +387,7 @@ IntGetClassWndProc(IN PWINDOWCLASS Class, } static WNDPROC -IntSetClassWndProc(IN OUT PWINDOWCLASS Class, +IntSetClassWndProc(IN OUT PCLS Class, IN WNDPROC WndProc, IN BOOL Ansi) { @@ -441,13 +441,13 @@ IntSetClassWndProc(IN OUT PWINDOWCLASS Class, return Ret; } -static PWINDOWCLASS -IntGetClassForDesktop(IN OUT PWINDOWCLASS BaseClass, - IN OUT PWINDOWCLASS *ClassLink, +static PCLS +IntGetClassForDesktop(IN OUT PCLS BaseClass, + IN OUT PCLS *ClassLink, IN PDESKTOP Desktop) { SIZE_T ClassSize; - PWINDOWCLASS Class; + PCLS Class; ASSERT(Desktop != NULL); ASSERT(BaseClass->pclsBase == BaseClass); @@ -548,12 +548,12 @@ IntGetClassForDesktop(IN OUT PWINDOWCLASS BaseClass, return Class; } -PWINDOWCLASS -IntReferenceClass(IN OUT PWINDOWCLASS BaseClass, - IN OUT PWINDOWCLASS *ClassLink, +PCLS +IntReferenceClass(IN OUT PCLS BaseClass, + IN OUT PCLS *ClassLink, IN PDESKTOP Desktop) { - PWINDOWCLASS Class; + PCLS Class; ASSERT(BaseClass->pclsBase == BaseClass); @@ -569,11 +569,11 @@ IntReferenceClass(IN OUT PWINDOWCLASS BaseClass, } static VOID -IntMakeCloneBaseClass(IN OUT PWINDOWCLASS Class, - IN OUT PWINDOWCLASS *BaseClassLink, - IN OUT PWINDOWCLASS *CloneLink) +IntMakeCloneBaseClass(IN OUT PCLS Class, + IN OUT PCLS *BaseClassLink, + IN OUT PCLS *CloneLink) { - PWINDOWCLASS Clone, BaseClass; + PCLS Clone, BaseClass; ASSERT(Class->pclsBase != Class); ASSERT(Class->pclsBase->pclsClone != NULL); @@ -611,11 +611,11 @@ IntMakeCloneBaseClass(IN OUT PWINDOWCLASS Class, } VOID -IntDereferenceClass(IN OUT PWINDOWCLASS Class, +IntDereferenceClass(IN OUT PCLS Class, IN PDESKTOPINFO Desktop, IN PPROCESSINFO pi) { - PWINDOWCLASS *PrevLink, BaseClass, CurrentClass; + PCLS *PrevLink, BaseClass, CurrentClass; BaseClass = Class->pclsBase; @@ -690,10 +690,10 @@ IntDereferenceClass(IN OUT PWINDOWCLASS Class, } static BOOL -IntMoveClassToSharedHeap(IN OUT PWINDOWCLASS Class, - IN OUT PWINDOWCLASS **ClassLinkPtr) +IntMoveClassToSharedHeap(IN OUT PCLS Class, + IN OUT PCLS **ClassLinkPtr) { - PWINDOWCLASS NewClass; + PCLS NewClass; SIZE_T ClassSize; ASSERT(Class->pclsBase == Class); @@ -730,11 +730,11 @@ IntMoveClassToSharedHeap(IN OUT PWINDOWCLASS Class, static VOID IntCheckDesktopClasses(IN PDESKTOP Desktop, - IN OUT PWINDOWCLASS *ClassList, + IN OUT PCLS *ClassList, IN BOOL FreeOnFailure, OUT BOOL *Ret) { - PWINDOWCLASS Class, NextClass, *Link; + PCLS Class, NextClass, *Link; /* NOTE: We only need to check base classes! When classes are no longer needed on a desktop, the clones will be freed automatically as soon as possible. @@ -835,7 +835,7 @@ IntCheckProcessDesktopClasses(IN PDESKTOP Desktop, return Ret; } -PWINDOWCLASS +PCLS FASTCALL IntCreateClass(IN CONST WNDCLASSEXW* lpwcx, IN PUNICODE_STRING ClassName, @@ -846,7 +846,7 @@ IntCreateClass(IN CONST WNDCLASSEXW* lpwcx, IN PPROCESSINFO pi) { SIZE_T ClassSize; - PWINDOWCLASS Class = NULL; + PCLS Class = NULL; RTL_ATOM Atom; PWSTR pszMenuName = NULL; NTSTATUS Status = STATUS_SUCCESS; @@ -998,13 +998,13 @@ NoMem: return Class; } -static PWINDOWCLASS +static PCLS IntFindClass(IN RTL_ATOM Atom, IN HINSTANCE hInstance, - IN PWINDOWCLASS *ClassList, - OUT PWINDOWCLASS **Link OPTIONAL) + IN PCLS *ClassList, + OUT PCLS **Link OPTIONAL) { - PWINDOWCLASS Class, *PrevLink = ClassList; + PCLS Class, *PrevLink = ClassList; Class = *PrevLink; while (Class != NULL) @@ -1097,8 +1097,8 @@ RTL_ATOM IntGetClassAtom(IN PUNICODE_STRING ClassName, IN HINSTANCE hInstance OPTIONAL, IN PPROCESSINFO pi OPTIONAL, - OUT PWINDOWCLASS *BaseClass OPTIONAL, - OUT PWINDOWCLASS **Link OPTIONAL) + OUT PCLS *BaseClass OPTIONAL, + OUT PCLS **Link OPTIONAL) { RTL_ATOM Atom = (RTL_ATOM)0; @@ -1108,7 +1108,7 @@ IntGetClassAtom(IN PUNICODE_STRING ClassName, &Atom) && Atom != (RTL_ATOM)0) { - PWINDOWCLASS Class; + PCLS Class; /* attempt to locate the class object */ @@ -1183,7 +1183,7 @@ UserRegisterClass(IN CONST WNDCLASSEXW* lpwcx, PTHREADINFO pti; PW32THREADINFO ti; PPROCESSINFO pi; - PWINDOWCLASS Class; + PCLS Class; RTL_ATOM ClassAtom; RTL_ATOM Ret = (RTL_ATOM)0; @@ -1236,7 +1236,7 @@ UserRegisterClass(IN CONST WNDCLASSEXW* lpwcx, if (Class != NULL) { - PWINDOWCLASS *List; + PCLS *List; /* Register the class */ if (Class->System) @@ -1260,10 +1260,10 @@ BOOL UserUnregisterClass(IN PUNICODE_STRING ClassName, IN HINSTANCE hInstance) { - PWINDOWCLASS *Link; + PCLS *Link; PPROCESSINFO pi; RTL_ATOM ClassAtom; - PWINDOWCLASS Class; + PCLS Class; pi = GetW32ProcessInfo(); if (pi == NULL) @@ -1310,7 +1310,7 @@ UserUnregisterClass(IN PUNICODE_STRING ClassName, } INT -UserGetClassName(IN PWINDOWCLASS Class, +UserGetClassName(IN PCLS Class, IN OUT PUNICODE_STRING ClassName, IN BOOL Ansi) { @@ -1428,7 +1428,7 @@ UserGetClassName(IN PWINDOWCLASS Class, } ULONG_PTR -UserGetClassLongPtr(IN PWINDOWCLASS Class, +UserGetClassLongPtr(IN PCLS Class, IN INT Index, IN BOOL Ansi) { @@ -1520,7 +1520,7 @@ UserGetClassLongPtr(IN PWINDOWCLASS Class, } static BOOL -IntSetClassMenuName(IN PWINDOWCLASS Class, +IntSetClassMenuName(IN PCLS Class, IN PUNICODE_STRING MenuName) { BOOL Ret = FALSE; @@ -1624,7 +1624,7 @@ IntSetClassMenuName(IN PWINDOWCLASS Class, } ULONG_PTR -UserSetClassLongPtr(IN PWINDOWCLASS Class, +UserSetClassLongPtr(IN PCLS Class, IN INT Index, IN ULONG_PTR NewLong, IN BOOL Ansi) @@ -1816,7 +1816,7 @@ UserSetClassLongPtr(IN PWINDOWCLASS Class, } static BOOL -UserGetClassInfo(IN PWINDOWCLASS Class, +UserGetClassInfo(IN PCLS Class, OUT PWNDCLASSEXW lpwcx, IN BOOL Ansi, HINSTANCE hInstance) @@ -1862,7 +1862,7 @@ UserRegisterSystemClasses(IN ULONG Count, UNICODE_STRING ClassName, MenuName; PPROCESSINFO pi = GetW32ProcessInfo(); WNDCLASSEXW wc; - PWINDOWCLASS Class; + PCLS Class; BOOL Ret = TRUE; if (pi->RegisteredSysClasses || pi->hModUser == NULL) @@ -1992,7 +1992,7 @@ NtUserRegisterClassExWOW( CapturedClassInfo.cbClsExtra + CapturedName.Length + CapturedMenuName.Length + - sizeof(WINDOWCLASS) < CapturedClassInfo.cbClsExtra || + sizeof(CLS) < CapturedClassInfo.cbClsExtra || CapturedClassInfo.cbWndExtra < 0 || CapturedClassInfo.hInstance == NULL) { @@ -2231,7 +2231,7 @@ NtUserGetClassInfo( BOOL Ansi) { UNICODE_STRING CapturedClassName; - PWINDOWCLASS Class; + PCLS Class; RTL_ATOM ClassAtom; PPROCESSINFO pi; BOOL Ret = FALSE; diff --git a/reactos/subsystems/win32/win32k/ntuser/defwnd.c b/reactos/subsystems/win32/win32k/ntuser/defwnd.c index 5f6412ae1a5..edb03f1c1ed 100644 --- a/reactos/subsystems/win32/win32k/ntuser/defwnd.c +++ b/reactos/subsystems/win32/win32k/ntuser/defwnd.c @@ -108,7 +108,7 @@ IntDefWindowProc( LPARAM lParam, BOOL Ansi) { - PWINDOW Wnd; + PWND Wnd; LRESULT lResult = 0; if (Msg > WM_USER) return 0; diff --git a/reactos/subsystems/win32/win32k/ntuser/desktop.c b/reactos/subsystems/win32/win32k/ntuser/desktop.c index 074b85a9b41..af5c0cff38d 100644 --- a/reactos/subsystems/win32/win32k/ntuser/desktop.c +++ b/reactos/subsystems/win32/win32k/ntuser/desktop.c @@ -686,7 +686,7 @@ IntHideDesktop(PDESKTOP Desktop) #else PWINDOW_OBJECT DesktopWindow; - PWINDOW DesktopWnd; + PWND DesktopWnd; DesktopWindow = IntGetWindowObject(Desktop->DesktopWindow); if (! DesktopWindow) @@ -914,8 +914,8 @@ NtUserCreateDesktop( UNICODE_STRING ClassName, WindowName, MenuName; PPROCESSINFO pi = GetW32ProcessInfo(); WNDCLASSEXW wc; - PWINDOWCLASS Class; - PWINDOW pWnd; + PCLS Class; + PWND pWnd; DECLARE_RETURN(HDESK); DPRINT("Enter NtUserCreateDesktop: %wZ\n", lpszDesktopName); diff --git a/reactos/subsystems/win32/win32k/ntuser/focus.c b/reactos/subsystems/win32/win32k/ntuser/focus.c index 9ae300d740b..5b205a77ee9 100644 --- a/reactos/subsystems/win32/win32k/ntuser/focus.c +++ b/reactos/subsystems/win32/win32k/ntuser/focus.c @@ -196,7 +196,7 @@ co_IntSetForegroundAndFocusWindow(PWINDOW_OBJECT Window, PWINDOW_OBJECT FocusWin HWND hWndFocus = FocusWindow->hSelf; HWND hWndFocusPrev = NULL; PUSER_MESSAGE_QUEUE PrevForegroundQueue; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); @@ -273,7 +273,7 @@ co_IntMouseActivateWindow(PWINDOW_OBJECT Window) HWND Top; PWINDOW_OBJECT TopWindow; USER_REFERENCE_ENTRY Ref; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); @@ -319,7 +319,7 @@ co_IntSetActiveWindow(PWINDOW_OBJECT Window OPTIONAL) PUSER_MESSAGE_QUEUE ThreadQueue; HWND hWndPrev; HWND hWnd = 0; - PWINDOW Wnd; + PWND Wnd; CBTACTIVATESTRUCT cbt; if (Window) @@ -577,7 +577,7 @@ HWND FASTCALL co_UserSetFocus(PWINDOW_OBJECT Window OPTIONAL) HWND hWndPrev; PWINDOW_OBJECT TopWnd; USER_REFERENCE_ENTRY Ref; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); diff --git a/reactos/subsystems/win32/win32k/ntuser/painting.c b/reactos/subsystems/win32/win32k/ntuser/painting.c index f7db9df27cd..934b32fcf8a 100644 --- a/reactos/subsystems/win32/win32k/ntuser/painting.c +++ b/reactos/subsystems/win32/win32k/ntuser/painting.c @@ -58,7 +58,7 @@ BOOL FASTCALL IntIntersectWithParents(PWINDOW_OBJECT Child, RECTL *WindowRect) { PWINDOW_OBJECT ParentWindow; - PWINDOW ParentWnd; + PWND ParentWnd; ParentWindow = Child->Parent; while (ParentWindow != NULL) @@ -87,7 +87,7 @@ BOOL FASTCALL IntValidateParent(PWINDOW_OBJECT Child, HRGN hValidateRgn, BOOL Recurse) { PWINDOW_OBJECT ParentWindow = Child->Parent; - PWINDOW ParentWnd; + PWND ParentWnd; while (ParentWindow) { @@ -119,7 +119,7 @@ IntValidateParent(PWINDOW_OBJECT Child, HRGN hValidateRgn, BOOL Recurse) HRGN FASTCALL IntCalcWindowRgn(PWINDOW_OBJECT Window, BOOL Client) { - PWINDOW Wnd; + PWND Wnd; HRGN hRgnWindow; UINT RgnType; @@ -241,7 +241,7 @@ co_IntPaintWindows(PWINDOW_OBJECT Window, ULONG Flags, BOOL Recurse) HDC hDC; HWND hWnd = Window->hSelf; HRGN TempRegion; - PWINDOW Wnd; + PWND Wnd; Wnd = Window->Wnd; @@ -339,7 +339,7 @@ VOID FASTCALL IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags) { INT RgnType; - PWINDOW Wnd; + PWND Wnd; BOOL HadPaintMessage, HadNCPaintMessage; BOOL HasPaintMessage, HasNCPaintMessage; @@ -511,7 +511,7 @@ BOOL FASTCALL IntIsWindowDrawable(PWINDOW_OBJECT Window) { PWINDOW_OBJECT WndObject; - PWINDOW Wnd; + PWND Wnd; for (WndObject = Window; WndObject != NULL; WndObject = WndObject->Parent) { @@ -628,7 +628,7 @@ co_UserRedrawWindow(PWINDOW_OBJECT Window, const RECTL* UpdateRect, HRGN UpdateR BOOL FASTCALL IntIsWindowDirty(PWINDOW_OBJECT Window) { - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; return (Wnd->style & WS_VISIBLE) && ((Window->UpdateRegion != NULL) || (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) || @@ -640,7 +640,7 @@ IntFindWindowToRepaint(PWINDOW_OBJECT Window, PTHREADINFO Thread) { HWND hChild; PWINDOW_OBJECT TempWindow; - PWINDOW Wnd, TempWnd; + PWND Wnd, TempWnd; for (; Window != NULL; Window = Window->NextSibling) { @@ -773,7 +773,7 @@ NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* UnsafePs) NTSTATUS Status; DECLARE_RETURN(HDC); USER_REFERENCE_ENTRY Ref; - PWINDOW Wnd; + PWND Wnd; DPRINT("Enter NtUserBeginPaint\n"); UserEnterExclusive(); @@ -1623,7 +1623,7 @@ BOOL UserDrawCaption( RECTL r = *lpRc; LONG ButtonWidth, IconWidth; BOOL HasIcon; - PWINDOW Wnd = NULL; + PWND Wnd = NULL; //ASSERT(pWnd != NULL); diff --git a/reactos/subsystems/win32/win32k/ntuser/scrollbar.c b/reactos/subsystems/win32/win32k/ntuser/scrollbar.c index 27a959e001c..861b9588607 100644 --- a/reactos/subsystems/win32/win32k/ntuser/scrollbar.c +++ b/reactos/subsystems/win32/win32k/ntuser/scrollbar.c @@ -60,7 +60,7 @@ BOOL FASTCALL IntGetScrollBarRect (PWINDOW_OBJECT Window, INT nBar, RECTL *lprect) { BOOL vertical; - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; RECTL ClientRect = Window->Wnd->rcClient; RECTL WindowRect = Window->Wnd->rcWindow; @@ -105,7 +105,7 @@ IntGetScrollBarRect (PWINDOW_OBJECT Window, INT nBar, RECTL *lprect) BOOL FASTCALL IntCalculateThumb(PWINDOW_OBJECT Window, LONG idObject, PSCROLLBARINFO psbi, LPSCROLLINFO psi) { - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; INT Thumb, ThumbBox, ThumbPos, cxy, mx; RECTL ClientRect; @@ -829,7 +829,7 @@ DWORD FASTCALL co_UserShowScrollBar(PWINDOW_OBJECT Window, int wBar, DWORD bShow) { DWORD Style, OldStyle; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); diff --git a/reactos/subsystems/win32/win32k/ntuser/simplecall.c b/reactos/subsystems/win32/win32k/ntuser/simplecall.c index 2dd323b0d31..e53af547cfa 100644 --- a/reactos/subsystems/win32/win32k/ntuser/simplecall.c +++ b/reactos/subsystems/win32/win32k/ntuser/simplecall.c @@ -646,7 +646,7 @@ NtUserCallHwndLock( { BOOL Ret = 0; PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; USER_REFERENCE_ENTRY Ref; DECLARE_RETURN(BOOLEAN); diff --git a/reactos/subsystems/win32/win32k/ntuser/vis.c b/reactos/subsystems/win32/win32k/ntuser/vis.c index c7ef75fba04..810eef9e0bc 100644 --- a/reactos/subsystems/win32/win32k/ntuser/vis.c +++ b/reactos/subsystems/win32/win32k/ntuser/vis.c @@ -39,7 +39,7 @@ VIS_ComputeVisibleRegion( { HRGN VisRgn, ClipRgn; PWINDOW_OBJECT PreviousWindow, CurrentWindow, CurrentSibling; - PWINDOW Wnd, CurrentWnd, PreviousWnd, CurrentSiblingWnd; + PWND Wnd, CurrentWnd, PreviousWnd, CurrentSiblingWnd; Wnd = Window->Wnd; @@ -151,7 +151,7 @@ co_VIS_WindowLayoutChanged( HRGN Temp; PWINDOW_OBJECT Parent; USER_REFERENCE_ENTRY Ref; - PWINDOW Wnd, ParentWnd; + PWND Wnd, ParentWnd; ASSERT_REFS_CO(Window); diff --git a/reactos/subsystems/win32/win32k/ntuser/windc.c b/reactos/subsystems/win32/win32k/ntuser/windc.c index 25b4ef0081e..a416077a264 100644 --- a/reactos/subsystems/win32/win32k/ntuser/windc.c +++ b/reactos/subsystems/win32/win32k/ntuser/windc.c @@ -73,7 +73,7 @@ PDCE FASTCALL DceAllocDCE(PWINDOW_OBJECT Window OPTIONAL, DCE_TYPE Type) { PDCE pDce; - PWINDOW Wnd = NULL; + PWND Wnd = NULL; if (Window) Wnd = Window->Wnd; @@ -137,7 +137,7 @@ static VOID APIENTRY DceSetDrawable(PWINDOW_OBJECT Window OPTIONAL, HDC hDC, ULONG Flags, BOOL SetClipOrigin) { - PWINDOW Wnd; + PWND Wnd; DC *dc = DC_LockDc(hDC); if(!dc) return; @@ -240,7 +240,7 @@ DceUpdateVisRgn(DCE *Dce, PWINDOW_OBJECT Window, ULONG Flags) if (Flags & DCX_PARENTCLIP) { PWINDOW_OBJECT Parent; - PWINDOW ParentWnd; + PWND ParentWnd; Parent = Window->Parent; if(!Parent) @@ -323,7 +323,7 @@ UserGetDCEx(PWINDOW_OBJECT Window OPTIONAL, HANDLE ClipRegion, ULONG Flags) DCE* Dce = NULL; BOOL UpdateVisRgn = TRUE; BOOL UpdateClipOrigin = FALSE; - PWINDOW Wnd = NULL; + PWND Wnd = NULL; HDC hDC = NULL; if (NULL == Window) diff --git a/reactos/subsystems/win32/win32k/ntuser/window.c b/reactos/subsystems/win32/win32k/ntuser/window.c index 0bb225a22f2..ca26bead11d 100644 --- a/reactos/subsystems/win32/win32k/ntuser/window.c +++ b/reactos/subsystems/win32/win32k/ntuser/window.c @@ -49,7 +49,7 @@ CleanupWindowImpl(VOID) /* HELPER FUNCTIONS ***********************************************************/ -BOOL FASTCALL UserUpdateUiState(PWINDOW Wnd, WPARAM wParam) +BOOL FASTCALL UserUpdateUiState(PWND Wnd, WPARAM wParam) { WORD Action = LOWORD(wParam); WORD Flags = HIWORD(wParam); @@ -317,7 +317,7 @@ static VOID UserFreeWindowInfo(PW32THREADINFO ti, PWINDOW_OBJECT WindowObject) { PCLIENTINFO ClientInfo = GetWin32ClientInfo(); - PWINDOW Wnd = WindowObject->Wnd; + PWND Wnd = WindowObject->Wnd; if (ClientInfo->CallbackWnd.pvWnd == DesktopHeapAddressToUser(WindowObject->Wnd)) { @@ -357,7 +357,7 @@ static LRESULT co_UserFreeWindow(PWINDOW_OBJECT Window, PWINDOW_OBJECT Child; PMENU_OBJECT Menu; BOOLEAN BelongsToThreadData; - PWINDOW Wnd; + PWND Wnd; ASSERT(Window); @@ -509,7 +509,7 @@ static LRESULT co_UserFreeWindow(PWINDOW_OBJECT Window, VOID FASTCALL IntGetWindowBorderMeasures(PWINDOW_OBJECT Window, UINT *cx, UINT *cy) { - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; if(HAS_DLGFRAME(Wnd->style, Wnd->ExStyle) && !(Wnd->style & WS_MINIMIZE)) { *cx = UserGetSystemMetrics(SM_CXDLGFRAME); @@ -538,7 +538,7 @@ static WNDPROC IntGetWindowProc(IN PWINDOW_OBJECT Window, IN BOOL Ansi) { - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; ASSERT(UserIsEnteredExclusive() == TRUE); @@ -595,7 +595,7 @@ IntGetWindowProc(IN PWINDOW_OBJECT Window, BOOL FASTCALL IntGetWindowInfo(PWINDOW_OBJECT Window, PWINDOWINFO pwi) { - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; pwi->cbSize = sizeof(WINDOWINFO); pwi->rcWindow = Window->Wnd->rcWindow; @@ -616,7 +616,7 @@ IntSetMenu( BOOL *Changed) { PMENU_OBJECT OldMenu, NewMenu = NULL; - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; if ((Wnd->style & (WS_CHILD | WS_POPUP)) == WS_CHILD) { @@ -870,7 +870,7 @@ BOOL FASTCALL IntIsChildWindow(PWINDOW_OBJECT Parent, PWINDOW_OBJECT BaseWindow) { PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; Window = BaseWindow; while (Window) @@ -895,7 +895,7 @@ BOOL FASTCALL IntIsWindowVisible(PWINDOW_OBJECT BaseWindow) { PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; Window = BaseWindow; while(Window) @@ -1179,7 +1179,7 @@ BOOL FASTCALL IntGetWindowPlacement(PWINDOW_OBJECT Window, WINDOWPLACEMENT *lpwndpl) { - PWINDOW Wnd; + PWND Wnd; POINT Size; Wnd = Window->Wnd; @@ -1438,7 +1438,7 @@ NtUserChildWindowFromPointEx(HWND hwndParent, for(phWnd = List; *phWnd; phWnd++) { PWINDOW_OBJECT Child; - PWINDOW ChildWnd; + PWND ChildWnd; if((Child = UserGetWindowObject(*phWnd))) { ChildWnd = Child->Wnd; @@ -1518,7 +1518,7 @@ IntCalcDefPosSize(PWINDOW_OBJECT Parent, PWINDOW_OBJECT Window, RECTL *rc, BOOL /* * @implemented */ -PWINDOW APIENTRY +PWND APIENTRY co_IntCreateWindowEx(DWORD dwExStyle, PUNICODE_STRING ClassName, PUNICODE_STRING WindowName, @@ -1535,8 +1535,8 @@ co_IntCreateWindowEx(DWORD dwExStyle, BOOL bUnicodeWindow) { PWINSTATION_OBJECT WinSta; - PWINDOW Wnd = NULL; - PWINDOWCLASS *ClassLink, Class = NULL; + PWND Wnd = NULL; + PCLS *ClassLink, Class = NULL; RTL_ATOM ClassAtom; PWINDOW_OBJECT Window = NULL; PWINDOW_OBJECT ParentWindow = NULL, OwnerWindow; @@ -1558,7 +1558,7 @@ co_IntCreateWindowEx(DWORD dwExStyle, CBT_CREATEWNDW CbtCreate; LRESULT Result; BOOL MenuChanged; - DECLARE_RETURN(PWINDOW); + DECLARE_RETURN(PWND); BOOL HasOwner; USER_REFERENCE_ENTRY ParentRef, Ref; PTHREADINFO pti; @@ -1595,7 +1595,7 @@ co_IntCreateWindowEx(DWORD dwExStyle, else if ((dwStyle & (WS_CHILD | WS_POPUP)) == WS_CHILD) { SetLastWin32Error(ERROR_TLW_WITH_WSCHILD); - RETURN( (PWINDOW)0); /* WS_CHILD needs a parent, but WS_POPUP doesn't */ + RETURN( (PWND)0); /* WS_CHILD needs a parent, but WS_POPUP doesn't */ } if (ParentWindowHandle) @@ -1616,7 +1616,7 @@ co_IntCreateWindowEx(DWORD dwExStyle, if (ti == NULL || pti->Desktop == NULL) { DPRINT1("Thread is not attached to a desktop! Cannot create window!\n"); - RETURN( (PWINDOW)0); + RETURN( (PWND)0); } /* Check the class. */ @@ -1639,7 +1639,7 @@ co_IntCreateWindowEx(DWORD dwExStyle, } SetLastWin32Error(ERROR_CANNOT_FIND_WND_CLASS); - RETURN((PWINDOW)0); + RETURN((PWND)0); } Class = IntReferenceClass(Class, @@ -1664,11 +1664,11 @@ co_IntCreateWindowEx(DWORD dwExStyle, if (Window) { Window->Wnd = DesktopHeapAlloc(pti->Desktop, - sizeof(WINDOW) + Class->cbwndExtra); + sizeof(WND) + Class->cbwndExtra); if (!Window->Wnd) goto AllocErr; RtlZeroMemory(Window->Wnd, - sizeof(WINDOW) + Class->cbwndExtra); + sizeof(WND) + Class->cbwndExtra); Window->Wnd->hdr.Handle = hWnd; /* FIXME: Remove hack , are you sure?*/ Wnd = Window->Wnd; @@ -1684,7 +1684,7 @@ co_IntCreateWindowEx(DWORD dwExStyle, AllocErr: ObDereferenceObject(WinSta); SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - RETURN( (PWINDOW)0); + RETURN( (PWND)0); } UserRefObjectCo(Window, &Ref); @@ -1775,7 +1775,7 @@ AllocErr: if (Wnd->strName.Buffer == NULL) { SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - RETURN( (PWINDOW)0); + RETURN( (PWND)0); } Wnd->strName.Buffer[WindowName->Length / sizeof(WCHAR)] = L'\0'; @@ -1889,7 +1889,7 @@ AllocErr: /* FIXME - Delete window object and remove it from the thread windows list */ /* FIXME - delete allocated DCE */ DPRINT1("CBT-hook returned !0\n"); - RETURN( (PWINDOW) NULL); + RETURN( (PWND) NULL); } } x = Cs.x; @@ -2056,7 +2056,7 @@ AllocErr: { /* FIXME: Cleanup. */ DPRINT1("IntCreateWindowEx(): NCCREATE message failed. No cleanup performed!\n"); - RETURN((PWINDOW)0); + RETURN((PWND)0); } /* Calculate the non-client size. */ @@ -2120,7 +2120,7 @@ AllocErr: /* FIXME: Cleanup. */ DPRINT1("IntCreateWindowEx(): send CREATE message failed. No cleanup performed!\n"); IntUnlinkWindow(Window); - RETURN((PWINDOW)0); + RETURN((PWND)0); } IntNotifyWinEvent(EVENT_OBJECT_CREATE, Window->hSelf, OBJID_WINDOW, 0); @@ -2302,7 +2302,7 @@ NtUserCreateWindowEx(DWORD dwExStyle, UNICODE_STRING WindowName; UNICODE_STRING ClassName; HWND NewWindow = NULL; - PWINDOW pNewWindow; + PWND pNewWindow; DECLARE_RETURN(HWND); DPRINT("Enter NtUserCreateWindowEx(): (%d,%d-%d,%d)\n", x, y, nWidth, nHeight); @@ -2405,7 +2405,7 @@ NtUserDeferWindowPos(HDWP WinPosInfo, BOOLEAN FASTCALL co_UserDestroyWindow(PWINDOW_OBJECT Window) { BOOLEAN isChild; - PWINDOW Wnd; + PWND Wnd; HWND hWnd; ASSERT_REFS_CO(Window); // FIXME: temp hack? @@ -3055,7 +3055,7 @@ NtUserGetInternalWindowPos( HWND hWnd, LPPOINT ptIcon) { PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; DWORD Ret = 0; BOOL Hit = FALSE; WINDOWPLACEMENT wndpl; @@ -3575,7 +3575,7 @@ LONG FASTCALL UserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi) { PWINDOW_OBJECT Window, Parent; - PWINDOW Wnd; + PWND Wnd; LONG Result = 0; DPRINT("NtUserGetWindowLong(%x,%d,%d)\n", hWnd, (INT)Index, Ansi); @@ -3694,7 +3694,7 @@ IntSetWindowProc(PWINDOW_OBJECT Window, { WNDPROC Ret; PCALLPROC CallProc; - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; /* resolve any callproc handle if possible */ if (IsCallProcHandle(NewWndProc)) @@ -3789,7 +3789,7 @@ LONG FASTCALL co_UserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) { PWINDOW_OBJECT Window, Parent; - PWINDOW Wnd; + PWND Wnd; PWINSTATION_OBJECT WindowStation; LONG OldValue; STYLESTRUCT Style; @@ -3987,7 +3987,7 @@ NtUserGetWindowPlacement(HWND hWnd, WINDOWPLACEMENT *lpwndpl) { PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; POINT Size; WINDOWPLACEMENT Safepl; NTSTATUS Status; @@ -4318,7 +4318,7 @@ NtUserSetWindowFNID(HWND hWnd, WORD fnID) { PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserSetWindowFNID\n"); @@ -4356,7 +4356,7 @@ NtUserSetWindowPlacement(HWND hWnd, WINDOWPLACEMENT *lpwndpl) { PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; WINDOWPLACEMENT Safepl; NTSTATUS Status; DECLARE_RETURN(BOOL); @@ -4472,7 +4472,7 @@ IntGetWindowRgn(PWINDOW_OBJECT Window, HRGN hRgn) INT Ret; HRGN VisRgn; ROSRGNDATA *pRgn; - PWINDOW Wnd; + PWND Wnd; if(!Window) { @@ -4513,7 +4513,7 @@ IntGetWindowRgnBox(PWINDOW_OBJECT Window, RECTL *Rect) INT Ret; HRGN VisRgn; ROSRGNDATA *pRgn; - PWINDOW Wnd; + PWND Wnd; if(!Window) { @@ -4741,7 +4741,7 @@ BOOL APIENTRY NtUserDefSetText(HWND hWnd, PLARGE_STRING WindowText) { PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; LARGE_STRING SafeText; UNICODE_STRING UnicodeString; BOOL Ret = TRUE; @@ -4877,7 +4877,7 @@ INT APIENTRY NtUserInternalGetWindowText(HWND hWnd, LPWSTR lpString, INT nMaxCount) { PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; NTSTATUS Status; INT Result; DECLARE_RETURN(INT); diff --git a/reactos/subsystems/win32/win32k/ntuser/winpos.c b/reactos/subsystems/win32/win32k/ntuser/winpos.c index 19854c00d51..0570f717650 100644 --- a/reactos/subsystems/win32/win32k/ntuser/winpos.c +++ b/reactos/subsystems/win32/win32k/ntuser/winpos.c @@ -137,7 +137,7 @@ co_WinPosActivateOtherWindow(PWINDOW_OBJECT Window) PWINDOW_OBJECT WndTo = NULL; HWND Fg; USER_REFERENCE_ENTRY Ref; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); @@ -209,7 +209,7 @@ co_WinPosArrangeIconicWindows(PWINDOW_OBJECT parent) for( i = 0; List[i]; i++) { PWINDOW_OBJECT WndChild; - PWINDOW ChildWnd; + PWND ChildWnd; if (!(WndChild = UserGetWindowObject(List[i]))) continue; @@ -252,7 +252,7 @@ WinPosInitInternalPos(PWINDOW_OBJECT Window, POINT *pt, RECTL *RestoreRect) { PWINDOW_OBJECT Parent; UINT XInc, YInc; - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; if (!Wnd->InternalPosInitialized) { @@ -299,7 +299,7 @@ co_WinPosMinMaximize(PWINDOW_OBJECT Window, UINT ShowFlag, RECT* NewPos) { POINT Size; UINT SwpFlags = 0; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); Wnd = Window->Wnd; @@ -505,7 +505,7 @@ co_WinPosDoNCCALCSize(PWINDOW_OBJECT Window, PWINDOWPOS WinPos, { PWINDOW_OBJECT Parent; UINT wvrFlags = 0; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); Wnd = Window->Wnd; @@ -584,7 +584,7 @@ co_WinPosDoWinPosChanging(PWINDOW_OBJECT Window, PRECTL ClientRect) { INT X, Y; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); Wnd = Window->Wnd; @@ -760,7 +760,7 @@ static BOOL FASTCALL WinPosFixupFlags(WINDOWPOS *WinPos, PWINDOW_OBJECT Window) { - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; if (!Wnd) return FALSE; @@ -1327,7 +1327,7 @@ co_WinPosShowWindow(PWINDOW_OBJECT Window, INT Cmd) RECTL NewPos; BOOLEAN ShowFlag; // HRGN VisibleRgn; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); Wnd = Window->Wnd; @@ -1553,7 +1553,7 @@ co_WinPosSearchChildren( ) { PWINDOW_OBJECT Current; - PWINDOW CurrentWnd; + PWND CurrentWnd; HWND *List, *phWnd; USER_REFERENCE_ENTRY Ref; @@ -1680,7 +1680,7 @@ NtUserGetMinMaxInfo( { POINT Size; PWINDOW_OBJECT Window = NULL; - PWINDOW Wnd; + PWND Wnd; MINMAXINFO SafeMinMax; NTSTATUS Status; BOOL ret;