Ros-diffs December 2015

ros-diffs@reactos.org

12 participants
252 discussions

[hbelusca] 70477: Happy New Year 2016 !! ☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆ ⋱★⋰⋱☆⋰⋱★⋰⋱☆⋰⋱☆⋰⋱★⋰⋱☆⋰⋱★⋰ ░░░░░░█░█ █▀█ █▀█ █▀█ █░█░░░░░░ ░░░░░░█▀█ █▀█ █▀▀ █▀▀ ▀█▀░░░░░░ ░░░░░░▀░▀ ▀░▀ ▀░░ ▀░░ ░▀░░░░░░░ █▄░█ ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 31 23:05:23 2015 New Revision: 70477 URL: http://svn.reactos.org/svn/reactos?rev=70477&view=rev Log: Happy New Year 2016 !! ☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆ ⋱★⋰⋱☆⋰⋱★⋰⋱☆⋰⋱☆⋰⋱★⋰⋱☆⋰⋱★⋰ ░░░░░░█░█ █▀█ █▀█ █▀█ █░█░░░░░░ ░░░░░░█▀█ █▀█ █▀▀ █▀▀ ▀█▀░░░░░░ ░░░░░░▀░▀ ▀░▀ ▀░░ ▀░░ ░▀░░░░░░░ █▄░█ █▀▀ █░█░█░░█░█ █▀▀ █▀█ █▀█ █░██ █▀▀ █░█░█░░▀█▀ █▀▀ █▀█ ██▀ ▀░░▀ ▀▀▀ ░▀▀▀░░░░▀░ ▀▀▀ ▀░▀ ▀░▀ ⋱☆⋰⋱★⋰⋱☆⋰⋱★⋰⋱★⋰⋱☆⋰⋱★⋰⋱☆⋰ ░░░▄████▄░▄███▄░░▄██░▄████▄░░░ ░░░▀▀░▄██░██░██░████░██▄▄▄░░░░ ░░░░▄██▀░░██░██░░░██░██░░██░░░ ░░░██████░▀███▀░░░██░▀████▀░░░ ☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆.¸¸.•´☆ Added: trunk/reactos/dll/win32/shell32/res/bitmaps/reactos.bmp - copied, changed from r70473, trunk/reactos/dll/win32/msgina/resources/reactos.bmp Modified: trunk/reactos/dll/win32/msgina/resources/reactos.bmp trunk/reactos/dll/win32/msgina/resources/reactos.svg trunk/reactos/include/reactos/version.cmake trunk/reactos/include/reactos/version.h.cmake trunk/reactos/ntoskrnl/inbv/logo/1.bmp Modified: trunk/reactos/dll/win32/msgina/resources/reactos.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/msgina/resources/reactos.svg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== --- trunk/reactos/dll/win32/msgina/resources/reactos.svg [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resources/reactos.svg [iso-8859-1] Thu Dec 31 23:05:23 2015 @@ -1930,7 +1930,7 @@ x="5.59375" y="1047.7255" style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#1e2122;fill-opacity:1;font-family:Lucida Sans Unicode;-inkscape-font-specification:Lucida Sans Unicode" - id="tspan3618">Copyright Â© 1996-2015 ReactOS Team & Contributors</tspan></text> + id="tspan3618">Copyright Â© 1996-2016 ReactOS Team & Contributors</tspan></text> <g transform="matrix(0.16958533,0,0,0.16958533,89.849943,981.79073)" id="g15501"> Copied: trunk/reactos/dll/win32/shell32/res/bitmaps/reactos.bmp (from r70473, trunk/reactos/dll/win32/msgina/resources/reactos.bmp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.cm… ============================================================================== --- trunk/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.cmake [iso-8859-1] Thu Dec 31 23:05:23 2015 @@ -19,7 +19,7 @@ set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "0") -set(COPYRIGHT_YEAR "2015") +set(COPYRIGHT_YEAR "2016") # KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) set(KERNEL_VERSION_BUILD_TYPE "SVN") Modified: trunk/reactos/include/reactos/version.h.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.h.… ============================================================================== --- trunk/reactos/include/reactos/version.h.cmake [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.h.cmake [iso-8859-1] Thu Dec 31 23:05:23 2015 @@ -25,7 +25,6 @@ /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ #define KERNEL_VERSION_BUILD_TYPE "@KERNEL_VERSION_BUILD_TYPE@" - #endif /* EOF */ Modified: trunk/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/1.bmp?r… ============================================================================== Binary files - no diff available.

8 years, 11 months

