Ros-diffs September 2016

ros-diffs@reactos.org

18 participants
342 discussions

[tfaber] 72800: [NTOS:PO] - Protect against invalid user mode pointers in NtPowerInformation

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Sep 25 13:46:18 2016 New Revision: 72800 URL: http://svn.reactos.org/svn/reactos?rev=72800&view=rev Log: [NTOS:PO] - Protect against invalid user mode pointers in NtPowerInformation Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=72… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sun Sep 25 13:46:18 2016 @@ -657,6 +657,7 @@ IN ULONG OutputBufferLength) { NTSTATUS Status; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); PAGED_CODE(); @@ -666,6 +667,20 @@ InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength); + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + ProbeForRead(InputBuffer, InputBufferLength, 1); + ProbeForWrite(OutputBuffer, OutputBufferLength, sizeof(ULONG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + switch (PowerInformationLevel) { case SystemBatteryState: @@ -677,11 +692,20 @@ if (OutputBufferLength < sizeof(SYSTEM_BATTERY_STATE)) return STATUS_BUFFER_TOO_SMALL; - /* Just zero the struct (and thus set BatteryState->BatteryPresent = FALSE) */ - RtlZeroMemory(BatteryState, sizeof(SYSTEM_BATTERY_STATE)); - BatteryState->EstimatedTime = MAXULONG; - - Status = STATUS_SUCCESS; + _SEH2_TRY + { + /* Just zero the struct (and thus set BatteryState->BatteryPresent = FALSE) */ + RtlZeroMemory(BatteryState, sizeof(SYSTEM_BATTERY_STATE)); + BatteryState->EstimatedTime = MAXULONG; + + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + break; } @@ -694,11 +718,20 @@ if (OutputBufferLength < sizeof(SYSTEM_POWER_CAPABILITIES)) return STATUS_BUFFER_TOO_SMALL; - /* Just zero the struct (and thus set BatteryState->BatteryPresent = FALSE) */ - RtlZeroMemory(PowerCapabilities, sizeof(SYSTEM_POWER_CAPABILITIES)); - //PowerCapabilities->SystemBatteriesPresent = 0; - - Status = STATUS_SUCCESS; + _SEH2_TRY + { + /* Just zero the struct (and thus set PowerCapabilities->SystemBatteriesPresent = FALSE) */ + RtlZeroMemory(PowerCapabilities, sizeof(SYSTEM_POWER_CAPABILITIES)); + //PowerCapabilities->SystemBatteriesPresent = 0; + + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + break; } @@ -711,14 +744,23 @@ if (OutputBufferLength < sizeof(PROCESSOR_POWER_INFORMATION)) return STATUS_BUFFER_TOO_SMALL; - PowerInformation->Number = 0; - PowerInformation->MaxMhz = 1000; - PowerInformation->CurrentMhz = 1000; - PowerInformation->MhzLimit = 1000; - PowerInformation->MaxIdleState = 0; - PowerInformation->CurrentIdleState = 0; - - Status = STATUS_SUCCESS; + _SEH2_TRY + { + PowerInformation->Number = 0; + PowerInformation->MaxMhz = 1000; + PowerInformation->CurrentMhz = 1000; + PowerInformation->MhzLimit = 1000; + PowerInformation->MaxIdleState = 0; + PowerInformation->CurrentIdleState = 0; + + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + break; }

7 years, 12 months

[dchapyshev] 72799: [NTOS:PO] Stubpliment ProcessorInformation case in NtPowerInformation. Fixes 1 test for ntdll:info

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Sep 25 13:03:06 2016 New Revision: 72799 URL: http://svn.reactos.org/svn/reactos?rev=72799&view=rev Log: [NTOS:PO] Stubpliment ProcessorInformation case in NtPowerInformation. Fixes 1 test for ntdll:info Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=72… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sun Sep 25 13:03:06 2016 @@ -697,6 +697,26 @@ /* Just zero the struct (and thus set BatteryState->BatteryPresent = FALSE) */ RtlZeroMemory(PowerCapabilities, sizeof(SYSTEM_POWER_CAPABILITIES)); //PowerCapabilities->SystemBatteriesPresent = 0; + + Status = STATUS_SUCCESS; + break; + } + + case ProcessorInformation: + { + PPROCESSOR_POWER_INFORMATION PowerInformation = (PPROCESSOR_POWER_INFORMATION)OutputBuffer; + + if (InputBuffer != NULL) + return STATUS_INVALID_PARAMETER; + if (OutputBufferLength < sizeof(PROCESSOR_POWER_INFORMATION)) + return STATUS_BUFFER_TOO_SMALL; + + PowerInformation->Number = 0; + PowerInformation->MaxMhz = 1000; + PowerInformation->CurrentMhz = 1000; + PowerInformation->MhzLimit = 1000; + PowerInformation->MaxIdleState = 0; + PowerInformation->CurrentIdleState = 0; Status = STATUS_SUCCESS; break;

7 years, 12 months

