Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 23:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Removed debug messages from GetWindowLong/SetWindowLong.

Browse source 
- Modified NtUserSetShellWindowEx to work. It passed Martin's tests, so I take it's correct.

svn path=/trunk/; revision=6445
This commit is contained in:
Filip Navara 2003-10-28 13:43:56 +00:00
parent 2609d3aece
commit 3fa0b64ad8
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
reactos/subsys/win32k/ntuser/window.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: window.c,v 1.120 2003/10/28 12:21:36 navaraf Exp $ /* $Id: window.c,v 1.121 2003/10/28 13:43:56 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -2242,14 +2242,12 @@ NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi)
if (0 <= (int) Index) if (0 <= (int) Index)
{ {
DbgPrint("GetWindowLong(%x, %d)\n", hWnd, Index);
if (Index > WindowObject->ExtraDataSize - sizeof(LONG)) if (Index > WindowObject->ExtraDataSize - sizeof(LONG))
{ {
SetLastWin32Error(ERROR_INVALID_PARAMETER); SetLastWin32Error(ERROR_INVALID_PARAMETER);
return 0; return 0;
} }
Result = *((LONG *)(WindowObject->ExtraData + Index)); Result = *((LONG *)(WindowObject->ExtraData + Index));
DbgPrint("Result: %x\n", Result);
} }
else else
{ {
@ -2847,7 +2845,7 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView)
/* move shell window into background */ /* move shell window into background */
if (hwndListView && hwndListView!=hwndShell) if (hwndListView && hwndListView!=hwndShell)
{ {
WinPosSetWindowPos(hwndListView, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE); WinPosSetWindowPos(hwndListView, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE);
if (NtUserGetWindowLong(hwndListView, GWL_EXSTYLE, FALSE) & WS_EX_TOPMOST) if (NtUserGetWindowLong(hwndListView, GWL_EXSTYLE, FALSE) & WS_EX_TOPMOST)
return FALSE; return FALSE;
@ -2941,7 +2939,6 @@ NtUserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi)
if (0 <= (int) Index) if (0 <= (int) Index)
{ {
DbgPrint("SetWindowLong(%x, %d, %x)\n", hWnd, Index, NewValue);
if (Index > WindowObject->ExtraDataSize - sizeof(LONG)) if (Index > WindowObject->ExtraDataSize - sizeof(LONG))
{ {
SetLastWin32Error(ERROR_INVALID_PARAMETER); SetLastWin32Error(ERROR_INVALID_PARAMETER);
@ -2949,7 +2946,6 @@ NtUserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi)
} }
OldValue = *((LONG *)(WindowObject->ExtraData + Index)); OldValue = *((LONG *)(WindowObject->ExtraData + Index));
*((LONG *)(WindowObject->ExtraData + Index)) = NewValue; *((LONG *)(WindowObject->ExtraData + Index)) = NewValue;
DbgPrint("OldValue: %x\n", OldValue);
} }
else else
{ {

4
reactos/subsys/win32k/ntuser/winpos.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: winpos.c,v 1.37 2003/10/28 12:21:36 navaraf Exp $ /* $Id: winpos.c,v 1.38 2003/10/28 13:43:56 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -757,7 +757,7 @@ WinPosSetWindowPos(HWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx,
* FIXME: Relink windows. (also take into account shell window in hwndShellWindow) * FIXME: Relink windows. (also take into account shell window in hwndShellWindow)
*/ */
if (!(WinPos.flags & SWP_NOZORDER) && WinPos.hwndInsertAfter != WinPos.hwnd && if (!(WinPos.flags & SWP_NOZORDER) && WinPos.hwndInsertAfter != WinPos.hwnd &&
Window->Self != NtUserGetShellWindow()) WinPos.hwnd != NtUserGetShellWindow())
{ {
PWINDOW_OBJECT ParentWindow; PWINDOW_OBJECT ParentWindow;
PWINDOW_OBJECT InsertAfterWindow; PWINDOW_OBJECT InsertAfterWindow;