Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[jimtabor] 16571: Fixing WM_ENABLE ScrollBarWndProc. Tested it with 7-Zip, AbiWord, RegEdit and Winefile, all seem not to use it. Please test this.

by jimtabor＠svn.reactos.com

Fixing WM_ENABLE ScrollBarWndProc. Tested it with 7-Zip, AbiWord, RegEdit and Winefile, all seem not to use it. Please test this. Modified: trunk/reactos/lib/user32/controls/scrollbar.c Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c _____ Modified: trunk/reactos/lib/user32/controls/scrollbar.c --- trunk/reactos/lib/user32/controls/scrollbar.c 2005-07-14 23:11:28 UTC (rev 16570) +++ trunk/reactos/lib/user32/controls/scrollbar.c 2005-07-15 01:42:22 UTC (rev 16571) @@ -1263,18 +1263,25 @@ IntScrollCreateScrollBar(Wnd, (LPCREATESTRUCTW) lParam); break; -#if 0 /* FIXME */ +//#if 0 /* FIXME */ case WM_ENABLE: { - SCROLLBAR_INFO *infoPtr; - if ((infoPtr = SCROLL_GetScrollBarInfo( hwnd, SB_CTL ))) - { - infoPtr->flags = wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH; - SCROLL_RefreshScrollBar(hwnd, SB_CTL, TRUE, TRUE); - } +// SCROLLBAR_INFO *infoPtr; +// if ((infoPtr = SCROLL_GetScrollBarInfo( hwnd, SB_CTL ))) +// { +// infoPtr->flags = wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH; +// SCROLL_RefreshScrollBar(hwnd, SB_CTL, TRUE, TRUE); +// } + DbgPrint("ScrollBarWndProc WM_ENABLE\n"); + NtUserEnableScrollBar(Wnd,SB_CTL,wParam); + /* Refresh Scrollbars. */ + HDC hdc = GetDCEx( Wnd, 0, DCX_CACHE | SB_CTL ); + if (!hdc) return 1; + IntDrawScrollBar( Wnd, hdc, SB_CTL); + ReleaseDC( Wnd, hdc ); } return 0; -#endif +//#endif case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: _____ Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c --- trunk/reactos/subsys/win32k/ntuser/scrollbar.c 2005-07-14 23:11:28 UTC (rev 16570) +++ trunk/reactos/subsys/win32k/ntuser/scrollbar.c 2005-07-15 01:42:22 UTC (rev 16571) @@ -642,8 +642,12 @@ if(wSBflags == SB_CTL) { /* FIXME */ + DPRINT1("Enable Scrollbar SB_CTL\n"); + InfoV = IntGetScrollbarInfoFromWindow(Window, SB_VERT); + Chg = IntEnableScrollBar(FALSE, InfoV ,wArrows); + /* Chg? Scrollbar is Refresh in user32/controls/scrollbar.c. */ IntReleaseWindowObject(Window); - return FALSE; + return TRUE; } if(wSBflags != SB_BOTH && !SBID_IS_VALID(wSBflags))

19 years, 3 months

[robertk] 16570: the release branch should be dbg=0

by robertk＠svn.reactos.com

the release branch should be dbg=0 Modified: branches/ros-branch-0_2_7/reactos/config.template.xml _____ Modified: branches/ros-branch-0_2_7/reactos/config.template.xml --- branches/ros-branch-0_2_7/reactos/config.template.xml 2005-07-14 21:57:57 UTC (rev 16569) +++ branches/ros-branch-0_2_7/reactos/config.template.xml 2005-07-14 23:11:28 UTC (rev 16570) @@ -42,4 +42,4 @@ Whether to compile for debugging. No compiler optimizations will be performed. --> -<property name="DBG" value="1" /> +<property name="DBG" value="0" />

19 years, 3 months

[weiden] 16569: don't allow changing the allow and deny checkbox state to checked at the same time

by weiden＠svn.reactos.com

