Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 17767: Don't trust the returned date/time from the BIOS. QEmu messes this up sometimes.
by gvg＠svn.reactos.com 09 Sep '05

09 Sep '05

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

1 0

[hpoussin] 17766: Compile cmd.exe as unicode
by hpoussin＠svn.reactos.com 09 Sep '05

09 Sep '05

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>

1 0

[gvg] 17765: maxlen is in characters, _cnt is in bytes.
by gvg＠svn.reactos.com 09 Sep '05

09 Sep '05

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 ??

1 0

[gvg] 17764: Use max tracking size instead of maximized size to limit window size.
by gvg＠svn.reactos.com 09 Sep '05

09 Sep '05

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;

1 0

[gvg] 17763: Restore console title after running a command
by gvg＠svn.reactos.com 09 Sep '05

09 Sep '05

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);

1 0

[gvg] 17762: Don't assume UNICODE_STRINGs are nul terminated
by gvg＠svn.reactos.com 09 Sep '05

09 Sep '05

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);

1 0

[gvg] 17761: Convert title from UNICODE_STRING to nul-terminated
by gvg＠svn.reactos.com 09 Sep '05

09 Sep '05

Convert title from UNICODE_STRING to nul-terminated Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c _____ Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c --- trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-09-09 10:22:40 UTC (rev 17760) +++ trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-09-09 11:43:26 UTC (rev 17761) @@ -786,6 +786,7 @@ HWND NewWindow; LONG WindowCount; MSG Msg; + PWCHAR Buffer, Title; PCSRSS_CONSOLE Console = (PCSRSS_CONSOLE) lParam; switch(msg) @@ -794,8 +795,20 @@ SetWindowLongW(hWnd, GWL_USERDATA, 0); return 0; case PM_CREATE_CONSOLE: + Buffer = HeapAlloc(Win32CsrApiHeap, 0, + Console->Title.Length + sizeof(WCHAR)); + if (NULL != Buffer) + { + memcpy(Buffer, Console->Title.Buffer, Console->Title.Length); + Buffer[Console->Title.Length / sizeof(WCHAR)] = L'\0'; + Title = Buffer; + } + else + { + Title = L""; + } NewWindow = CreateWindowW(L"ConsoleWindowClass", - Console->Title.Buffer, + Title, WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX, CW_USEDEFAULT, CW_USEDEFAULT, @@ -805,6 +818,10 @@ NULL, (HINSTANCE) GetModuleHandleW(NULL), (PVOID) Console); + if (NULL != Buffer) + { + HeapFree(Win32CsrApiHeap, 0, Buffer); + } Console->hWindow = NewWindow; if (NULL != NewWindow) { @@ -934,8 +951,26 @@ STATIC BOOL STDCALL GuiChangeTitle(PCSRSS_CONSOLE Console) { - SendMessageW(Console->hWindow, WM_SETTEXT, 0, (LPARAM) Console->Title.Buffer); + PWCHAR Buffer, Title; + Buffer = HeapAlloc(Win32CsrApiHeap, 0, + Console->Title.Length + sizeof(WCHAR)); + if (NULL != Buffer) + { + memcpy(Buffer, Console->Title.Buffer, Console->Title.Length); + Buffer[Console->Title.Length / sizeof(WCHAR)] = L'\0'; + Title = Buffer; + } + else + { + Title = L""; + } + SendMessageW(Console->hWindow, WM_SETTEXT, 0, (LPARAM) Title); + if (NULL != Buffer) + { + HeapFree(Win32CsrApiHeap, 0, Buffer); + } + return TRUE; }

1 0

[gvg] 17760: RetVal is in bytes, so check against MAX_PATH in bytes
by gvg＠svn.reactos.com 09 Sep '05

09 Sep '05

RetVal is in bytes, so check against MAX_PATH in bytes Modified: trunk/reactos/lib/kernel32/process/create.c _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-09-09 09:50:58 UTC (rev 17759) +++ trunk/reactos/lib/kernel32/process/create.c 2005-09-09 10:22:40 UTC (rev 17760) @@ -973,7 +973,7 @@ } /* Now check if we have a file, and if the path size is OK */ - if (!RetVal || RetVal >= (MAX_PATH / sizeof(WCHAR))) + if (!RetVal || RetVal >= (MAX_PATH * sizeof(WCHAR))) { ULONG PathType; HANDLE hFile;

1 0

[gvg] 17759: Window handle is not valid anymore when the object is in "destroyed" state
by gvg＠svn.reactos.com 09 Sep '05

09 Sep '05

Window handle is not valid anymore when the object is in "destroyed" state Modified: trunk/reactos/subsys/win32k/ntuser/window.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-09-09 09:48:33 UTC (rev 17758) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-09-09 09:50:58 UTC (rev 17759) @@ -117,7 +117,7 @@ if (!hWnd) return NULL; Window = (PWINDOW_OBJECT)UserGetObject(&gHandleTable, hWnd, otWindow); - if (!Window) + if (!Window || 0 != (Window->Status & WINDOWSTATUS_DESTROYED)) { SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); return NULL;

1 0

[gvg] 17758: Remove WS_VISIBLE bit from correct member
by gvg＠svn.reactos.com 09 Sep '05

09 Sep '05

Remove WS_VISIBLE bit from correct member Modified: trunk/reactos/subsys/win32k/ntuser/window.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-09-09 00:38:39 UTC (rev 17757) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-09-09 09:48:33 UTC (rev 17758) @@ -344,7 +344,7 @@ return 0; } Window->Status |= WINDOWSTATUS_DESTROYING; - Window->Flags &= ~WS_VISIBLE; + Window->Style &= ~WS_VISIBLE; /* remove the window already at this point from the thread window list so we don't get into trouble when destroying the thread windows while we're still in IntDestroyWindow() */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs