01/02: [WIN32K] Implement NtUserSetWindowLongPtr for 64 bit builds Also fix return type of NtUserQueryWindow and type of WND::dwUserData and the value for bAnsi in SetWindowLongPtrA
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=173971d947635026d1d0ee...
commit 173971d947635026d1d0ee9cf1db7b7847ad9a36 Author: Timo Kreuzer timo.kreuzer@reactos.org AuthorDate: Fri Dec 29 10:46:19 2017 +0100 Commit: Timo Kreuzer timo.kreuzer@reactos.org CommitDate: Mon Feb 19 22:36:36 2018 +0100
[WIN32K] Implement NtUserSetWindowLongPtr for 64 bit builds Also fix return type of NtUserQueryWindow and type of WND::dwUserData and the value for bAnsi in SetWindowLongPtrA --- win32ss/include/ntuser.h | 14 +++- win32ss/user/ntuser/window.c | 134 +++++++++++++++++++++++++----------- win32ss/user/ntuser/window.h | 1 + win32ss/user/user32/windows/class.c | 4 +- win32ss/w32ksvc.h | 3 + 5 files changed, 111 insertions(+), 45 deletions(-)
diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 0195b08d8d..d3661fb779 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -702,7 +702,7 @@ typedef struct _WND ULONG cbwndExtra; struct _WND *spwndLastActive; HIMC hImc; // Input context associated with this window. - LONG dwUserData; + LONG_PTR dwUserData; PVOID pActCtx; //PD3DMATRIX pTransForm; struct _WND *spwndClipboardListener; @@ -2801,7 +2801,7 @@ NtUserQueryUserCounters( #define QUERY_WINDOW_REAL_ID 0x05 #define QUERY_WINDOW_FOREGROUND 0x06
-DWORD +DWORD_PTR NTAPI NtUserQueryWindow( HWND hWnd, @@ -3235,6 +3235,16 @@ NtUserSetWindowLong( LONG NewValue, BOOL Ansi);
+#ifdef _WIN64 +LONG_PTR +NTAPI +NtUserSetWindowLongPtr( + HWND hWnd, + DWORD Index, + LONG_PTR NewValue, + BOOL Ansi); +#endif // _WIN64 + BOOL NTAPI NtUserSetWindowPlacement( diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 9c7627cece..b52e3dcfe9 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -3566,12 +3566,12 @@ IntCheckFrameEdge(ULONG Style, ULONG ExStyle) return FALSE; }
-static LONG -co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlter) +static LONG_PTR +co_IntSetWindowLongPtr(HWND hWnd, DWORD Index, LONG_PTR NewValue, BOOL Ansi, ULONG Size, BOOL bAlter) { PWND Window, Parent; PWINSTATION_OBJECT WindowStation; - LONG OldValue; + LONG_PTR OldValue; STYLESTRUCT Style;
if (!(Window = UserGetWindowObject(hWnd))) @@ -3581,29 +3581,53 @@ co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlte
if ((INT)Index >= 0) { - if ((Index + sizeof(LONG)) > Window->cbwndExtra) + if ((Index + Size) > Window->cbwndExtra) { EngSetLastError(ERROR_INVALID_INDEX); return( 0); }
- OldValue = *((LONG *)((PCHAR)(Window + 1) + Index)); -/* - if ( Index == DWLP_DLGPROC && Wnd->state & WNDS_DIALOGWINDOW) +#ifdef _WIN64 + if (Size == sizeof(LONG)) { - OldValue = (LONG)IntSetWindowProc( Wnd, - (WNDPROC)NewValue, - Ansi); - if (!OldValue) return 0; + OldValue = *((LONG *)((PCHAR)(Window + 1) + Index)); + *((LONG*)((PCHAR)(Window + 1) + Index)) = (LONG)NewValue; } - */ - *((LONG *)((PCHAR)(Window + 1) + Index)) = NewValue; + else +#endif + { + OldValue = *((LONG_PTR *)((PCHAR)(Window + 1) + Index)); + /* + if ( Index == DWLP_DLGPROC && Wnd->state & WNDS_DIALOGWINDOW) + { + OldValue = (LONG_PTR)IntSetWindowProc( Wnd, (WNDPROC)NewValue, Ansi); + if (!OldValue) return 0; + } + */ + *((LONG_PTR*)((PCHAR)(Window + 1) + Index)) = NewValue; + } + } else { +#ifdef _WIN64 + if (Size == sizeof(LONG)) + { + if ((Index != GWL_STYLE) && + (Index != GWL_EXSTYLE) && + (Index != GWL_ID) && + (Index != GWL_USERDATA)) + { + ERR("NtUserSetWindowLong(): Index requires pointer size: %lu\n", Index); + EngSetLastError(ERROR_INVALID_INDEX); + return 0; + } + } +#endif + switch (Index) { - case GWL_EXSTYLE: + case GWL_EXSTYLE: // LONG OldValue = (LONG) Window->ExStyle; Style.styleOld = OldValue; Style.styleNew = NewValue; @@ -3635,7 +3659,7 @@ co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlte co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_EXSTYLE, (LPARAM) &Style); break;
- case GWL_STYLE: + case GWL_STYLE: // LONG OldValue = (LONG) Window->style; Style.styleOld = OldValue; Style.styleNew = NewValue; @@ -3689,7 +3713,7 @@ co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlte co_IntSendMessage(hWnd, WM_STYLECHANGED, GWL_STYLE, (LPARAM) &Style); break;
- case GWL_WNDPROC: + case GWLP_WNDPROC: // LONG_PTR { if ( Window->head.pti->ppi != PsGetCurrentProcessWin32Process() || Window->fnid & FNID_FREED) @@ -3697,31 +3721,31 @@ co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlte EngSetLastError(ERROR_ACCESS_DENIED); return( 0); } - OldValue = (LONG)IntSetWindowProc(Window, - (WNDPROC)NewValue, - Ansi); + OldValue = (LONG_PTR)IntSetWindowProc(Window, + (WNDPROC)NewValue, + Ansi); break; }
- case GWL_HINSTANCE: - OldValue = (LONG) Window->hModule; + case GWLP_HINSTANCE: // LONG_PTR + OldValue = (LONG_PTR) Window->hModule; Window->hModule = (HINSTANCE) NewValue; break;
- case GWL_HWNDPARENT: + case GWLP_HWNDPARENT: // LONG_PTR Parent = Window->spwndParent; if (Parent && (Parent->head.h == IntGetDesktopWindow())) - OldValue = (LONG) IntSetOwner(Window->head.h, (HWND) NewValue); + OldValue = (LONG_PTR) IntSetOwner(Window->head.h, (HWND) NewValue); else - OldValue = (LONG) co_UserSetParent(Window->head.h, (HWND) NewValue); + OldValue = (LONG_PTR) co_UserSetParent(Window->head.h, (HWND) NewValue); break;
- case GWL_ID: + case GWLP_ID: // LONG OldValue = (LONG) Window->IDMenu; Window->IDMenu = (UINT) NewValue; break;
- case GWL_USERDATA: + case GWLP_USERDATA: // LONG or LONG_PTR OldValue = Window->dwUserData; Window->dwUserData = NewValue; break; @@ -3737,11 +3761,16 @@ co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlte return( OldValue); }
- LONG FASTCALL co_UserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) { - return co_IntSetWindowLong(hWnd, Index, NewValue, Ansi, FALSE); + return (LONG)co_IntSetWindowLongPtr(hWnd, Index, NewValue, Ansi, sizeof(LONG), FALSE); +} + +LONG_PTR FASTCALL +co_UserSetWindowLongPtr(HWND hWnd, DWORD Index, LONG_PTR NewValue, BOOL Ansi) +{ + return co_IntSetWindowLongPtr(hWnd, Index, NewValue, Ansi, sizeof(LONG_PTR), FALSE); }
/* @@ -3769,13 +3798,36 @@ NtUserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) return 0; }
- ret = co_IntSetWindowLong(hWnd, Index, NewValue, Ansi, FALSE); + ret = (LONG)co_IntSetWindowLongPtr(hWnd, Index, NewValue, Ansi, sizeof(LONG), FALSE);
UserLeave();
return ret; }
+#ifdef _WIN64 +LONG_PTR APIENTRY +NtUserSetWindowLongPtr(HWND hWnd, DWORD Index, LONG_PTR NewValue, BOOL Ansi) +{ + LONG_PTR ret; + + UserEnterExclusive(); + + if (hWnd == IntGetDesktopWindow()) + { + EngSetLastError(STATUS_ACCESS_DENIED); + UserLeave(); + return 0; + } + + ret = co_IntSetWindowLongPtr(hWnd, Index, NewValue, Ansi, sizeof(LONG_PTR), FALSE); + + UserLeave(); + + return ret; +} +#endif // _WIN64 + DWORD APIENTRY NtUserAlterWindowStyle(HWND hWnd, DWORD Index, LONG NewValue) { @@ -3790,7 +3842,7 @@ NtUserAlterWindowStyle(HWND hWnd, DWORD Index, LONG NewValue) return 0; }
- ret = co_IntSetWindowLong(hWnd, Index, NewValue, FALSE, TRUE); + ret = co_IntSetWindowLongPtr(hWnd, Index, NewValue, FALSE, sizeof(LONG), TRUE);
UserLeave();
@@ -3876,7 +3928,7 @@ CLEANUP: /* * @implemented */ -DWORD APIENTRY +DWORD_PTR APIENTRY NtUserQueryWindow(HWND hWnd, DWORD Index) { /* Console Leader Process CID Window offsets */ @@ -3884,7 +3936,7 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) #define GWLP_CONSOLE_LEADER_TID 4
PWND pWnd; - DWORD Result; + DWORD_PTR Result; DECLARE_RETURN(UINT);
TRACE("Enter NtUserQueryWindow\n"); @@ -3903,11 +3955,11 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) (pWnd->pcls->atomClassName == gaGuiConsoleWndClass) ) { // IntGetWindowLong(offset == GWLP_CONSOLE_LEADER_PID) - Result = (DWORD)(*((LONG_PTR*)((PCHAR)(pWnd + 1) + GWLP_CONSOLE_LEADER_PID))); + Result = (DWORD_PTR)(*((LONG_PTR*)((PCHAR)(pWnd + 1) + GWLP_CONSOLE_LEADER_PID))); } else { - Result = (DWORD)IntGetWndProcessId(pWnd); + Result = (DWORD_PTR)IntGetWndProcessId(pWnd); } break; } @@ -3918,29 +3970,29 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) (pWnd->pcls->atomClassName == gaGuiConsoleWndClass) ) { // IntGetWindowLong(offset == GWLP_CONSOLE_LEADER_TID) - Result = (DWORD)(*((LONG_PTR*)((PCHAR)(pWnd + 1) + GWLP_CONSOLE_LEADER_TID))); + Result = (DWORD_PTR)(*((LONG_PTR*)((PCHAR)(pWnd + 1) + GWLP_CONSOLE_LEADER_TID))); } else { - Result = (DWORD)IntGetWndThreadId(pWnd); + Result = (DWORD_PTR)IntGetWndThreadId(pWnd); } break; }
case QUERY_WINDOW_ACTIVE: - Result = (DWORD)(pWnd->head.pti->MessageQueue->spwndActive ? UserHMGetHandle(pWnd->head.pti->MessageQueue->spwndActive) : 0); + Result = (DWORD_PTR)(pWnd->head.pti->MessageQueue->spwndActive ? UserHMGetHandle(pWnd->head.pti->MessageQueue->spwndActive) : 0); break;
case QUERY_WINDOW_FOCUS: - Result = (DWORD)(pWnd->head.pti->MessageQueue->spwndFocus ? UserHMGetHandle(pWnd->head.pti->MessageQueue->spwndFocus) : 0); + Result = (DWORD_PTR)(pWnd->head.pti->MessageQueue->spwndFocus ? UserHMGetHandle(pWnd->head.pti->MessageQueue->spwndFocus) : 0); break;
case QUERY_WINDOW_ISHUNG: - Result = (DWORD)MsqIsHung(pWnd->head.pti); + Result = (DWORD_PTR)MsqIsHung(pWnd->head.pti); break;
case QUERY_WINDOW_REAL_ID: - Result = (DWORD)pWnd->head.pti->pEThread->Cid.UniqueProcess; + Result = (DWORD_PTR)pWnd->head.pti->pEThread->Cid.UniqueProcess; break;
case QUERY_WINDOW_FOREGROUND: @@ -3948,7 +4000,7 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) break;
default: - Result = (DWORD)NULL; + Result = 0; break; }
diff --git a/win32ss/user/ntuser/window.h b/win32ss/user/ntuser/window.h index 47f5533f14..6c811914af 100644 --- a/win32ss/user/ntuser/window.h +++ b/win32ss/user/ntuser/window.h @@ -69,6 +69,7 @@ ULONG FASTCALL IntSetStyle(PWND,ULONG,ULONG); PWND FASTCALL VerifyWnd(PWND); PWND FASTCALL IntGetNonChildAncestor(PWND); LONG FASTCALL co_UserSetWindowLong(HWND,DWORD,LONG,BOOL); +LONG_PTR FASTCALL co_UserSetWindowLongPtr(HWND, DWORD, LONG_PTR, BOOL); HWND FASTCALL IntGetWindow(HWND,UINT); LRESULT co_UserFreeWindow(PWND,PPROCESSINFO,PTHREADINFO,BOOLEAN);
diff --git a/win32ss/user/user32/windows/class.c b/win32ss/user/user32/windows/class.c index cf9d88dbbb..b7451639ba 100644 --- a/win32ss/user/user32/windows/class.c +++ b/win32ss/user/user32/windows/class.c @@ -1841,7 +1841,7 @@ SetWindowLongPtrA(HWND hWnd, INT nIndex, LONG_PTR dwNewLong) { - return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE); + return NtUserSetWindowLongPtr(hWnd, nIndex, dwNewLong, TRUE); }
/* @@ -1853,7 +1853,7 @@ SetWindowLongPtrW(HWND hWnd, INT nIndex, LONG_PTR dwNewLong) { - return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE); + return NtUserSetWindowLongPtr(hWnd, nIndex, dwNewLong, FALSE); } #endif
diff --git a/win32ss/w32ksvc.h b/win32ss/w32ksvc.h index 1e50b3181f..b10dde4b71 100644 --- a/win32ss/w32ksvc.h +++ b/win32ss/w32ksvc.h @@ -544,6 +544,9 @@ SVC_(UserSetTimer, 4) SVC_(UserSetWindowFNID, 2) SVC_(UserSetWindowLong, 4) +#ifdef _WIN64 + SVC_(UserSetWindowLongPtr, 4) +#endif // _WIN64 SVC_(UserSetWindowPlacement, 2) SVC_(UserSetWindowPos, 7) SVC_(UserSetWindowRgn, 3)
-
Timo Kreuzer