don't allow changing the allow and deny checkbox state to checked at the same time Modified: trunk/reactos/lib/aclui/aclui.c Modified: trunk/reactos/lib/aclui/acluilib.h Modified: trunk/reactos/lib/aclui/checklist.c _____ Modified: trunk/reactos/lib/aclui/aclui.c --- trunk/reactos/lib/aclui/aclui.c 2005-07-14 21:07:14 UTC (rev 16568) +++ trunk/reactos/lib/aclui/aclui.c 2005-07-14 21:57:57 UTC (rev 16569) @@ -581,11 +581,11 @@ case WM_NOTIFY: { NMHDR *pnmh = (NMHDR*)lParam; - if (pnmh->idFrom == IDC_ACELIST) + sp = (PSECURITY_PAGE)GetWindowLongPtr(hwndDlg, + DWL_USER); + if (sp != NULL) { - sp = (PSECURITY_PAGE)GetWindowLongPtr(hwndDlg, - DWL_USER); - if (sp != NULL) + if (pnmh->hwndFrom == sp->hWndAceList) { switch(pnmh->code) { @@ -603,6 +603,24 @@ } } } + else if (pnmh->hwndFrom == sp->hAceCheckList) + { + switch(pnmh->code) + { + case CLN_CHANGINGITEMCHECKBOX: + { + PNMCHANGEITEMCHECKBOX pcicb = (PNMCHANGEITEMCHECKBOX)lParam; + + /* make sure only one of both checkboxes is only checked + at the same time */ + if (pcicb->Checked) + { + pcicb->NewState &= ~((pcicb->CheckBox != CLB_DENY) ? CIS_DENY : CIS_ALLOW); + } + break; + } + } + } } break; } _____ Modified: trunk/reactos/lib/aclui/acluilib.h --- trunk/reactos/lib/aclui/acluilib.h 2005-07-14 21:07:14 UTC (rev 16568) +++ trunk/reactos/lib/aclui/acluilib.h 2005-07-14 21:57:57 UTC (rev 16569) @@ -106,6 +106,17 @@ #define CLM_SETQUICKSEARCH_TIMEOUT_RESET (WM_USER + 10) #define CLM_SETQUICKSEARCH_TIMEOUT_SETFOCUS (WM_USER + 11) +#define CLN_CHANGINGITEMCHECKBOX (101) + +typedef struct _NMCHANGEITEMCHECKBOX +{ + NMHDR nmhdr; + DWORD OldState; + DWORD NewState; + DWORD CheckBox; + BOOL Checked; +} NMCHANGEITEMCHECKBOX, *PNMCHANGEITEMCHECKBOX; + BOOL RegisterCheckListControl(HINSTANCE hInstance); _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-07-14 21:07:14 UTC (rev 16568) +++ trunk/reactos/lib/aclui/checklist.c 2005-07-14 21:57:57 UTC (rev 16569) @@ -95,6 +95,31 @@ /*********************************************************************** *******/ +static LRESULT +NotifyControlParent(IN PCHECKLISTWND infoPtr, + IN UINT code, + IN OUT PVOID data) +{ + LRESULT Ret = 0; + + if (infoPtr->hNotify != NULL) + { + LPNMHDR pnmh = (LPNMHDR)data; + + pnmh->hwndFrom = infoPtr->hSelf; + pnmh->idFrom = GetWindowLongPtr(infoPtr->hSelf, + GWLP_ID); + pnmh->code = code; + + Ret = SendMessage(infoPtr->hNotify, + WM_NOTIFY, + (WPARAM)pnmh->idFrom, + (LPARAM)pnmh); + } + + return Ret; +} + static PCHECKITEM FindCheckItemByIndex(IN PCHECKLISTWND infoPtr, IN UINT Index) @@ -1181,20 +1206,29 @@ } #endif -static VOID +static BOOL ChangeCheckBox(IN PCHECKLISTWND infoPtr, IN PCHECKITEM CheckItem, IN UINT CheckItemBox) { - DWORD NewState, OldState = CheckItem->State; + NMCHANGEITEMCHECKBOX CheckData; + DWORD OldState = CheckItem->State; DWORD CheckedBit = ((infoPtr->FocusedCheckItemBox == CLB_DENY) ? CIS_DENY : CIS_ALLOW); BOOL Checked = (CheckItem->State & CheckedBit) != 0; - NewState = (Checked ? OldState & ~CheckedBit : OldState | CheckedBit); + CheckData.OldState = OldState; + CheckData.NewState = (Checked ? OldState & ~CheckedBit : OldState | CheckedBit); + CheckData.CheckBox = infoPtr->FocusedCheckItemBox; + CheckData.Checked = !Checked; - /* FIXME - send a notification message */ - - CheckItem->State = NewState; + if (NotifyControlParent(infoPtr, + CLN_CHANGINGITEMCHECKBOX, + &CheckData) != (LRESULT)-1) + { + CheckItem->State = CheckData.NewState; + } + + return (CheckItem->State != OldState); } static VOID @@ -2118,9 +2152,20 @@ if (PtItem == infoPtr->FocusedCheckItem && InCheckBox && PtItemBox == infoPtr->FocusedCheckItemBox) { - ChangeCheckBox(infoPtr, - PtItem, - PtItemBox); + UINT OtherBox = ((PtItemBox == CLB_ALLOW) ? CLB_DENY : CLB_ALLOW); + DWORD OtherStateMask = ((OtherBox == CLB_ALLOW) ? + (CIS_ALLOW | CIS_ALLOWDISABLED) : + (CIS_DENY | CIS_DENYDISABLED)); + DWORD OtherStateOld = PtItem->State & OtherStateMask; + if (ChangeCheckBox(infoPtr, + PtItem, + PtItemBox) && + ((PtItem->State & OtherStateMask) != OtherStateOld)) + { + UpdateCheckItemBox(infoPtr, + infoPtr->FocusedCheckItem, + OtherBox); + } } UpdateCheckItemBox(infoPtr, @@ -2173,16 +2218,32 @@ if (infoPtr->FocusedCheckItem != NULL && infoPtr->QuickSearchHitItem == NULL) { + UINT OtherBox; + DWORD OtherStateMask; + DWORD OtherStateOld; + MakeCheckItemVisible(infoPtr, infoPtr->FocusedCheckItem); - ChangeCheckBox(infoPtr, - infoPtr->FocusedCheckItem, - infoPtr->FocusedCheckItemBox); - - UpdateCheckItemBox(infoPtr, + OtherBox = ((infoPtr->FocusedCheckItemBox == CLB_ALLOW) ? CLB_DENY : CLB_ALLOW); + OtherStateMask = ((OtherBox == CLB_ALLOW) ? + (CIS_ALLOW | CIS_ALLOWDISABLED) : + (CIS_DENY | CIS_DENYDISABLED)); + OtherStateOld = infoPtr->FocusedCheckItem->State & OtherStateMask; + if (ChangeCheckBox(infoPtr, infoPtr->FocusedCheckItem, - infoPtr->FocusedCheckItemBox); + infoPtr->FocusedCheckItemBox)) + { + UpdateCheckItemBox(infoPtr, + infoPtr->FocusedCheckItem, + infoPtr->FocusedCheckItemBox); + if ((infoPtr->FocusedCheckItem->State & OtherStateMask) != OtherStateOld) + { + UpdateCheckItemBox(infoPtr, + infoPtr->FocusedCheckItem, + OtherBox); + } + } } } break; @@ -2236,15 +2297,29 @@ infoPtr->FocusedCheckItem != NULL && infoPtr->FocusedPushed) { + UINT OtherBox = ((infoPtr->FocusedCheckItemBox == CLB_ALLOW) ? CLB_DENY : CLB_ALLOW); + DWORD OtherStateMask = ((OtherBox == CLB_ALLOW) ? + (CIS_ALLOW | CIS_ALLOWDISABLED) : + (CIS_DENY | CIS_DENYDISABLED)); + DWORD OtherStateOld = infoPtr->FocusedCheckItem->State & OtherStateMask; + infoPtr->FocusedPushed = FALSE; - ChangeCheckBox(infoPtr, - infoPtr->FocusedCheckItem, - infoPtr->FocusedCheckItemBox); + if (ChangeCheckBox(infoPtr, + infoPtr->FocusedCheckItem, + infoPtr->FocusedCheckItemBox)) + { + UpdateCheckItemBox(infoPtr, + infoPtr->FocusedCheckItem, + infoPtr->FocusedCheckItemBox); - UpdateCheckItemBox(infoPtr, - infoPtr->FocusedCheckItem, - infoPtr->FocusedCheckItemBox); + if ((infoPtr->FocusedCheckItem->State & OtherStateMask) != OtherStateOld) + { + UpdateCheckItemBox(infoPtr, + infoPtr->FocusedCheckItem, + OtherBox); + } + } } break; } @@ -2566,15 +2641,15 @@ { WNDCLASS wc; - ZeroMemory(&wc, sizeof(WNDCLASS)); - wc.style = CS_DBLCLKS; wc.lpfnWndProc = CheckListWndProc; wc.cbClsExtra = 0; wc.cbWndExtra = sizeof(PCHECKLISTWND); wc.hInstance = hInstance; + wc.hIcon = NULL; wc.hCursor = LoadCursor(0, (LPWSTR)IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wc.lpszMenuName = NULL; wc.lpszClassName = L"CHECKLIST_ACLUI"; return RegisterClass(&wc) != 0;