[bfreisen] 72798: [ATL] atltime.h: fix assertion: hours of a day are in the range 0-23, not 0-59

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Sun Sep 25 09:33:56 2016 New Revision: 72798 URL: http://svn.reactos.org/svn/reactos?rev=72798&view=rev Log: [ATL] atltime.h: fix assertion: hours of a day are in the range 0-23, not 0-59 Modified: trunk/reactos/sdk/lib/atl/atltime.h Modified: trunk/reactos/sdk/lib/atl/atltime.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atltime.h?rev=… ============================================================================== --- trunk/reactos/sdk/lib/atl/atltime.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/atltime.h [iso-8859-1] Sun Sep 25 09:33:56 2016 @@ -35,7 +35,7 @@ CTimeSpan(LONG lDays, int nHours, int nMins, int nSecs) throw() { - ATLASSERT(lDays >= 0 && nHours >= 0 && nHours <= 59 && nMins >= 0 && nMins <= 59 && nSecs >= 0 && nSecs <= 59); + ATLASSERT(lDays >= 0 && nHours >= 0 && nHours <= 23 && nMins >= 0 && nMins <= 59 && nSecs >= 0 && nSecs <= 59); m_nSpan = ((((LONGLONG)lDays) * 24 + nHours) * 60 + nMins) * 60 + nSecs; }

7 years, 12 months

[tfaber] 72797: [RTL] - Avoid dereferencing a NULL pointer in RtlIsTextUnicode CORE-12027 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Sep 25 08:25:45 2016 New Revision: 72797 URL: http://svn.reactos.org/svn/reactos?rev=72797&view=rev Log: [RTL] - Avoid dereferencing a NULL pointer in RtlIsTextUnicode CORE-12027 #resolve Modified: trunk/reactos/sdk/lib/rtl/unicode.c Modified: trunk/reactos/sdk/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/unicode.c?rev=… ============================================================================== --- trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] Sun Sep 25 08:25:45 2016 @@ -1367,7 +1367,7 @@ else weight = 1; - if (*pf && (*pf & IS_TEXT_UNICODE_DBCS_LEADBYTE)) + if (flags & IS_TEXT_UNICODE_DBCS_LEADBYTE) out_flags |= IS_TEXT_UNICODE_DBCS_LEADBYTE; } }

7 years, 12 months

[hbelusca] 72796: [EVENTVWR]: Turkish translation update by Erdem Ersoy. CORE-12031 #resolve #comment Committed, thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 24 23:21:05 2016 New Revision: 72796 URL: http://svn.reactos.org/svn/reactos?rev=72796&view=rev Log: [EVENTVWR]: Turkish translation update by Erdem Ersoy. CORE-12031 #resolve #comment Committed, thanks! Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] Sat Sep 24 23:21:05 2016 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/eventvwr/lang/tr-TR.rc * PURPOSE: Turkish Language File for ReactOS Event Viewer - * TRANSLATOR: 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + * TRANSLATOR: 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -12,28 +12,28 @@ BEGIN POPUP "&KayÄ±t" BEGIN - MENUITEM "&Open...", IDM_OPEN_EVENTLOG + MENUITEM "&AÃ§...", IDM_OPEN_EVENTLOG MENUITEM "&Olay KaydÄ±nÄ± AyrÄ± Sakla...", IDM_SAVE_EVENTLOG - MENUITEM "Close", IDM_CLOSE_EVENTLOG + MENUITEM "Kapat", IDM_CLOSE_EVENTLOG MENUITEM SEPARATOR MENUITEM "&TÃ¼m OlaylarÄ± Sil", IDM_CLEAR_EVENTS - MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG - MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + MENUITEM "&Yeniden AlandÄ±r\tF2", IDM_RENAME_EVENTLOG + MENUITEM "&KayÄ±t AyarlarÄ±...", IDM_EVENTLOG_SETTINGS MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å", IDM_EXIT END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN - MENUITEM "&Newest first", IDM_LIST_NEWEST - MENUITEM "&Oldest first", IDM_LIST_OLDEST + MENUITEM "&En Yeni En BaÅta", IDM_LIST_NEWEST + MENUITEM "E&n Eskisi En BaÅta", IDM_LIST_OLDEST MENUITEM SEPARATOR - MENUITEM "&Details...\tEnter", IDM_EVENT_DETAILS + MENUITEM "&AyrÄ±ntÄ±lar...\tEnter", IDM_EVENT_DETAILS MENUITEM SEPARATOR MENUITEM "&Yenile\tF5", IDM_REFRESH END POPUP "&SeÃ§enekler" BEGIN - MENUITEM "&Show event details view", IDM_SHOW_EVENT_DETAILS_VIEW + MENUITEM "&Olay AyrÄ±ntÄ±larÄ± GÃ¶rÃ¼nÃ¼mÃ¼yle GÃ¶ster", IDM_SHOW_EVENT_DETAILS_VIEW END POPUP "&YardÄ±m" BEGIN @@ -98,40 +98,40 @@ IDD_LOGPROPERTIES_GENERAL DIALOGEX 0, 0, 252, 234 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "General" +CAPTION "UmÃ»mÃ®" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Display name:", IDC_STATIC, 7, 9, 60, 8 + LTEXT "G&Ã¶rÃ¼nen Ad:", IDC_STATIC, 7, 9, 60, 8 EDITTEXT IDC_DISPLAYNAME, 67, 7, 178, 12, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "&Log name:", IDC_STATIC, 7, 25, 60, 8 + LTEXT "&KayÄ±t AdÄ±:", IDC_STATIC, 7, 25, 60, 8 EDITTEXT IDC_LOGNAME, 67, 23, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Log &file:", IDC_STATIC, 7, 41, 60, 8 + LTEXT "K&ayÄ±t KÃ¼tÃ¼ÄÃ¼:", IDC_STATIC, 7, 41, 60, 8 EDITTEXT IDC_LOGFILE, 67, 39, 178, 12, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - LTEXT "Size:", IDC_STATIC, 7, 57, 60, 8 + LTEXT "Boyut:", IDC_STATIC, 7, 57, 60, 8 EDITTEXT IDC_SIZE_LABEL, 67, 57, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Created:", IDC_STATIC, 7, 69, 60, 8 + LTEXT "OluÅturuldu:", IDC_STATIC, 7, 69, 60, 8 EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Modified:", IDC_STATIC, 7, 81, 60, 8 + LTEXT "DeÄiÅtirildi:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessed:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "EriÅildi:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - GROUPBOX "Log size", IDC_STATIC, 7, 106, 238, 99 - LTEXT "&Maximum log size:", IDC_STATIC, 17, 122, 58, 8 + GROUPBOX "KayÄ±t Boyutu", IDC_STATIC, 7, 106, 238, 99 + LTEXT "&En Ãok KayÄ±t Boyutu:", IDC_STATIC, 17, 122, 58, 8 EDITTEXT IDC_EDIT_MAXLOGSIZE, 80, 119, 40, 14, ES_LEFT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_MAXLOGSIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 120, 119, 10, 14 LTEXT "KB", IDC_STATIC, 130, 122, 20, 8 - LTEXT "When maximum log size is reached:", IDC_STATIC, 17, 140, 219, 8 - CONTROL "&Overwrite events as needed", IDC_OVERWRITE_AS_NEEDED, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 155, 219, 10 - CONTROL "O&verwrite events older than", IDC_OVERWRITE_OLDER_THAN, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 168, 102, 10 + LTEXT "En Ã§ok kayÄ±t boyutuna eriÅildiÄi zaman:", IDC_STATIC, 17, 140, 219, 8 + CONTROL "&gerekli olduÄunda olaylarÄ±n Ã¼zerine yaz.", IDC_OVERWRITE_AS_NEEDED, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 155, 219, 10 + CONTROL "&Åundan daha eski olaylarÄ±n Ã¼zerine yaz.", IDC_OVERWRITE_OLDER_THAN, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 17, 168, 102, 10 EDITTEXT IDC_EDIT_EVENTS_AGE, 122, 165, 35, 14, ES_LEFT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_EVENTS_AGE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 157, 165, 10, 14 - LTEXT "days", IDC_STATIC, 162, 168, 20, 8 - CONTROL "Do &not overwrite events\n(clear log manually)", IDC_NO_OVERWRITE, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE | WS_GROUP | WS_TABSTOP, 17, 180, 143, 20 - PUSHBUTTON "&Restore Defaults", IDC_RESTOREDEFAULTS, 166, 183, 70, 14 - AUTOCHECKBOX "Using a lo&w-speed connection", IDC_LOW_SPEED_CONNECTION, 7, 217, 167, 10 - PUSHBUTTON "&Clear Log", ID_CLEARLOG, 195, 213, 50, 14 + LTEXT "gÃ¼n", IDC_STATIC, 162, 168, 20, 8 + CONTROL "&OlaylarÄ±n Ãzerine Yazma\n(Elle KayÄ±tlarÄ± Sil)", IDC_NO_OVERWRITE, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE | WS_GROUP | WS_TABSTOP, 17, 180, 143, 20 + PUSHBUTTON "Ã&n TanÄ±mlÄ±larÄ± Geri Getir", IDC_RESTOREDEFAULTS, 166, 183, 70, 14 + AUTOCHECKBOX "&DÃ¼ÅÃ¼k HÄ±zlÄ± Bir BaÄlantÄ± Kullan", IDC_LOW_SPEED_CONNECTION, 7, 217, 167, 10 + PUSHBUTTON "Ka&yÄ±tlarÄ± Sil", ID_CLEARLOG, 195, 213, 50, 14 END STRINGTABLE @@ -141,10 +141,10 @@ IDS_APP_TITLE_EX "%s - %s Oturum AÃ§ \\\\" IDS_STATUS_MSG "%s -> %lu olay var." IDS_LOADING_WAIT "Olay kayÄ±tlarÄ± yÃ¼kleniyor. LÃ¼tfen bekleyiniz..." - IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log." - IDS_EVENTLOG_SYSTEM "System Logs" - IDS_EVENTLOG_APP "Application Logs" - IDS_EVENTLOG_USER "User Logs" + IDS_NO_ITEMS "Bu gÃ¶rÃ¼nÃ¼mde gÃ¶rÃ¼ntÃ¼lenecek bir Ã¶Äe bile yok." // "No events in this log." + IDS_EVENTLOG_SYSTEM "Dizge KayÄ±tlarÄ±" + IDS_EVENTLOG_APP "Uygulama KayÄ±tlarÄ±" + IDS_EVENTLOG_USER "KullanÄ±cÄ± KayÄ±tlarÄ±" IDS_EVENTSTRINGIDNOTFOUND "( %s ) kaynaÄÄ±ndaki ( %lu ) olay kimliÄi iÃ§in aÃ§Ä±klama bulunamÄ±yor. Yerli bilgisayarda, uzak bilgisayardan iletileri gÃ¶rÃ¼ntÃ¼lemesi iÃ§in gerekli DeÄer Defteri bilgisi veyÃ¢ ileti DLL kÃ¼tÃ¼kleri olmayabilir.\n\nAÅaÄÄ±daki bilgi olayÄ±n parÃ§asÄ±dÄ±r:\n\n" IDS_CLEAREVENTS_MSG "Silmeden Ã¶nce bu olay kaydÄ±nÄ± saklamak ister misiniz?" IDS_SAVE_FILTER "Olay KaydÄ± (*.evt)\0*.evt\0" @@ -163,7 +163,7 @@ STRINGTABLE BEGIN - IDS_BYTES_FORMAT "bytes" // "%s bytes" + IDS_BYTES_FORMAT "bayt" // "%s bytes" // "%1!ls! (%2!ls! bytes)" END

7 years, 12 months

[bfreisen] 72795: [SDK][ATL] Add header atltime.h and prerequisites in atlsimpstr.h and atlstr.h. CORE-12023

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Sat Sep 24 18:01:49 2016 New Revision: 72795 URL: http://svn.reactos.org/svn/reactos?rev=72795&view=rev Log: [SDK][ATL] Add header atltime.h and prerequisites in atlsimpstr.h and atlstr.h. CORE-12023 Added: trunk/reactos/sdk/lib/atl/atltime.h (with props) Modified: trunk/reactos/sdk/lib/atl/atlsimpstr.h trunk/reactos/sdk/lib/atl/atlstr.h Modified: trunk/reactos/sdk/lib/atl/atlsimpstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlsimpstr.h?r… ============================================================================== --- trunk/reactos/sdk/lib/atl/atlsimpstr.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/atlsimpstr.h [iso-8859-1] Sat Sep 24 18:01:49 2016 @@ -234,6 +234,12 @@ return *this; } + CSimpleStringT& operator+=(XCHAR ch) + { + Append(&ch, 1); + return *this; + } + operator PCXSTR() const throw() { return m_pszData; @@ -362,6 +368,13 @@ { ATLASSERT(nNewLength >= 0); SetLength(nNewLength); + } + + void ReleaseBuffer(_In_ int nNewLength = -1) + { + if (nNewLength < 0) + nNewLength = StringLength(m_pszData); + ReleaseBufferSetLength(nNewLength); } bool IsEmpty() const throw() @@ -603,6 +616,12 @@ } }; + +#ifdef UNICODE +typedef CSimpleStringT<WCHAR> CSimpleString; +#else +typedef CSimpleStringT<CHAR> CSimpleString; +#endif } -#endif +#endif Modified: trunk/reactos/sdk/lib/atl/atlstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlstr.h?rev=7… ============================================================================== --- trunk/reactos/sdk/lib/atl/atlstr.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/atlstr.h [iso-8859-1] Sat Sep 24 18:01:49 2016 @@ -131,6 +131,15 @@ typedef CAtlStringA CStringA; +#ifdef UNICODE +typedef CAtlStringW CAtlString; +typedef CStringW CString; +#else +typedef CAtlStringA CAtlString; +typedef CStringA CString; +#endif + + } #endif Added: trunk/reactos/sdk/lib/atl/atltime.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atltime.h?rev=… ============================================================================== --- trunk/reactos/sdk/lib/atl/atltime.h (added) +++ trunk/reactos/sdk/lib/atl/atltime.h [iso-8859-1] Sat Sep 24 18:01:49 2016 @@ -0,0 +1,662 @@ +// PROJECT: ReactOS ATL CTime, CFileTime, CTimeSpan, CFileTimeSpan +// LICENSE: Public Domain +// PURPOSE: Provides compatibility to Microsoft ATL +// PROGRAMMERS: Benedikt Freisen + +#ifndef __ATLTIME_H__ +#define __ATLTIME_H__ + +// WARNING: Untested code + +#pragma once + +#include <atlcore.h> +#include <windows.h> +#include <atlstr.h> +#include <time.h> +#include <oledb.h> + +namespace ATL +{ + +class CTimeSpan +{ + __time64_t m_nSpan; +public: + CTimeSpan() throw() + { + // leave uninitialized + } + + CTimeSpan(__time64_t time) throw() + { + m_nSpan = time; + } + + CTimeSpan(LONG lDays, int nHours, int nMins, int nSecs) throw() + { + ATLASSERT(lDays >= 0 && nHours >= 0 && nHours <= 59 && nMins >= 0 && nMins <= 59 && nSecs >= 0 && nSecs <= 59); + m_nSpan = ((((LONGLONG)lDays) * 24 + nHours) * 60 + nMins) * 60 + nSecs; + } + + CString Format(LPCSTR pFormat) const + { + struct tm time; + _localtime64_s(&time, &m_nSpan); + CStringA strTime; + strftime(strTime.GetBuffer(256), 256, pFormat, &time); + strTime.ReleaseBuffer(); + return CString(strTime); + } + + CString Format(LPCTSTR pszFormat) const + { + struct tm time; + _localtime64_s(&time, &m_nSpan); + CString strTime; +#ifdef UNICODE + wcsftime(strTime.GetBuffer(256), 256, pszFormat, &time); +#else + strftime(strTime.GetBuffer(256), 256, pszFormat, &time); +#endif + strTime.ReleaseBuffer(); + return strTime; + } + + CString Format(UINT nID) const + { + struct tm time; + _localtime64_s(&time, &m_nSpan); + CString strFormat; + strFormat.LoadString(nID); + CString strTime; +#ifdef UNICODE + wcsftime(strTime.GetBuffer(256), 256, strFormat, &time); +#else + strftime(strTime.GetBuffer(256), 256, strFormat, &time); +#endif + strTime.ReleaseBuffer(); + return strTime; + } + + LONGLONG GetTotalHours() const throw() + { + return m_nSpan / 60 / 60; + } + + LONGLONG GetTotalMinutes() const throw() + { + return m_nSpan / 60; + } + + LONGLONG GetTotalSeconds() const throw() + { + return m_nSpan; + } + + LONGLONG GetDays() const throw() + { + return m_nSpan / 60 / 60 / 24; + } + + LONG GetHours() const throw() + { + return GetTotalHours() - GetDays() * 24; + } + + LONG GetMinutes() const throw() + { + return GetTotalMinutes() - GetTotalHours() * 60; + } + + LONG GetSeconds() const throw() + { + return GetTotalSeconds() - GetTotalMinutes() * 60; + } + + __time64_t GetTimeSpan() const throw() + { + return m_nSpan; + } + +// CArchive& Serialize64(CArchive& ar) // MFC only +// { +// // TODO +// } + +}; + +class CTime +{ + __time64_t m_nTime; +public: + CTime() throw() + { + // leave uninitialized + } + + CTime(__time64_t time) throw() + { + m_nTime = time; + } + + CTime(int nYear, int nMonth, int nDay, int nHour, int nMin, int nSec, int nDST = -1) + { + struct tm time; + time.tm_year = nYear; + time.tm_mon = nMonth; + time.tm_mday = nDay; + time.tm_hour = nHour; + time.tm_min = nMin; + time.tm_sec = nSec; + time.tm_isdst = nDST; + m_nTime = _mktime64(&time); + } + + CTime(WORD wDosDate, WORD wDosTime, int nDST = -1) + { + FILETIME ft; + DosDateTimeToFileTime(wDosDate, wDosTime, &ft); + SYSTEMTIME st; + FileTimeToSystemTime(&ft, &st); + struct tm time; + time.tm_year = st.wYear; + time.tm_mon = st.wMonth; + time.tm_wday = st.wDayOfWeek; + time.tm_hour = st.wHour; + time.tm_min = st.wMinute; + time.tm_sec = st.wSecond; + time.tm_isdst = nDST; + m_nTime = _mktime64(&time); + } + + CTime(const SYSTEMTIME& st, int nDST = -1) throw() + { + struct tm time; + time.tm_year = st.wYear; + time.tm_mon = st.wMonth; + time.tm_wday = st.wDayOfWeek; + time.tm_hour = st.wHour; + time.tm_min = st.wMinute; + time.tm_sec = st.wSecond; + time.tm_isdst = nDST; + m_nTime = _mktime64(&time); + } + + CTime(const FILETIME& ft, int nDST = -1) + { + SYSTEMTIME st; + FileTimeToSystemTime(&ft, &st); + struct tm time; + time.tm_year = st.wYear; + time.tm_mon = st.wMonth; + time.tm_wday = st.wDayOfWeek; + time.tm_hour = st.wHour; + time.tm_min = st.wMinute; + time.tm_sec = st.wSecond; + time.tm_isdst = nDST; + m_nTime = _mktime64(&time); + } + + CTime(const DBTIMESTAMP& dbts, int nDST = -1) throw() + { + struct tm time; + time.tm_year = dbts.year; + time.tm_mon = dbts.month; + time.tm_hour = dbts.hour; + time.tm_min = dbts.minute; + time.tm_sec = dbts.second; + time.tm_isdst = nDST; + m_nTime = _mktime64(&time); + } + + CString Format(LPCTSTR pszFormat) const + { + struct tm time; + _localtime64_s(&time, &m_nTime); + CString strTime; +#ifdef UNICODE + wcsftime(strTime.GetBuffer(256), 256, pszFormat, &time); +#else + strftime(strTime.GetBuffer(256), 256, pszFormat, &time); +#endif + strTime.ReleaseBuffer(); + return strTime; + } + + CString Format(UINT nFormatID) const + { + struct tm time; + _localtime64_s(&time, &m_nTime); + CString strFormat; + strFormat.LoadString(nFormatID); + CString strTime; +#ifdef UNICODE + wcsftime(strTime.GetBuffer(256), 256, strFormat, &time); +#else + strftime(strTime.GetBuffer(256), 256, strFormat, &time); +#endif + strTime.ReleaseBuffer(); + return strTime; + } + + CString FormatGmt(LPCTSTR pszFormat) const + { + struct tm time; + _gmtime64_s(&time, &m_nTime); + CString strTime; +#ifdef UNICODE + wcsftime(strTime.GetBuffer(256), 256, pszFormat, &time); +#else + strftime(strTime.GetBuffer(256), 256, pszFormat, &time); +#endif + strTime.ReleaseBuffer(); + return strTime; + } + + CString FormatGmt(UINT nFormatID) const + { + struct tm time; + _gmtime64_s(&time, &m_nTime); + CString strFormat; + strFormat.LoadString(nFormatID); + CString strTime; +#ifdef UNICODE + wcsftime(strTime.GetBuffer(256), 256, strFormat, &time); +#else + strftime(strTime.GetBuffer(256), 256, strFormat, &time); +#endif + strTime.ReleaseBuffer(); + return strTime; + } + + bool GetAsDBTIMESTAMP(DBTIMESTAMP& dbts) const throw() + { + struct tm time; + _gmtime64_s(&time, &m_nTime); + dbts.year = time.tm_year; + dbts.month = time.tm_mon; + dbts.day = time.tm_mday; + dbts.hour = time.tm_hour; + dbts.minute = time.tm_min; + dbts.second = time.tm_sec; + dbts.fraction = 0; + return true; // TODO: error handling? + } + + bool GetAsSystemTime(SYSTEMTIME& st) const throw() + { + struct tm time; + _gmtime64_s(&time, &m_nTime); + st.wYear = time.tm_year; + st.wMonth = time.tm_mon; + st.wDayOfWeek = time.tm_wday; + st.wDay = time.tm_mday; + st.wHour = time.tm_hour; + st.wMinute = time.tm_min; + st.wSecond = time.tm_sec; + st.wMilliseconds = 0; + return true; // TODO: error handling? + } + + static CTime WINAPI GetCurrentTime() throw() + { + __time64_t time; + _time64(&time); + return CTime(time); + } + + int GetDay() const throw() + { + struct tm time; + _localtime64_s(&time, &m_nTime); + return time.tm_mday; + } + + int GetDayOfWeek() const throw() + { + struct tm time; + _localtime64_s(&time, &m_nTime); + return time.tm_wday; + } + + struct tm* GetGmtTm(struct tm* ptm) const + { + _gmtime64_s(ptm, &m_nTime); + return ptm; + } + + int GetHour() const throw() + { + struct tm time; + _localtime64_s(&time, &m_nTime); + return time.tm_hour; + } + + struct tm* GetLocalTm(struct tm* ptm) const + { + _localtime64_s(ptm, &m_nTime); + return ptm; + } + + int GetMinute() const throw() + { + struct tm time; + _localtime64_s(&time, &m_nTime); + return time.tm_min; + } + + int GetMonth() const throw() + { + struct tm time; + _localtime64_s(&time, &m_nTime); + return time.tm_mon; + } + + int GetSecond() const throw() + { + struct tm time; + _localtime64_s(&time, &m_nTime); + return time.tm_sec; + } + + __time64_t GetTime() const throw() + { + return m_nTime; + } + + int GetYear() + { + struct tm time; + _localtime64_s(&time, &m_nTime); + return time.tm_year; + } + +// CArchive& Serialize64(CArchive& ar) // MFC only +// { +// // TODO +// } + + CTime operator+(CTimeSpan timeSpan) const throw() + { + return CTime(m_nTime + timeSpan.GetTimeSpan()); + } + + CTime operator-(CTimeSpan timeSpan) const throw() + { + return CTime(m_nTime - timeSpan.GetTimeSpan()); + } + + CTimeSpan operator-(CTime time) const throw() + { + return CTimeSpan(m_nTime - time.GetTime()); + } + + CTime& operator+=(CTimeSpan span) throw() + { + m_nTime += span.GetTimeSpan(); + return *this; + } + + CTime& operator-=(CTimeSpan span) throw() + { + m_nTime -= span.GetTimeSpan(); + return *this; + } + + CTime& operator=(__time64_t time) throw() + { + m_nTime = time; + return *this; + } + + bool operator==(CTime time) const throw() + { + return m_nTime == time.GetTime(); + } + + bool operator!=(CTime time) const throw() + { + return m_nTime != time.GetTime(); + } + + bool operator<(CTime time) const throw() + { + return m_nTime < time.GetTime(); + } + + bool operator>(CTime time) const throw() + { + return m_nTime > time.GetTime(); + } + + bool operator<=(CTime time) const throw() + { + return m_nTime <= time.GetTime(); + } + + bool operator>=(CTime time) const throw() + { + return m_nTime >= time.GetTime(); + } + +}; + +class CFileTimeSpan +{ + LONGLONG m_nSpan; +public: + CFileTimeSpan() throw() + { + m_nSpan = 0; + } + + CFileTimeSpan(const CFileTimeSpan& span) throw() + { + m_nSpan = span.GetTimeSpan(); + } + + CFileTimeSpan(LONGLONG nSpan) throw() + { + m_nSpan = nSpan; + } + + LONGLONG GetTimeSpan() const throw() + { + return m_nSpan; + } + + void SetTimeSpan(LONGLONG nSpan) throw() + { + m_nSpan = nSpan; + } + + CFileTimeSpan operator-(CFileTimeSpan span) const throw() + { + return CFileTimeSpan(m_nSpan - span.GetTimeSpan()); + } + + bool operator!=(CFileTimeSpan span) const throw() + { + return m_nSpan != span.GetTimeSpan(); + } + + CFileTimeSpan operator+(CFileTimeSpan span) const throw() + { + return CFileTimeSpan(m_nSpan + span.GetTimeSpan()); + } + + CFileTimeSpan& operator+=(CFileTimeSpan span) throw() + { + m_nSpan += span.GetTimeSpan(); + return *this; + } + + bool operator<(CFileTimeSpan span) const throw() + { + return m_nSpan < span.GetTimeSpan(); + } + + bool operator<=(CFileTimeSpan span) const throw() + { + return m_nSpan <= span.GetTimeSpan(); + } + + CFileTimeSpan& operator=(const CFileTimeSpan& span) throw() + { + m_nSpan = span.GetTimeSpan(); + return *this; + } + + CFileTimeSpan& operator-=(CFileTimeSpan span) throw() + { + m_nSpan -= span.GetTimeSpan(); + return *this; + } + + bool operator==(CFileTimeSpan span) const throw() + { + return m_nSpan == span.GetTimeSpan(); + } + + bool operator>(CFileTimeSpan span) const throw() + { + return m_nSpan > span.GetTimeSpan(); + } + + bool operator>=(CFileTimeSpan span) const throw() + { + return m_nSpan >= span.GetTimeSpan(); + } + +}; + +class CFileTime : public FILETIME +{ +public: + static const ULONGLONG Millisecond = 10000; + static const ULONGLONG Second = Millisecond * 1000; + static const ULONGLONG Minute = Second * 60; + static const ULONGLONG Hour = Minute * 60; + static const ULONGLONG Day = Hour * 24; + static const ULONGLONG Week = Day * 7; + + CFileTime() throw() + { + this->dwLowDateTime = 0; + this->dwHighDateTime = 0; + } + + CFileTime(const FILETIME& ft) throw() + { + this->dwLowDateTime = ft.dwLowDateTime; + this->dwHighDateTime = ft.dwHighDateTime; + } + + CFileTime(ULONGLONG nTime) throw() + { + this->dwLowDateTime = (DWORD) nTime; + this->dwHighDateTime = nTime >> 32; + } + + static CFileTime GetCurrentTime() throw() + { + FILETIME ft; + GetSystemTimeAsFileTime(&ft); + return CFileTime(ft); + } + + ULONGLONG GetTime() const throw() + { + return ((ULONGLONG)this->dwLowDateTime) | (((ULONGLONG)this->dwHighDateTime) << 32); + } + + CFileTime LocalToUTC() const throw() + { + FILETIME ft; + LocalFileTimeToFileTime(this, &ft); + return CFileTime(ft); + } + + void SetTime(ULONGLONG nTime) throw() + { + this->dwLowDateTime = (DWORD) nTime; + this->dwHighDateTime = nTime >> 32; + } + + CFileTime UTCToLocal() const throw() + { + FILETIME ft; + FileTimeToLocalFileTime(this, &ft); + return CFileTime(ft); + } + + CFileTime operator-(CFileTimeSpan span) const throw() + { + return CFileTime(this->GetTime() - span.GetTimeSpan()); + } + + CFileTimeSpan operator-(CFileTime ft) const throw() + { + return CFileTimeSpan(this->GetTime() - ft.GetTime()); + } + + bool operator!=(CFileTime ft) const throw() + { + return this->GetTime() != ft.GetTime(); + } + + CFileTime operator+(CFileTimeSpan span) const throw() + { + return CFileTime(this->GetTime() + span.GetTimeSpan()); + } + + CFileTime& operator+=(CFileTimeSpan span) throw() + { + this->SetTime(this->GetTime() + span.GetTimeSpan()); + return *this; + } + + bool operator<(CFileTime ft) const throw() + { + return this->GetTime() < ft.GetTime(); + } + + bool operator<=(CFileTime ft) const throw() + { + return this->GetTime() <= ft.GetTime(); + } + + CFileTime& operator=(const FILETIME& ft) throw() + { + this->dwLowDateTime = ft.dwLowDateTime; + this->dwHighDateTime = ft.dwHighDateTime; + return *this; + } + + CFileTime& operator-=(CFileTimeSpan span) throw() + { + this->SetTime(this->GetTime() - span.GetTimeSpan()); + return *this; + } + + bool operator==(CFileTime ft) const throw() + { + return this->GetTime() == ft.GetTime(); + } + + bool operator>(CFileTime ft) const throw() + { + return this->GetTime() > ft.GetTime(); + } + + bool operator>=(CFileTime ft) const throw() + { + return this->GetTime() >= ft.GetTime(); + } + +}; + +} // namespace ATL + +#endif Propchange: trunk/reactos/sdk/lib/atl/atltime.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/sdk/lib/atl/atltime.h ------------------------------------------------------------------------------ svn:mime-type = text/plain

7 years, 12 months

[mjansen] 72794: [MSGINA] Prevent an infinite loop in ShellDimScreen. CORE-12028

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Sep 24 14:15:23 2016 New Revision: 72794 URL: http://svn.reactos.org/svn/reactos?rev=72794&view=rev Log: [MSGINA] Prevent an infinite loop in ShellDimScreen. CORE-12028 Modified: trunk/reactos/dll/win32/msgina/dimmedwindow.cpp Modified: trunk/reactos/dll/win32/msgina/dimmedwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/dimmedwin… ============================================================================== --- trunk/reactos/dll/win32/msgina/dimmedwindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/dimmedwindow.cpp [iso-8859-1] Sat Sep 24 14:15:23 2016 @@ -104,7 +104,7 @@ { MSG msg; - while (!IsWindowVisible(m_hwnd)) + while (!IsWindowVisible(m_hwnd) && IsWindow(m_hwnd)) { while (::PeekMessage(&msg, m_hwnd, 0, 0, PM_REMOVE)) { @@ -261,6 +261,15 @@ pWindow->WaitForInit(); + if (!IsWindow(pWindow->Wnd())) + { + refcount = pWindow->AddRef(); + while (refcount) + refcount = pWindow->Release(); + + return E_FAIL; + } + _SEH2_TRY { hr = pWindow->QueryInterface(IID_IUnknown, pUnknown);

