Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[gvg] 17771: Fix maximizing problem introduced by r17764

by gvg＠svn.reactos.com

Fix maximizing problem introduced by r17764 Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-09-10 08:01:19 UTC (rev 17770) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-09-10 08:22:03 UTC (rev 17771) @@ -361,8 +361,8 @@ case SW_MAXIMIZE: { - co_WinPosGetMinMaxInfo(Window, &Size, &InternalPos->MaxPos, - NULL, NULL); + co_WinPosGetMinMaxInfo(Window, NULL, &InternalPos->MaxPos, + NULL, &Size); DPRINT("Maximize: %d,%d %dx%d\n", InternalPos->MaxPos.x, InternalPos->MaxPos.y, Size.x, Size.y); if (Window->Style & WS_MINIMIZE) @@ -382,8 +382,8 @@ Window->Style &= ~WS_MINIMIZE; if (Window->Flags & WINDOWOBJECT_RESTOREMAX) { - co_WinPosGetMinMaxInfo(Window, &Size, - &InternalPos->MaxPos, NULL, NULL); + co_WinPosGetMinMaxInfo(Window, NULL, + &InternalPos->MaxPos, NULL, &Size); Window->Style |= WS_MAXIMIZE; IntGdiSetRect(NewPos, InternalPos->MaxPos.x, InternalPos->MaxPos.y, Size.x, Size.y); @@ -437,8 +437,8 @@ Info->ptMaxTrackSize.y = Info->ptMaxSize.y; IntGetWindowBorderMeasures(Window, &XInc, &YInc); - Info->ptMaxSize.x += 2 * XInc; - Info->ptMaxSize.y += 2 * YInc; + Info->ptMaxTrackSize.x += 2 * XInc; + Info->ptMaxTrackSize.y += 2 * YInc; if (Window->InternalPos != NULL) {

19 years

[mf] 17770: tag ReactOS release 0.2.7

by mf＠svn.reactos.com

tag ReactOS release 0.2.7 Added: tags/ReactOS-0.2.7/ _____ Copied: tags/ReactOS-0.2.7 (from rev 17769, branches/ros-branch-0_2_7)

19 years

[mf] 17769: Remove wrong tag

by mf＠svn.reactos.com

Remove wrong tag Deleted: tags/ReactOS-0.2.7/

19 years

[mf] 17768: tag ReactOS release 0.2.7

by mf＠svn.reactos.com

tag ReactOS release 0.2.7 Added: tags/ReactOS-0.2.7/ _____ Copied: tags/ReactOS-0.2.7 (from rev 17767, tags/ReactOS-0.2.6)

19 years

[gvg] 17767: Don't trust the returned date/time from the BIOS. QEmu messes this up sometimes.

by gvg＠svn.reactos.com

Don't trust the returned date/time from the BIOS. QEmu messes this up sometimes. Partly fixes bug 716. Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c 2005-09-09 15:58:40 UTC (rev 17766) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c 2005-09-09 21:15:32 UTC (rev 17767) @@ -403,6 +403,12 @@ BOOL PMHour = FALSE; MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); + if (Year < 1 || 9999 < Year || Month < 1 || 12 < Month || Day < 1 || + 31 < Day || 23 < Hour || 59 < Minute || 59 < Second) + { + /* This happens on QEmu sometimes. We just skip updating */ + return; + } // Get the month name strcpy(DateString, UiMonthNames[Month - 1]); // Get the day

19 years

[hpoussin] 17766: Compile cmd.exe as unicode

by hpoussin＠svn.reactos.com

Compile cmd.exe as unicode Modified: trunk/reactos/subsys/system/cmd/cmd.xml _____ Modified: trunk/reactos/subsys/system/cmd/cmd.xml --- trunk/reactos/subsys/system/cmd/cmd.xml 2005-09-09 14:47:35 UTC (rev 17765) +++ trunk/reactos/subsys/system/cmd/cmd.xml 2005-09-09 15:58:40 UTC (rev 17766) @@ -4,6 +4,8 @@ <define name="__USE_W32API" /> <define name="ANONYMOUSUNIONS" /> <define name="_WIN32_WINNT">0x0501</define> + <define name="UNICODE" /> + <define name="_UNICODE" /> <pch>precomp.h</pch> <file>alias.c</file> <file>attrib.c</file> @@ -65,6 +67,8 @@ <define name="__USE_W32API" /> <define name="ANONYMOUSUNIONS" /> <define name="_WIN32_WINNT">0x0501</define> + <define name="UNICODE" /> + <define name="_UNICODE" /> <library>kernel32</library> <library>cmd_base</library> <file>main.c</file>

19 years

[gvg] 17765: maxlen is in characters, _cnt is in bytes.

by gvg＠svn.reactos.com

maxlen is in characters, _cnt is in bytes. Note: rebuild of lib/crt required for this change to take effect (make crt_clean; make crt) This brings the VMware Tools installer a hell of a lot further (bug 717). Modified: trunk/reactos/lib/crt/stdio/vsprintf.c _____ Modified: trunk/reactos/lib/crt/stdio/vsprintf.c --- trunk/reactos/lib/crt/stdio/vsprintf.c 2005-09-09 13:35:02 UTC (rev 17764) +++ trunk/reactos/lib/crt/stdio/vsprintf.c 2005-09-09 14:47:35 UTC (rev 17765) @@ -35,7 +35,7 @@ f._flag = _IOWRT|_IOSTRG|_IOBINARY; f._ptr = (char*)str; - f._cnt = maxlen; + f._cnt = maxlen * sizeof(_TCHAR); f._file = -1; len = _vftprintf(&f,fmt, ap); // what if the buffer is full ??

19 years

[gvg] 17764: Use max tracking size instead of maximized size to limit window size.

by gvg＠svn.reactos.com

Use max tracking size instead of maximized size to limit window size. Fixes bug 721. Modified: trunk/reactos/lib/user32/windows/defwnd.c _____ Modified: trunk/reactos/lib/user32/windows/defwnd.c --- trunk/reactos/lib/user32/windows/defwnd.c 2005-09-09 12:22:25 UTC (rev 17763) +++ trunk/reactos/lib/user32/windows/defwnd.c 2005-09-09 13:35:02 UTC (rev 17764) @@ -809,15 +809,15 @@ LRESULT DefWndHandleWindowPosChanging(HWND hWnd, WINDOWPOS* Pos) { - POINT maxSize, minTrack; + POINT maxTrack, minTrack; LONG style = GetWindowLongA(hWnd, GWL_STYLE); if (Pos->flags & SWP_NOSIZE) return 0; if ((style & WS_THICKFRAME) || ((style & (WS_POPUP | WS_CHILD)) == 0)) { - WinPosGetMinMaxInfo(hWnd, &maxSize, NULL, &minTrack, NULL); - Pos->cx = min(Pos->cx, maxSize.x); - Pos->cy = min(Pos->cy, maxSize.y); + WinPosGetMinMaxInfo(hWnd, NULL, NULL, &minTrack, &maxTrack); + Pos->cx = min(Pos->cx, maxTrack.x); + Pos->cy = min(Pos->cy, maxTrack.y); if (!(style & WS_MINIMIZE)) { if (Pos->cx < minTrack.x) Pos->cx = minTrack.x;

19 years

[gvg] 17763: Restore console title after running a command

by gvg＠svn.reactos.com

Restore console title after running a command Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-09 12:22:01 UTC (rev 17762) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-09 12:22:25 UTC (rev 17763) @@ -299,9 +299,7 @@ TCHAR *first = NULL; TCHAR *rest = NULL; TCHAR *full = NULL; -#ifndef __REACTOS__ TCHAR szWindowTitle[MAX_PATH]; -#endif DWORD dwExitCode = 0; #ifdef _DEBUG @@ -410,9 +408,7 @@ return; } -#ifndef __REACTOS__ GetConsoleTitle (szWindowTitle, MAX_PATH); -#endif /* check if this is a .BAT or .CMD file */ if (!_tcsicmp (_tcsrchr (szFullName, _T('.')), _T(".bat")) || @@ -494,9 +490,7 @@ /* Get code page if it has been change */ InputCodePage= GetConsoleCP(); OutputCodePage = GetConsoleOutputCP(); -#ifndef __REACTOS__ - SetConsoleTitle (szWindowTitle); -#endif + SetConsoleTitle (szWindowTitle); free(first); free(rest);

19 years

[gvg] 17762: Don't assume UNICODE_STRINGs are nul terminated

by gvg＠svn.reactos.com

Don't assume UNICODE_STRINGs are nul terminated Modified: trunk/reactos/subsys/csrss/win32csr/conio.c _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-09-09 11:43:26 UTC (rev 17761) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-09-09 12:22:01 UTC (rev 17762) @@ -2343,7 +2343,8 @@ RtlZeroMemory(&Request->Data.GetTitleRequest, sizeof(CSRSS_GET_TITLE)); Request->Data.GetTitleRequest.ConsoleHandle = Request->Data.GetTitleRequest.ConsoleHandle; Request->Data.GetTitleRequest.Length = Console->Title.Length; - wcscpy (Request->Data.GetTitleRequest.Title, Console->Title.Buffer); + memcpy (Request->Data.GetTitleRequest.Title, Console->Title.Buffer, + Console->Title.Length); Length = CSR_API_MESSAGE_HEADER_SIZE(CSRSS_SET_TITLE) + Console->Title.Length; ConioUnlockConsole(Console);

19 years

← Newer
1
...
39
40
41
42
43
44
45
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005