19 years, 3 months

[hbirr] 16568: Mark the DispatchingListEntry as removed (in MsqSendMessage).

by hbirr＠svn.reactos.com

Mark the DispatchingListEntry as removed (in MsqSendMessage). Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-07-14 20:51:39 UTC (rev 16567) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-07-14 21:07:14 UTC (rev 16568) @@ -1117,6 +1117,7 @@ Message->CompletionEvent = NULL; Message->Result = NULL; RemoveEntryList(&Message->DispatchingListEntry); + Message->DispatchingListEntry.Flink = NULL; break; } Entry = Entry->Flink; @@ -1174,6 +1175,7 @@ Message->CompletionEvent = NULL; Message->Result = NULL; RemoveEntryList(&Message->DispatchingListEntry); + Message->DispatchingListEntry.Flink = NULL; break; } Entry = Entry->Flink;

19 years, 3 months

[greatlrd] 16567: fix the second bug for 1>text.txt pipe

by greatlrd＠svn.reactos.com

fix the second bug for 1>text.txt pipe Modified: trunk/reactos/subsys/system/cmd/redir.c _____ Modified: trunk/reactos/subsys/system/cmd/redir.c --- trunk/reactos/subsys/system/cmd/redir.c 2005-07-14 20:26:37 UTC (rev 16566) +++ trunk/reactos/subsys/system/cmd/redir.c 2005-07-14 20:51:39 UTC (rev 16567) @@ -128,13 +128,57 @@ *ofn++ = *sp++; *ofn = _T('\0'); } - else if ((*sp == _T('1')) || (*sp == _T('2'))) + + else if (*sp == _T('1')) { /* error redirection */ sp++; if (*sp == _T('>')) { + /* output redirection */ + *lpnFlags |= OUTPUT_REDIRECTION; + sp++; + + /* append request ? */ + if (*sp == _T('>')) + { + *lpnFlags |= OUTPUT_APPEND; + sp++; + } + + while (_istspace (*sp)) + sp++; + + /* copy file name */ + while (*sp && !IsRedirection (*sp) && !_istspace (*sp)) + *ofn++ = *sp++; + *ofn = _T('\0'); + } + else + { + /* no redirection!! copy the '1' character! */ + sp--; + *dp++ = *sp++; + continue; + } + + while (_istspace (*sp)) + sp++; + + /* copy file name */ + while (*sp && !IsRedirection (*sp) && !_istspace (*sp)) + *efn++ = *sp++; + *efn = _T('\0'); + } + + else if (*sp == _T('2')) + { + /* error redirection */ + sp++; + + if (*sp == _T('>')) + { *lpnFlags |= ERROR_REDIRECTION; sp++; @@ -147,7 +191,7 @@ } else { - /* no redirection!! copy the '1' or '2' character! */ + /* no redirection!! copy the '2' character! */ sp--; *dp++ = *sp++; continue;

19 years, 3 months

[greatlrd] 16566: fix echo osd 1>text: bug now it should pipe instead it is printing text out text on the screen. need to found the second bug now. but now this pipe are implement.

by greatlrd＠svn.reactos.com

fix echo osd 1>text: bug now it should pipe instead it is printing text out text on the screen. need to found the second bug now. but now this pipe are implement. Modified: trunk/reactos/subsys/system/cmd/redir.c _____ Modified: trunk/reactos/subsys/system/cmd/redir.c --- trunk/reactos/subsys/system/cmd/redir.c 2005-07-14 19:19:09 UTC (rev 16565) +++ trunk/reactos/subsys/system/cmd/redir.c 2005-07-14 20:26:37 UTC (rev 16566) @@ -90,7 +90,7 @@ *dp++ = *sp++; } else if ((*sp == _T('<')) || (*sp == _T('>')) || - (*sp == _T('2')) || (*sp == _T('&'))) + (*sp == _T('1')) || (*sp == _T('2')) || (*sp == _T('&'))) { /* MS-DOS ignores multiple redirection symbols and uses the last */ /* redirection, so we'll emulate that and not check */ @@ -128,7 +128,7 @@ *ofn++ = *sp++; *ofn = _T('\0'); } - else if (*sp == _T('2')) + else if ((*sp == _T('1')) || (*sp == _T('2'))) { /* error redirection */ sp++; @@ -147,7 +147,7 @@ } else { - /* no redirection!! copy the '2' character! */ + /* no redirection!! copy the '1' or '2' character! */ sp--; *dp++ = *sp++; continue; @@ -198,6 +198,7 @@ else *dp++ = *sp++; } + *dp++ = _T('\0'); *dp = _T('\0');