[ekohl] 70476: [INCLUDE] Fix a typo! :-/

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Dec 31 22:42:20 2015 New Revision: 70476 URL: http://svn.reactos.org/svn/reactos?rev=70476&view=rev Log: [INCLUDE] Fix a typo! :-/ Modified: trunk/reactos/include/reactos/libs/syssetup/syssetup.h Modified: trunk/reactos/include/reactos/libs/syssetup/syssetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sysse… ============================================================================== --- trunk/reactos/include/reactos/libs/syssetup/syssetup.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/syssetup/syssetup.h [iso-8859-1] Thu Dec 31 22:42:20 2015 @@ -50,7 +50,7 @@ #define TOWL1(p) TOWL2(p) #define TOWL2(p) L##p -#if (defined(_MSC_VER) +#if defined(_MSC_VER) #define LogItem(lpTag, lpMessageText, ...) \ pSetupDebugPrint(__WFILE__, __LINE__, lpTag, lpMessageText, __VA_ARGS__) #else

8 years, 11 months

[ekohl] 70475: [INCLUDE] Does this fix MSVC builds?

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Dec 31 22:39:12 2015 New Revision: 70475 URL: http://svn.reactos.org/svn/reactos?rev=70475&view=rev Log: [INCLUDE] Does this fix MSVC builds? Modified: trunk/reactos/include/reactos/libs/syssetup/syssetup.h Modified: trunk/reactos/include/reactos/libs/syssetup/syssetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sysse… ============================================================================== --- trunk/reactos/include/reactos/libs/syssetup/syssetup.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/syssetup/syssetup.h [iso-8859-1] Thu Dec 31 22:39:12 2015 @@ -50,8 +50,13 @@ #define TOWL1(p) TOWL2(p) #define TOWL2(p) L##p +#if (defined(_MSC_VER) +#define LogItem(lpTag, lpMessageText, ...) \ + pSetupDebugPrint(__WFILE__, __LINE__, lpTag, lpMessageText, __VA_ARGS__) +#else #define LogItem(lpTag, lpMessageText...) \ pSetupDebugPrint(__WFILE__, __LINE__, lpTag, lpMessageText) +#endif #endif /* __SYSSETUP_H_INCLUDED__ */

8 years, 11 months

