Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 01:39:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix functionality in TWOPARAM_ROUTINE_ROS_SHOWWINDOW. Use one PWINDOW_OBJECT Window in NtUserCallTwoParam to help with cleanup.

Browse source 
svn path=/trunk/; revision=22353
This commit is contained in:
James Tabor 2006-06-15 07:07:54 +00:00
parent 3309c9266d
commit 7436b68377
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/subsystems/win32/win32k/ntuser/misc.c
View file

@ -493,7 +493,7 @@ NtUserCallTwoParam(
{ {
DWORD Ret; DWORD Ret;
RECT rcRect; RECT rcRect;
PWINDOW_OBJECT Window = UserGetWindowObject((HWND)Param1); Window = UserGetWindowObject((HWND)Param1);
if (!Window) RETURN(ERROR); if (!Window) RETURN(ERROR);
Ret = (DWORD)IntGetWindowRgnBox(Window, &rcRect); Ret = (DWORD)IntGetWindowRgnBox(Window, &rcRect);
@ -507,7 +507,7 @@ NtUserCallTwoParam(
} }
case TWOPARAM_ROUTINE_GETWINDOWRGN: case TWOPARAM_ROUTINE_GETWINDOWRGN:
{ {
PWINDOW_OBJECT Window = UserGetWindowObject((HWND)Param1); Window = UserGetWindowObject((HWND)Param1);
if (!Window) RETURN(ERROR); if (!Window) RETURN(ERROR);
RETURN( (DWORD)IntGetWindowRgn(Window, (HRGN)Param2)); RETURN( (DWORD)IntGetWindowRgn(Window, (HRGN)Param2));
@ -567,7 +567,7 @@ NtUserCallTwoParam(
case TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS: case TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS:
{ {
PWINDOW_OBJECT Window = UserGetWindowObject((HWND)Param1); Window = UserGetWindowObject((HWND)Param1);
if (!Window) RETURN(0); if (!Window) RETURN(0);
RETURN( (DWORD)IntShowOwnedPopups(Window, (BOOL) Param2)); RETURN( (DWORD)IntShowOwnedPopups(Window, (BOOL) Param2));
@ -576,19 +576,18 @@ NtUserCallTwoParam(
case TWOPARAM_ROUTINE_ROS_SHOWWINDOW: case TWOPARAM_ROUTINE_ROS_SHOWWINDOW:
{ {
#define WIN_NEEDS_SHOW_OWNEDPOPUP (0x00000040) #define WIN_NEEDS_SHOW_OWNEDPOPUP (0x00000040)
PWINDOW_OBJECT Window;
DPRINT1("ROS_SHOWWINDOW\n"); DPRINT1("ROS_SHOWWINDOW\n");
if (!(Window = UserGetWindowObject((HWND)Param1))) if (!(Window = UserGetWindowObject((HWND)Param1)))
{ {
RETURN( FALSE); RETURN( 1 );
} }
if (Param2) if (Param2)
{ {
if (!(Window->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP)) if (!(Window->Flags & WIN_NEEDS_SHOW_OWNEDPOPUP))
{ {
RETURN( TRUE); RETURN( -1 );
} }
Window->Flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP; Window->Flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP;
} }
@ -596,8 +595,9 @@ NtUserCallTwoParam(
Window->Flags |= WIN_NEEDS_SHOW_OWNEDPOPUP; Window->Flags |= WIN_NEEDS_SHOW_OWNEDPOPUP;
DPRINT1("ROS_SHOWWINDOW ---> 0x%x\n",Window->Flags); DPRINT1("ROS_SHOWWINDOW ---> 0x%x\n",Window->Flags);
RETURN( TRUE); RETURN( 0 );
} }
case TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW: case TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW:
UNIMPLEMENTED UNIMPLEMENTED
RETURN( 0); RETURN( 0);