19 years, 3 months

[robertk] 16565: version info for rc1 build

by robertk＠svn.reactos.com

version info for rc1 build Modified: branches/ros-branch-0_2_7/reactos/include/reactos/version.h _____ Modified: branches/ros-branch-0_2_7/reactos/include/reactos/version.h --- branches/ros-branch-0_2_7/reactos/include/reactos/version.h 2005-07-14 19:18:37 UTC (rev 16564) +++ branches/ros-branch-0_2_7/reactos/include/reactos/version.h 2005-07-14 19:19:09 UTC (rev 16565) @@ -18,11 +18,11 @@ #define __VERSION_H #define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 3 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MINOR 2 +#define KERNEL_VERSION_PATCH_LEVEL 7 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ -#define KERNEL_VERSION_BUILD_TYPE L"SVN" +#define KERNEL_VERSION_BUILD_TYPE L"RC1" #endif

19 years, 3 months

[greatlrd] 16564: std_output does handle the : as ms does at pipe and we have also extend it to handle >test.txt: that is not vaild on ms but it should need more code to handle the : as ms does. we can call it reactos extend at cmd

by greatlrd＠svn.reactos.com

std_output does handle the : as ms does at pipe and we have also extend it to handle >test.txt: that is not vaild on ms but it should need more code to handle the : as ms does. we can call it reactos extend at cmd Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-07-14 18:39:07 UTC (rev 16563) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-14 19:18:37 UTC (rev 16564) @@ -641,17 +641,21 @@ HANDLE hFile; SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; + /* we need make sure the LastError msg is zero before calling CreateFile */ + SetLastError(0); + + /* Set up pipe for the standard input handler */ hFile = CreateFile (in, GENERIC_READ, FILE_SHARE_READ, &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) - { + { LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, in); return; } if (!SetStdHandle (STD_INPUT_HANDLE, hFile)) - { + { LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, in); return; @@ -668,9 +672,7 @@ while (num-- > 1) { SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; - - /* Create unique temporary file name */ GetTempFileName (szTempPath, _T("CMD"), 0, szFileName[1]); @@ -682,7 +684,7 @@ TRUNCATE_EXISTING, FILE_ATTRIBUTE_TEMPORARY, NULL); if (hFile[1] == INVALID_HANDLE_VALUE) - { + { LoadString(CMD_ModuleHandle, STRING_CMD_ERROR2, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg); return; @@ -715,6 +717,9 @@ _tcscpy (szFileName[0], szFileName[1]); *szFileName[1] = _T('\0'); + /* we need make sure the LastError msg is zero before calling CreateFile */ + SetLastError(0); + /* open new stdin file */ hFile[0] = CreateFile (szFileName[0], GENERIC_READ, 0, &sa, OPEN_EXISTING, FILE_ATTRIBUTE_TEMPORARY, NULL); @@ -730,15 +735,37 @@ /* Final output to here */ HANDLE hFile; SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; + + /* we need make sure the LastError msg is zero before calling CreateFile */ + SetLastError(0); - hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_READ, &sa, + hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_READ, &sa, (nRedirFlags & OUTPUT_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile == INVALID_HANDLE_VALUE) + + if (hFile == INVALID_HANDLE_VALUE) { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, out); - return; + INT size = _tcslen(out)-1; + + if (out[size] != _T(':')) + { + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg, out); + return; + } + + out[size]=_T('\0'); + hFile = CreateFile (out, GENERIC_WRITE, FILE_SHARE_READ, &sa, + (nRedirFlags & OUTPUT_APPEND) ? OPEN_ALWAYS : CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + + if (hFile == INVALID_HANDLE_VALUE) + { + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR3, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg, out); + return; + } + } if (!SetStdHandle (STD_OUTPUT_HANDLE, hFile))

19 years, 3 months

[greatlrd] 16563: Change some error msg from ConErr to ConOut for they are being pipe so the behover are equal with ms windows cmd

by greatlrd＠svn.reactos.com

Change some error msg from ConErr to ConOut for they are being pipe so the behover are equal with ms windows cmd Modified: trunk/reactos/subsys/system/cmd/error.c _____ Modified: trunk/reactos/subsys/system/cmd/error.c --- trunk/reactos/subsys/system/cmd/error.c 2005-07-14 18:16:57 UTC (rev 16562) +++ trunk/reactos/subsys/system/cmd/error.c 2005-07-14 18:39:07 UTC (rev 16563) @@ -49,14 +49,14 @@ NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&szError, 0, NULL)) { - ConErrPrintf (_T("%s %s\n"), szError, szMessage); + ConOutPrintf (_T("%s %s\n"), szError, szMessage); LocalFree (szError); return; } else { LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, dwErrorCode); + ConOutPrintf(szMsg, dwErrorCode); return; } @@ -78,14 +78,14 @@ default: LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); + ConOutPrintf(szMsg); return; } if (szFormat) - ConErrPrintf (_T("%s -- %s\n"), szMsg, szMessage); + ConOutPrintf (_T("%s -- %s\n"), szMsg, szMessage); else - ConErrPrintf (_T("%s\n"), szMsg); + ConOutPrintf (_T("%s\n"), szMsg); #endif } @@ -94,7 +94,7 @@ TCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString(CMD_ModuleHandle, STRING_ERROR_PARAMETERF_ERROR, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, ch); + ConOutPrintf(szMsg, ch); } @@ -103,7 +103,7 @@ TCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_SWITCH, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, ch); + ConOutPrintf(szMsg, ch); } @@ -112,20 +112,20 @@ TCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString(CMD_ModuleHandle, STRING_ERROR_TOO_MANY_PARAMETERS, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, s); + ConOutPrintf(szMsg, s); } VOID error_path_not_found (VOID) { - ConErrResPuts(STRING_ERROR_PATH_NOT_FOUND); + ConOutResPuts(STRING_ERROR_PATH_NOT_FOUND); nErrorLevel = 1; } VOID error_file_not_found (VOID) { - ConErrResPuts(STRING_ERROR_FILE_NOT_FOUND); + ConOutResPuts(STRING_ERROR_FILE_NOT_FOUND); nErrorLevel = 1; } @@ -135,20 +135,20 @@ TCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString(CMD_ModuleHandle, STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(_T("%s - %s\n"), szMsg, f); + ConOutPrintf(_T("%s - %s\n"), szMsg, f); nErrorLevel = 1; } VOID error_req_param_missing (VOID) { - ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING); + ConOutResPuts(STRING_ERROR_REQ_PARAM_MISSING); } VOID error_invalid_drive (VOID) { - ConErrResPuts(STRING_ERROR_INVALID_DRIVE); + ConOutResPuts(STRING_ERROR_INVALID_DRIVE); } @@ -173,7 +173,7 @@ VOID error_invalid_parameter_format (LPTSTR s) { - ConErrResPuts(STRING_ERROR_INVALID_PARAM_FORMAT); + ConOutResPuts(STRING_ERROR_INVALID_PARAM_FORMAT); }