[ekohl] 70474: [SYSETUP] - Implement pSetupDebugPrint and modify the LogItem macro accordingly. - Add some log messages to the setup wizard.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Dec 31 22:17:45 2015 New Revision: 70474 URL: http://svn.reactos.org/svn/reactos?rev=70474&view=rev Log: [SYSETUP] - Implement pSetupDebugPrint and modify the LogItem macro accordingly. - Add some log messages to the setup wizard. Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/logfile.c trunk/reactos/dll/win32/syssetup/syssetup.spec trunk/reactos/dll/win32/syssetup/wizard.c trunk/reactos/include/reactos/libs/syssetup/syssetup.h Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Thu Dec 31 22:17:45 2015 @@ -64,7 +64,7 @@ vsprintf(szBuffer, pszFmt, ap); va_end(ap); - LogItem(SYSSETUP_SEVERITY_FATAL_ERROR, L"Failed"); + LogItem(NULL, L"Failed"); strcat(szBuffer, "\nRebooting now!"); MessageBoxA(NULL, @@ -1097,7 +1097,7 @@ BOOL ret; InitializeSetupActionLog(FALSE); - LogItem(SYSSETUP_SEVERITY_INFORMATION, L"Installing ReactOS"); + LogItem(NULL, L"Installing ReactOS"); if (!InitializeProfiles()) { @@ -1194,7 +1194,7 @@ CloseHandle(hHotkeyThread); } - LogItem(SYSSETUP_SEVERITY_INFORMATION, L"Installing ReactOS done"); + LogItem(NULL, L"Installing ReactOS done"); TerminateSetupActionLog(); if (AdminInfo.Name != NULL) Modified: trunk/reactos/dll/win32/syssetup/logfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/logfile… ============================================================================== --- trunk/reactos/dll/win32/syssetup/logfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/logfile.c [iso-8859-1] Thu Dec 31 22:17:45 2015 @@ -27,10 +27,14 @@ /* INCLUDES *****************************************************************/ #include "precomp.h" +#include <stdarg.h> /* GLOBALS ******************************************************************/ HANDLE hLogFile = NULL; + +#define FORMAT_BUFFER_SIZE 512 +#define LINE_BUFFER_SIZE 1024 /* FUNCTIONS ****************************************************************/ @@ -85,64 +89,84 @@ } -BOOL WINAPI -SYSSETUP_LogItem(IN const LPSTR lpFileName, - IN DWORD dwLineNumber, - IN DWORD dwSeverity, - IN LPWSTR lpMessageText) +VOID +CDECL +pSetupDebugPrint( + IN PCWSTR pszFileName, + IN INT nLineNumber, + IN PCWSTR pszTag, + IN PCWSTR pszMessage, + ...) { - LPCSTR lpSeverityString; - LPSTR lpMessageString; - DWORD dwMessageLength; - DWORD dwMessageSize; + PWSTR pszFormatBuffer = NULL; + PWSTR pszLineBuffer = NULL; + PSTR pszOutputBuffer = NULL; + ULONG ulLineSize, ulOutputSize; DWORD dwWritten; - CHAR Buffer[6]; - CHAR TimeBuffer[30]; SYSTEMTIME stTime; + va_list args; - /* Get the severity code string */ - switch (dwSeverity) + if (hLogFile == NULL) + return; + + GetLocalTime(&stTime); + + if (pszMessage) { - case SYSSETUP_SEVERITY_INFORMATION: - lpSeverityString = "Information : "; - break; + pszFormatBuffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + FORMAT_BUFFER_SIZE * sizeof(WCHAR)); + if (pszFormatBuffer == NULL) + goto done; - case SYSSETUP_SEVERITY_WARNING: - lpSeverityString = "Warning : "; - break; - - case SYSSETUP_SEVERITY_ERROR: - lpSeverityString = "Error : "; - break; - - case SYSSETUP_SEVERITY_FATAL_ERROR: - lpSeverityString = "Fatal error : "; - break; - - default: - lpSeverityString = "Unknown : "; - break; + va_start(args, pszMessage); + vsnwprintf(pszFormatBuffer, + FORMAT_BUFFER_SIZE, + pszMessage, + args); + va_end(args); } + pszLineBuffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + LINE_BUFFER_SIZE * sizeof(WCHAR)); + if (pszLineBuffer == NULL) + goto done; + + _snwprintf(pszLineBuffer, + LINE_BUFFER_SIZE, + L"%02d/%02d/%04d %02d:%02d:%02d.%03d, %s, %d, %s, %s\r\n", + stTime.wMonth, + stTime.wDay, + stTime.wYear, + stTime.wHour, + stTime.wMinute, + stTime.wSecond, + stTime.wMilliseconds, + pszFileName ? pszFileName : L"", + nLineNumber, + pszTag ? pszTag : L"", + pszFormatBuffer ? pszFormatBuffer : L""); + /* Get length of the converted ansi string */ - dwMessageLength = wcslen(lpMessageText) * sizeof(WCHAR); - RtlUnicodeToMultiByteSize(&dwMessageSize, - lpMessageText, - dwMessageLength); + ulLineSize = wcslen(pszLineBuffer) * sizeof(WCHAR); + RtlUnicodeToMultiByteSize(&ulOutputSize, + pszLineBuffer, + ulLineSize); /* Allocate message string buffer */ - lpMessageString = (LPSTR) HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - dwMessageSize); - if (!lpMessageString) - return FALSE; + pszOutputBuffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + ulOutputSize); + if (pszOutputBuffer == NULL) + goto done; /* Convert unicode to ansi */ - RtlUnicodeToMultiByteN(lpMessageString, - dwMessageSize, + RtlUnicodeToMultiByteN(pszOutputBuffer, + ulOutputSize, NULL, - lpMessageText, - dwMessageLength); + pszLineBuffer, + ulLineSize); /* Set file pointer to the end of the file */ SetFilePointer(hLogFile, @@ -150,71 +174,21 @@ NULL, FILE_END); - /* Write Time/Date */ - GetLocalTime(&stTime); - - snprintf(TimeBuffer, sizeof(TimeBuffer), - "%02d/%02d/%02d %02d:%02d:%02d.%03d", - stTime.wMonth, - stTime.wDay, - stTime.wYear, - stTime.wHour, - stTime.wMinute, - stTime.wSecond, - stTime.wMilliseconds); - WriteFile(hLogFile, - TimeBuffer, - strlen(TimeBuffer), + pszOutputBuffer, + ulOutputSize, &dwWritten, NULL); - /* Write comma */ - WriteFile(hLogFile, ",", 1, &dwWritten, NULL); +done: + if (pszOutputBuffer) + HeapFree(GetProcessHeap(), 0, pszOutputBuffer); - /* Write file name */ - WriteFile(hLogFile, - lpFileName, - strlen(lpFileName), - &dwWritten, - NULL); + if (pszLineBuffer) + HeapFree(GetProcessHeap(), 0, pszLineBuffer); - /* Write comma */ - WriteFile(hLogFile, ",", 1, &dwWritten, NULL); - - /* Write line number */ - snprintf(Buffer, sizeof(Buffer), "%lu", dwLineNumber); - WriteFile(hLogFile, - Buffer, - strlen(Buffer), - &dwWritten, - NULL); - - /* Write comma */ - WriteFile(hLogFile, ",", 1, &dwWritten, NULL); - - /* Write severity code */ - WriteFile(hLogFile, - lpSeverityString, - strlen(lpSeverityString), - &dwWritten, - NULL); - - /* Write message string */ - WriteFile(hLogFile, - lpMessageString, - dwMessageSize, - &dwWritten, - NULL); - - /* Write newline */ - WriteFile(hLogFile, "\r\n", 2, &dwWritten, NULL); - - HeapFree(GetProcessHeap(), - 0, - lpMessageString); - - return TRUE; + if (pszFormatBuffer) + HeapFree(GetProcessHeap(), 0, pszFormatBuffer); } /* EOF */ Modified: trunk/reactos/dll/win32/syssetup/syssetup.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] Thu Dec 31 22:17:45 2015 @@ -83,5 +83,5 @@ @ stub UpgradePrinters @ stub ViewSetupActionLog @ stdcall VolumeClassInstaller(long ptr ptr) -@ stub pSetupDebugPrint +@ varargs pSetupDebugPrint(wstr long wstr wstr) @ stub pSetuplogSfcError Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Thu Dec 31 22:17:45 2015 @@ -266,6 +266,7 @@ switch (lpnm->code) { case PSN_SETACTIVE: + LogItem(L"BEGIN", L"WelcomePage"); /* Enable the Next button */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); if (pSetupData->UnattendSetup) @@ -273,6 +274,10 @@ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_ACKPAGE); return TRUE; } + break; + + case PSN_WIZNEXT: + LogItem(L"END", L"WelcomePage"); break; case PSN_WIZBACK: @@ -2302,7 +2307,7 @@ if (cchDrives == 0 || cchDrives >= _countof(wszDrives)) { /* buffer too small or failure */ - LogItem(SYSSETUP_SEVERITY_INFORMATION, L"GetLogicalDriveStringsW failed"); + LogItem(NULL, L"GetLogicalDriveStringsW failed"); return FALSE; } @@ -2312,7 +2317,7 @@ { WCHAR wszBuf[MAX_PATH]; wsprintf(wszBuf, L"%sreactos\\system32\\ntoskrnl.exe", pwszDrive); - LogItem(SYSSETUP_SEVERITY_INFORMATION, wszBuf); + LogItem(NULL, wszBuf); if (GetFileAttributesW(wszBuf) != INVALID_FILE_ATTRIBUTES) { /* the file exists, so this is the right drive */ @@ -2372,12 +2377,15 @@ MSG msg; PSETUPDATA pSetupData = NULL; + LogItem(L"BEGIN_SECTION", L"InstallWizard"); + /* Allocate setup data */ pSetupData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SETUPDATA)); if (pSetupData == NULL) { + LogItem(NULL, L"SetupData allocation failed!"); MessageBoxW(NULL, L"Setup failed to allocate global data!", L"ReactOS Setup", @@ -2487,6 +2495,8 @@ DeleteObject(pSetupData->hTitleFont); HeapFree(GetProcessHeap(), 0, pSetupData); + + LogItem(L"END_SECTION", L"InstallWizard"); } /* EOF */ Modified: trunk/reactos/include/reactos/libs/syssetup/syssetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sysse… ============================================================================== --- trunk/reactos/include/reactos/libs/syssetup/syssetup.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/syssetup/syssetup.h [iso-8859-1] Thu Dec 31 22:17:45 2015 @@ -31,26 +31,27 @@ /* Log File APIs */ -#define SYSSETUP_SEVERITY_INFORMATION 0 -#define SYSSETUP_SEVERITY_WARNING 1 -#define SYSSETUP_SEVERITY_ERROR 2 -#define SYSSETUP_SEVERITY_FATAL_ERROR 3 - - BOOL WINAPI InitializeSetupActionLog(IN BOOL bDeleteOldLogFile); VOID WINAPI TerminateSetupActionLog(VOID); -BOOL WINAPI -SYSSETUP_LogItem(IN const LPSTR lpFileName, - IN DWORD dwLineNumber, - IN DWORD dwSeverity, - IN LPWSTR lpMessageText); +VOID +CDECL +pSetupDebugPrint( + IN PCWSTR pszFileName, + IN INT nLineNumber, + IN PCWSTR pszTag, + IN PCWSTR pszMessage, + ...); -#define LogItem(dwSeverity, lpMessageText) \ - SYSSETUP_LogItem(__FILE__, __LINE__, dwSeverity, lpMessageText) +#define __WFILE__ TOWL1(__FILE__) +#define TOWL1(p) TOWL2(p) +#define TOWL2(p) L##p + +#define LogItem(lpTag, lpMessageText...) \ + pSetupDebugPrint(__WFILE__, __LINE__, lpTag, lpMessageText) #endif /* __SYSSETUP_H_INCLUDED__ */

