Use the correct size variables in co_IntCreateWindowEx.

svn path=/trunk/; revision=18048
This commit is contained in:
Filip Navara 2005-09-25 12:30:51 +00:00
parent 67429beef5
commit 66e998c053

View file

@ -1710,18 +1710,18 @@ co_IntCreateWindowEx(DWORD dwExStyle,
/* WinPosGetMinMaxInfo sends the WM_GETMINMAXINFO message */ /* WinPosGetMinMaxInfo sends the WM_GETMINMAXINFO message */
co_WinPosGetMinMaxInfo(Window, &MaxSize, &MaxPos, &MinTrack, co_WinPosGetMinMaxInfo(Window, &MaxSize, &MaxPos, &MinTrack,
&MaxTrack); &MaxTrack);
if (MaxSize.x < nWidth) if (MaxSize.x < Size.cx)
nWidth = MaxSize.x; Size.cx = MaxSize.x;
if (MaxSize.y < nHeight) if (MaxSize.y < Size.cy)
nHeight = MaxSize.y; Size.cy = MaxSize.y;
if (nWidth < MinTrack.x ) if (Size.cx < MinTrack.x )
nWidth = MinTrack.x; Size.cx = MinTrack.x;
if (nHeight < MinTrack.y ) if (Size.cy < MinTrack.y )
nHeight = MinTrack.y; Size.cy = MinTrack.y;
if (nWidth < 0) if (Size.cx < 0)
nWidth = 0; Size.cx = 0;
if (nHeight < 0) if (Size.cy < 0)
nHeight = 0; Size.cy = 0;
} }
Window->WindowRect.left = Pos.x; Window->WindowRect.left = Pos.x;
@ -1744,7 +1744,7 @@ co_IntCreateWindowEx(DWORD dwExStyle,
Cs.y = Pos.y; Cs.y = Pos.y;
DPRINT("[win32k.window] IntCreateWindowEx style %d, exstyle %d, parent %d\n", Cs.style, Cs.dwExStyle, Cs.hwndParent); DPRINT("[win32k.window] IntCreateWindowEx style %d, exstyle %d, parent %d\n", Cs.style, Cs.dwExStyle, Cs.hwndParent);
DPRINT("IntCreateWindowEx(): (%d,%d-%d,%d)\n", x, y, nWidth, nHeight); DPRINT("IntCreateWindowEx(): (%d,%d-%d,%d)\n", x, y, Size.cx, Size.cy);
DPRINT("IntCreateWindowEx(): About to send NCCREATE message.\n"); DPRINT("IntCreateWindowEx(): About to send NCCREATE message.\n");
Result = co_IntSendMessage(Window->hSelf, WM_NCCREATE, 0, (LPARAM) &Cs); Result = co_IntSendMessage(Window->hSelf, WM_NCCREATE, 0, (LPARAM) &Cs);
if (!Result) if (!Result)