19 years, 3 months

[greatlrd] 16562: Fix a weird bug in piping in some case if you pipe to no exists >pipe: then to a exists >pipe: it did make cmd crash for createfile only SetLastErrror when it fails. and the old one was in the loop. to solv it is to rest the GetLastError code before it is call.

by greatlrd＠svn.reactos.com

Fix a weird bug in piping in some case if you pipe to no exists >pipe: then to a exists >pipe: it did make cmd crash for createfile only SetLastErrror when it fails. and the old one was in the loop. to solv it is to rest the GetLastError code before it is call. Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-07-14 14:51:35 UTC (rev 16561) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-14 18:16:57 UTC (rev 16562) @@ -669,14 +669,20 @@ { SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE}; - /* Create unique temporary file name */ + + + /* Create unique temporary file name */ GetTempFileName (szTempPath, _T("CMD"), 0, szFileName[1]); + /* we need make sure the LastError msg is zero before calling CreateFile */ + SetLastError(0); + /* Set current stdout to temporary file */ hFile[1] = CreateFile (szFileName[1], GENERIC_WRITE, 0, &sa, TRUNCATE_EXISTING, FILE_ATTRIBUTE_TEMPORARY, NULL); - if (hFile[1] == INVALID_HANDLE_VALUE) - { + + if (hFile[1] == INVALID_HANDLE_VALUE) + { LoadString(CMD_ModuleHandle, STRING_CMD_ERROR2, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg); return;

19 years, 3 months

← Newer
1
...
33
34
35
36
37
38
39
...
57
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 July 2005