8 years, 11 months

[ekohl] 70473: [SYSSETUP] Remove the NtUnloadKey hack.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Dec 31 16:39:01 2015 New Revision: 70473 URL: http://svn.reactos.org/svn/reactos?rev=70473&view=rev Log: [SYSSETUP] Remove the NtUnloadKey hack. Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Thu Dec 31 16:39:01 2015 @@ -1185,43 +1185,6 @@ SetupCloseInfFile(hShortcutsInf); - /* ROS HACK, as long as NtUnloadKey is not implemented */ - { - NTSTATUS Status = NtUnloadKey(NULL); - if (!NT_SUCCESS(Status)) - { - /* Create the Administrator profile */ - PROFILEINFOW ProfileInfo; - HANDLE hToken; - BOOL ret; - - DPRINT1("NtUnloadKey failed with 0x%lx\n", Status); - - ret = LogonUserW(AdminInfo.Name, - AdminInfo.Domain, - AdminInfo.Password, - LOGON32_LOGON_INTERACTIVE, - LOGON32_PROVIDER_DEFAULT, - &hToken); - if (!ret) - { - FatalError("LogonUserW() failed!"); - return 0; - } - ZeroMemory(&ProfileInfo, sizeof(PROFILEINFOW)); - ProfileInfo.dwSize = sizeof(PROFILEINFOW); - ProfileInfo.lpUserName = L"Administrator"; - ProfileInfo.dwFlags = PI_NOUI; - LoadUserProfileW(hToken, &ProfileInfo); - CloseHandle(hToken); - } - else - { - DPRINT1("ROS HACK not needed anymore. Please remove it\n"); - } - } - /* END OF ROS HACK */ - SetupCloseInfFile(hSysSetupInf); SetSetupType(0);