7 years, 12 months

[cwittich] 72793: [CRYPTNET] don't try to prepend a drive letter when there is one already

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Sep 24 12:19:35 2016 New Revision: 72793 URL: http://svn.reactos.org/svn/reactos?rev=72793&view=rev Log: [CRYPTNET] don't try to prepend a drive letter when there is one already Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] Sat Sep 24 12:19:35 2016 @@ -1025,8 +1025,11 @@ components.dwUrlPathLength + 1); hFile = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); -#ifndef __REACTOS__ - if (hFile == INVALID_HANDLE_VALUE) +#ifdef __REACTOS__ + if ((hFile == INVALID_HANDLE_VALUE) && (lstrlenW(components.lpszUrlPath) > 1) && (components.lpszUrlPath[1] != ':')) +#else + if ((hFile == INVALID_HANDLE_VALUE) +#endif { /* Try again on the current drive */ GetCurrentDirectoryW(components.dwUrlPathLength, path); @@ -1050,7 +1053,6 @@ } } } -#endif if (hFile != INVALID_HANDLE_VALUE) { if ((ret = CRYPT_GetObjectFromFile(hFile, pObject)))

7 years, 12 months

[cwittich] 72792: [CRYPTNET] disable broken code

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Sep 24 11:39:17 2016 New Revision: 72792 URL: http://svn.reactos.org/svn/reactos?rev=72792&view=rev Log: [CRYPTNET] disable broken code Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] Sat Sep 24 11:39:17 2016 @@ -1025,6 +1025,7 @@ components.dwUrlPathLength + 1); hFile = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); +#ifndef __REACTOS__ if (hFile == INVALID_HANDLE_VALUE) { /* Try again on the current drive */ @@ -1049,6 +1050,7 @@ } } } +#endif if (hFile != INVALID_HANDLE_VALUE) { if ((ret = CRYPT_GetObjectFromFile(hFile, pObject)))

7 years, 12 months

[janderwald] 72791: [LIBUSBAUDIO] - delete unused code

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Sep 24 11:24:07 2016 New Revision: 72791 URL: http://svn.reactos.org/svn/reactos?rev=72791&view=rev Log: [LIBUSBAUDIO] - delete unused code Removed: trunk/reactos/sdk/lib/drivers/sound/libusbaudio/

7 years, 12 months

← Newer
1
...
5
6
7
8
9
10
11
...
35
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 2016