Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added check for PsGetWin32Process() == NULL to IntGetWindowObject. It's propably not right and only hiding the real problem, but I need it to get explorer wroking...

Browse source 
svn path=/trunk/; revision=6315
This commit is contained in:
Filip Navara 2003-10-14 18:49:10 +00:00
parent cbcee55a07
commit ec667f9dab
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
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.111 2003/10/09 07:30:02 gvg Exp $ /* $Id: window.c,v 1.112 2003/10/14 18:49:10 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -536,9 +536,13 @@ IntGetWindowObject(HWND hWnd)
{ {
PWINDOW_OBJECT WindowObject; PWINDOW_OBJECT WindowObject;
NTSTATUS Status; NTSTATUS Status;
/* FIXME */
if (PsGetWin32Process() == NULL)
return NULL;
Status = Status =
ObmReferenceObjectByHandle(PsGetWin32Process()->WindowStation-> ObmReferenceObjectByHandle(PsGetWin32Process()->WindowStation->
HandleTable, HandleTable,
hWnd, hWnd,
otWindow, otWindow,
(PVOID*)&WindowObject); (PVOID*)&WindowObject);
@ -1094,11 +1098,17 @@ NtUserCreateWindowEx(DWORD dwExStyle,
UNICODE_STRING WindowName; UNICODE_STRING WindowName;
NTSTATUS Status; NTSTATUS Status;
HANDLE Handle; HANDLE Handle;
#if 0
POINT MaxSize, MaxPos, MinTrack, MaxTrack; POINT MaxSize, MaxPos, MinTrack, MaxTrack;
#else
POINT MaxPos;
#endif
CREATESTRUCTW Cs; CREATESTRUCTW Cs;
LRESULT Result; LRESULT Result;
DPRINT("NtUserCreateWindowEx\n"); DPRINT("NtUserCreateWindowEx\n");
DPRINT("NtUserCreateWindowEx(): (%d,%d-%d,%d)\n", x, y, nWidth, nHeight);
/* Initialize gui state if necessary. */ /* Initialize gui state if necessary. */
IntGraphicsCheck(TRUE); IntGraphicsCheck(TRUE);
@ -1261,6 +1271,7 @@ NtUserCreateWindowEx(DWORD dwExStyle,
/* /*
* Get the size and position of the window. * Get the size and position of the window.
*/ */
#if 0
if ((dwStyle & WS_THICKFRAME) || !(dwStyle & (WS_POPUP | WS_CHILD))) if ((dwStyle & WS_THICKFRAME) || !(dwStyle & (WS_POPUP | WS_CHILD)))
{ {
/* WinPosGetMinMaxInfo sends the WM_GETMINMAXINFO message */ /* WinPosGetMinMaxInfo sends the WM_GETMINMAXINFO message */
@ -1271,6 +1282,7 @@ NtUserCreateWindowEx(DWORD dwExStyle,
x = max(MinTrack.x, x); x = max(MinTrack.x, x);
y = max(MinTrack.y, y); y = max(MinTrack.y, y);
} }
#endif
WindowObject->WindowRect.left = x; WindowObject->WindowRect.left = x;
WindowObject->WindowRect.top = y; WindowObject->WindowRect.top = y;
@ -1311,6 +1323,7 @@ NtUserCreateWindowEx(DWORD dwExStyle,
DPRINT("[win32k.window] NtUserCreateWindowEx style %d, exstyle %d, parent %d\n", Cs.style, Cs.dwExStyle, Cs.hwndParent); DPRINT("[win32k.window] NtUserCreateWindowEx style %d, exstyle %d, parent %d\n", Cs.style, Cs.dwExStyle, Cs.hwndParent);
// NtUserSetWindowLong(Handle, GWL_STYLE, WindowObject->Style, TRUE); // NtUserSetWindowLong(Handle, GWL_STYLE, WindowObject->Style, TRUE);
// NtUserSetWindowLong(Handle, GWL_EXSTYLE, WindowObject->ExStyle, TRUE); // NtUserSetWindowLong(Handle, GWL_EXSTYLE, WindowObject->ExStyle, TRUE);
DPRINT("NtUserCreateWindowEx(): (%d,%d-%d,%d)\n", x, y, nWidth, nHeight);
// Any more? // Any more?
DPRINT("NtUserCreateWindowEx(): About to send NCCREATE message.\n"); DPRINT("NtUserCreateWindowEx(): About to send NCCREATE message.\n");