8 years, 11 months

[tfaber] 70472: [ACPICA] - Update to version 20151218 CORE-10765

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Dec 31 14:25:35 2015 New Revision: 70472 URL: http://svn.reactos.org/svn/reactos?rev=70472&view=rev Log: [ACPICA] - Update to version 20151218 CORE-10765 Added: trunk/reactos/drivers/bus/acpi/acpica/executer/extrace.c (with props) Removed: trunk/reactos/drivers/bus/acpi/acpica/utilities/utfileio.c Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsargs.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dscontrol.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsdebug.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsfield.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsinit.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmethod.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmthdat.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsobject.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsopcode.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsutils.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswexec.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswload.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswload2.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswscope.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswstate.c trunk/reactos/drivers/bus/acpi/acpica/events/evevent.c trunk/reactos/drivers/bus/acpi/acpica/events/evglock.c trunk/reactos/drivers/bus/acpi/acpica/events/evgpe.c trunk/reactos/drivers/bus/acpi/acpica/events/evgpeblk.c trunk/reactos/drivers/bus/acpi/acpica/events/evgpeinit.c trunk/reactos/drivers/bus/acpi/acpica/events/evgpeutil.c trunk/reactos/drivers/bus/acpi/acpica/events/evhandler.c trunk/reactos/drivers/bus/acpi/acpica/events/evmisc.c trunk/reactos/drivers/bus/acpi/acpica/events/evregion.c trunk/reactos/drivers/bus/acpi/acpica/events/evrgnini.c trunk/reactos/drivers/bus/acpi/acpica/events/evsci.c trunk/reactos/drivers/bus/acpi/acpica/events/evxface.c trunk/reactos/drivers/bus/acpi/acpica/events/evxfevnt.c trunk/reactos/drivers/bus/acpi/acpica/events/evxfgpe.c trunk/reactos/drivers/bus/acpi/acpica/events/evxfregn.c trunk/reactos/drivers/bus/acpi/acpica/executer/exconfig.c trunk/reactos/drivers/bus/acpi/acpica/executer/exconvrt.c trunk/reactos/drivers/bus/acpi/acpica/executer/excreate.c trunk/reactos/drivers/bus/acpi/acpica/executer/exdebug.c trunk/reactos/drivers/bus/acpi/acpica/executer/exdump.c trunk/reactos/drivers/bus/acpi/acpica/executer/exfield.c trunk/reactos/drivers/bus/acpi/acpica/executer/exfldio.c trunk/reactos/drivers/bus/acpi/acpica/executer/exmisc.c trunk/reactos/drivers/bus/acpi/acpica/executer/exmutex.c trunk/reactos/drivers/bus/acpi/acpica/executer/exnames.c trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg1.c trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg2.c trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg3.c trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg6.c trunk/reactos/drivers/bus/acpi/acpica/executer/exprep.c trunk/reactos/drivers/bus/acpi/acpica/executer/exregion.c trunk/reactos/drivers/bus/acpi/acpica/executer/exresnte.c trunk/reactos/drivers/bus/acpi/acpica/executer/exresolv.c trunk/reactos/drivers/bus/acpi/acpica/executer/exresop.c trunk/reactos/drivers/bus/acpi/acpica/executer/exstore.c trunk/reactos/drivers/bus/acpi/acpica/executer/exstoren.c trunk/reactos/drivers/bus/acpi/acpica/executer/exstorob.c trunk/reactos/drivers/bus/acpi/acpica/executer/exsystem.c trunk/reactos/drivers/bus/acpi/acpica/executer/exutils.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwacpi.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwesleep.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwgpe.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwregs.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwsleep.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxface.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxfsleep.c trunk/reactos/drivers/bus/acpi/acpica/include/acapps.h trunk/reactos/drivers/bus/acpi/acpica/include/acdebug.h trunk/reactos/drivers/bus/acpi/acpica/include/acdisasm.h trunk/reactos/drivers/bus/acpi/acpica/include/acevents.h trunk/reactos/drivers/bus/acpi/acpica/include/acexcep.h trunk/reactos/drivers/bus/acpi/acpica/include/acglobal.h trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h trunk/reactos/drivers/bus/acpi/acpica/include/acmacros.h trunk/reactos/drivers/bus/acpi/acpica/include/acnamesp.h trunk/reactos/drivers/bus/acpi/acpica/include/acobject.h trunk/reactos/drivers/bus/acpi/acpica/include/acopcode.h trunk/reactos/drivers/bus/acpi/acpica/include/acparser.h trunk/reactos/drivers/bus/acpi/acpica/include/acpiosxf.h trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h trunk/reactos/drivers/bus/acpi/acpica/include/actables.h trunk/reactos/drivers/bus/acpi/acpica/include/actypes.h trunk/reactos/drivers/bus/acpi/acpica/include/acutils.h trunk/reactos/drivers/bus/acpi/acpica/include/amlcode.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinux.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinuxex.h trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsalloc.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsarguments.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsconvert.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdump.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdumpdv.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nseval.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsinit.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsload.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsnames.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsobject.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsparse.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsprepkg.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsrepair.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsrepair2.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nssearch.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsutils.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nswalk.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfeval.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfname.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfobj.c trunk/reactos/drivers/bus/acpi/acpica/parser/psargs.c trunk/reactos/drivers/bus/acpi/acpica/parser/psloop.c trunk/reactos/drivers/bus/acpi/acpica/parser/psobject.c trunk/reactos/drivers/bus/acpi/acpica/parser/psopcode.c trunk/reactos/drivers/bus/acpi/acpica/parser/psparse.c trunk/reactos/drivers/bus/acpi/acpica/parser/psscope.c trunk/reactos/drivers/bus/acpi/acpica/parser/psutils.c trunk/reactos/drivers/bus/acpi/acpica/parser/pswalk.c trunk/reactos/drivers/bus/acpi/acpica/parser/psxface.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsaddr.c trunk/reactos/drivers/bus/acpi/acpica/resources/rscalc.c trunk/reactos/drivers/bus/acpi/acpica/resources/rscreate.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsdump.c trunk/reactos/drivers/bus/acpi/acpica/resources/rslist.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsmisc.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsutils.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsxface.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbdata.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbfadt.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbfind.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbinstal.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbprint.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbxface.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfload.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfroot.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utaddress.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utalloc.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utcache.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utcopy.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utdecode.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utdelete.c trunk/reactos/drivers/bus/acpi/acpica/utilities/uterror.c trunk/reactos/drivers/bus/acpi/acpica/utilities/uteval.c trunk/reactos/drivers/bus/acpi/acpica/utilities/uthex.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utids.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utinit.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utmath.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utmisc.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utmutex.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utnonansi.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utobject.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utosi.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utownerid.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utpredef.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utprint.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utresrc.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utstate.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utstring.c trunk/reactos/drivers/bus/acpi/acpica/utilities/uttrack.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utuuid.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utxface.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utxferror.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utxfinit.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utxfmutex.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dscontrol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsfield.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmethod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmthdat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswload2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswscope.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evglock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evgpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evgpeblk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evgpeinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evgpeutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evregion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evrgnini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evsci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evxfevnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evxfgpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evxfregn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exconvrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/excreate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exfield.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exfldio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exnames.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg6.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exprep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exregion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exresnte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exresolv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exresop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exstoren.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exstorob.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exsystem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Added: trunk/reactos/drivers/bus/acpi/acpica/executer/extrace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwesleep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwgpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwregs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwsleep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxfsleep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acdisasm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acevents.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acexcep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acglobal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acmacros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acnamesp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acobject.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acopcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acparser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpiosxf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actables.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/amlcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinux.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinuxex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsarguments.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsconvert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdumpdv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nseval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsnames.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsprepkg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsrepair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsrepair2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nssearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nswalk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfeval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psloop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psscope.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/pswalk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsaddr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rscalc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rscreate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbfadt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbfind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbinstal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfroot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utaddress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utcopy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utdecode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utdelete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/uterror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/uteval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Removed: trunk/reactos/drivers/bus/acpi/acpica/utilities/utfileio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/uthex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utmath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utnonansi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utosi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utownerid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utpredef.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utresrc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/uttrack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utuuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utxferror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utxfinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utxfmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut…

8 years, 11 months

[akhaldi] 70471: [0.4.0] * Merge the solitaire no action upon doubleclick fix by Carlo Bramini in r70470. CORE-6514

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Dec 31 13:55:16 2015 New Revision: 70471 URL: http://svn.reactos.org/svn/reactos?rev=70471&view=rev Log: [0.4.0] * Merge the solitaire no action upon doubleclick fix by Carlo Bramini in r70470. CORE-6514 Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solgame.cpp branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solitaire.cpp Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 31 13:55:16 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 31 13:55:16 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470 Modified: branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] Thu Dec 31 13:55:16 2015 @@ -12,6 +12,7 @@ CardStack activepile; int LastId; bool fGameStarted = false; +bool bAutoroute = false; void NewGame(void) { @@ -233,7 +234,7 @@ SetPlayTimer(); //only drop 1 card at a time - if(dragcards.NumCards() != 1) + if (!bAutoroute && dragcards.NumCards() != 1) { TRACE("EXIT SuitStackDropProc()\n"); return false; @@ -415,7 +416,9 @@ //stackobj.MoveCards(pDest, 1, true); //use the SimulateDrag funcion, because we get the //AddProc callbacks called for us on the destination stacks... + bAutoroute = true; stackobj.SimulateDrag(pDest, 1, true); + bAutoroute = false; } TRACE("EXIT RowStackDblClickProc()\n"); } Modified: branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Thu Dec 31 13:55:16 2015 @@ -243,6 +243,8 @@ NULL, // use window class menu hInst, // program instance handle NULL); // creation parameters + if (hwnd == NULL) + return 1; hwndMain = hwnd;

8 years, 11 months

[ekohl] 70470: [SOLITAIRE] solitaire: no action upon doubleclick Patch by Carlo Bramini. CORE-6514 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Dec 31 12:58:18 2015 New Revision: 70470 URL: http://svn.reactos.org/svn/reactos?rev=70470&view=rev Log: [SOLITAIRE] solitaire: no action upon doubleclick Patch by Carlo Bramini. CORE-6514 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] Thu Dec 31 12:58:18 2015 @@ -12,6 +12,7 @@ CardStack activepile; int LastId; bool fGameStarted = false; +bool bAutoroute = false; void NewGame(void) { @@ -233,7 +234,7 @@ SetPlayTimer(); //only drop 1 card at a time - if(dragcards.NumCards() != 1) + if (!bAutoroute && dragcards.NumCards() != 1) { TRACE("EXIT SuitStackDropProc()\n"); return false; @@ -415,7 +416,9 @@ //stackobj.MoveCards(pDest, 1, true); //use the SimulateDrag funcion, because we get the //AddProc callbacks called for us on the destination stacks... + bAutoroute = true; stackobj.SimulateDrag(pDest, 1, true); + bAutoroute = false; } TRACE("EXIT RowStackDblClickProc()\n"); } Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Thu Dec 31 12:58:18 2015 @@ -243,6 +243,8 @@ NULL, // use window class menu hInst, // program instance handle NULL); // creation parameters + if (hwnd == NULL) + return 1; hwndMain = hwnd;

8 years, 11 months

[hbelusca] 70469: [USETUP]: Correctly check for existing "ReactOS" entries in FreeLdr in case ReactOS is reinstalled over an existing installation, and if no one does exist, then create a new one t...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 30 20:23:18 2015 New Revision: 70469 URL: http://svn.reactos.org/svn/reactos?rev=70469&view=rev Log: [USETUP]: Correctly check for existing "ReactOS" entries in FreeLdr in case ReactOS is reinstalled over an existing installation, and if no one does exist, then create a new one that actually works. Thanks tower for having reported the problem 8^) Modified: trunk/reactos/base/setup/usetup/bootsup.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Wed Dec 30 20:23:18 2015 @@ -539,18 +539,19 @@ wcscpy(SectionName2, KeyData); } + /* Search for an existing ReactOS entry */ OsIniSection = IniCacheGetSection(IniCache, SectionName2); if (OsIniSection != NULL) { BOOLEAN UseExistingEntry = TRUE; - /* Check BootType */ + /* Check for boot type "Windows2003" */ Status = IniCacheGetKey(OsIniSection, L"BootType", &KeyData); if (NT_SUCCESS(Status)) { if ((KeyData == NULL) || - ( (_wcsicmp(KeyData, L"ReactOS") != 0) && - (_wcsicmp(KeyData, L"\"ReactOS\"") != 0) )) + ( (_wcsicmp(KeyData, L"Windows2003") != 0) && + (_wcsicmp(KeyData, L"\"Windows2003\"") != 0) )) { /* This is not a ReactOS entry */ UseExistingEntry = FALSE; @@ -563,17 +564,17 @@ if (UseExistingEntry) { - /* BootType is ReactOS. Now check SystemPath */ + /* BootType is Windows2003. Now check SystemPath. */ Status = IniCacheGetKey(OsIniSection, L"SystemPath", &KeyData); if (NT_SUCCESS(Status)) { - swprintf(SystemPath, L"\"%S\"", ArcPath); + swprintf(SystemPath, L"\"%s\"", ArcPath); if ((KeyData == NULL) || - ((_wcsicmp(KeyData, ArcPath) != 0) && - (_wcsicmp(KeyData, SystemPath) != 0) )) + ( (_wcsicmp(KeyData, ArcPath) != 0) && + (_wcsicmp(KeyData, SystemPath) != 0) )) { - /* This entry is a ReactOS entry, but the SystemRoot does not - match the one we are looking for */ + /* This entry is a ReactOS entry, but the SystemRoot + does not match the one we are looking for. */ UseExistingEntry = FALSE; } } @@ -595,29 +596,11 @@ i++; } - /* <SectionName>=<OsName> */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - SectionName, - OsName); - - /* Create <SectionName> section */ - IniSection = IniCacheAppendSection(IniCache, SectionName); - - /* BootType=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"ReactOS"); - - /* SystemPath=<ArcPath> */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"SystemPath", - ArcPath); + /* Create a new "ReactOS" entry */ + CreateFreeLoaderEntry(IniCache, IniSection, + SectionName, OsName, + L"Windows2003", ArcPath, + L""); IniCacheSave(IniCache, IniPath); IniCacheDestroy(IniCache); @@ -2032,7 +2015,7 @@ /* Install new bootcode */ if (PartitionType == PARTITION_FAT32 || - PartitionType == PARTITION_FAT32_XINT13) + PartitionType == PARTITION_FAT32_XINT13) { /* Install FAT32 bootcode */ wcscpy(SrcPath, SourceRootPath->Buffer); @@ -2151,7 +2134,7 @@ /* Install new bootsector */ if (PartitionType == PARTITION_FAT32 || - PartitionType == PARTITION_FAT32_XINT13) + PartitionType == PARTITION_FAT32_XINT13) { wcscpy(SrcPath, SourceRootPath->Buffer); wcscat(SrcPath, L"\\loader\\fat32.bin");

8 years, 11 months

[hbelusca] 70468: [USETUP]: Formatting fix & remove a redundant function.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 30 18:52:07 2015 New Revision: 70468 URL: http://svn.reactos.org/svn/reactos?rev=70468&view=rev Log: [USETUP]: Formatting fix & remove a redundant function. Modified: trunk/reactos/base/setup/usetup/inicache.c Modified: trunk/reactos/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… ============================================================================== --- trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] Wed Dec 30 18:52:07 2015 @@ -42,9 +42,7 @@ PINICACHEKEY Next; if (Key == NULL) - { - return NULL; - } + return NULL; Next = Key->Next; if (Key->Name != NULL) @@ -73,9 +71,7 @@ PINICACHESECTION Next; if (Section == NULL) - { - return NULL; - } + return NULL; Next = Section->Next; while (Section->FirstKey != NULL) @@ -209,42 +205,6 @@ } -#if 0 -static -PINICACHESECTION -IniCacheFindSection( - PINICACHE Cache, - PWCHAR Name, - ULONG NameLength) -{ - PINICACHESECTION Section = NULL; - - if (Cache == NULL || Name == NULL || NameLength == 0) - { - return NULL; - } - - Section = Cache->FirstSection; - - /* iterate through list of sections */ - while (Section != NULL) - { - if (NameLength == wcslen(Section->Name)) - { - /* are the contents the same too? */ - if (_wcsnicmp(Section->Name, Name, NameLength) == 0) - break; - } - - /* get the next section*/ - Section = Section->Next; - } - - return Section; -} -#endif - - static PINICACHESECTION IniCacheAddSection( @@ -351,7 +311,7 @@ *NamePtr = NULL; *NameSize = 0; - /* skip whitespace */ + /* Skip whitespace */ while (*Ptr != 0 && isspace(*Ptr)) { Ptr++; @@ -401,7 +361,7 @@ *NameSize = 0; Size = 0; - /* skip whitespace and empty lines */ + /* Skip whitespace and empty lines */ while (isspace(*Ptr) || *Ptr == '\n' || *Ptr == '\r') { Ptr++; @@ -703,9 +663,7 @@ PINICACHE Cache) { if (Cache == NULL) - { return; - } while (Cache->FirstSection != NULL) {

8 years, 11 months

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 December 2015