[ros-diffs] [mjansen] 71881: [RAPPS] Fix some translated / misspelled tags.
Author: mjansen Date: Sun Jul 10 00:18:20 2016 New Revision: 71881 URL: http://svn.reactos.org/svn/reactos?rev=71881&view=rev Log: [RAPPS] Fix some translated / misspelled tags. Modified: trunk/reactos/media/rapps/ac97forvirtualbox.txt trunk/reactos/media/rapps/cstalin.txt trunk/reactos/media/rapps/efsearch.txt trunk/reactos/media/rapps/mkvtoolnix.txt trunk/reactos/media/rapps/nirlauncher.txt trunk/reactos/media/rapps/pptview.txt trunk/reactos/media/rapps/scratch.txt trunk/reactos/media/rapps/tahoma.txt trunk/reactos/media/rapps/windirstat.txt Modified: trunk/reactos/media/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ac97forvirtualbox.txt?rev=71881&r1=71880&r2=71881&view=diff == --- trunk/reactos/media/rapps/ac97forvirtualbox.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/ac97forvirtualbox.txt [iso-8859-1] Sun Jul 10 00:18:20 2016 @@ -11,7 +11,7 @@ [Section.0405] Name = OvladaÄ AC97 pro VirtualBox -Licence = Neznámá +License = Neznámá Description = Rozbalte do složky "ReactOS" a pak ReactOS dvakrát restartujte. [Section.0407] @@ -28,7 +28,7 @@ [Section.0410] Name = Driver AC97 per VirtualBox License = Sconosciuta -Descrizione = Estrarre nella cartella "ReactOS" e poi riavviare ReactOS due volte. +Description = Estrarre nella cartella "ReactOS" e poi riavviare ReactOS due volte. [Section.040c] Name = Pilote AC97 pour VirtualBox @@ -43,18 +43,18 @@ [Section.0415] Name = Sterownik AC97 dla VirtualBox -Licence = Nieznana +License = Nieznana Description = Rozpakuj zawartoÅÄ w folderze "ReactOS" i dwukrotnie zrestartuj system. [Section.0418] Name = Modul pilot AC97 pentru VirtualBox -Licence = NespecificatÄ +License = NespecificatÄ Description = DezarhivaÈi în dosarul ReactOS apoi reporniÈi ReactOS de douÄ ori. Size = 185,5 Kio [Section.0419] Name = ÐÑÐ°Ð¹Ð²ÐµÑ AC97 Ð´Ð»Ñ VirtualBox -Licence = Ðе Ñказано +License = Ðе Ñказано Description = PазаÑÑ Ð¸Ð²Ð¸ÑÑйÑе ÑодеÑжимое в Ð¿Ð°Ð¿ÐºÑ "ReactOS", заÑем Ð´Ð²Ð°Ð¶Ð´Ñ Ð¿ÐµÑезагÑÑзиÑе ÑиÑÑемÑ. [Section.041f] @@ -65,7 +65,7 @@ [Section.0422] Name = ÐÑÐ°Ð¹Ð²ÐµÑ AC97 Ð´Ð»Ñ VirtualBox -Licence = ÐевÑдома +License = ÐевÑдома Description = PозаÑÑ ÑвÑйÑе вмÑÑÑ Ð² ÑÐµÐºÑ "ReactOS" пÑÑÐ»Ñ Ñого двÑÑÑ Ð¿ÐµÑезаванÑажÑе ÑиÑÑемÑ. [Section.0804] Modified: trunk/reactos/media/rapps/cstalin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/cstalin.txt?rev=71881&r1=71880&r2=71881&view=diff == --- trunk/reactos/media/rapps/cstalin.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/cstalin.txt [iso-8859-1] Sun Jul 10 00:18:20 2016 @@ -1,7 +1,7 @@ [Section] Name = Commander Stalin Version = 0.9.5 -Licence = GPL +License = GPL Description = A Soviet-themed real time strategy game (RTS) based on Boswars. You will need a tool like 7-Zip to extract it. Size = 261.0 MiB Category = 4 Modified: trunk/reactos/media/rapps/efsearch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/efsearch.txt?rev=71881&r1=71880&r2=71881&view=diff == --- trunk/reactos/media/rapps/efsearch.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/efsearch.txt [iso-8859-1] Sun Jul 10 00:18:20 2016 @@ -1,7 +1,7 @@ [Section] Name = Effective File search Version = 6.8.1 -Licence = Freeware +License = Freeware Description = File search utility compatible with ReactOS. Size = 944.4 KiB Category = 12 @@ -18,13 +18,13 @@ Size = 944,4 KiB [Section.0418] -Licence = GratuitÄ +License = GratuitÄ Description = Program de cÄutare a fiÈierelor, compatibil cu ReactOS. Size = 944,4 Kio [Section.041f] Name = Etkili Kütük Arama -Licence = Ãcretsiz +License = Ãcretsiz Description = ReactOS'la uyumlu kütük arama aracı. Size = 944,4 KiB Modified: trunk/reactos/media/rapps/mkvtoolnix.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mkvtoolnix.txt?rev=71881&r1=71880&r2=71881&view=diff == --- trunk/reactos/media/rapps/mkvtoolnix.txt[iso-8859-1] (original) +++ trunk/reactos/media/rapps/mkvtoolnix.txt[iso-8859-1] Sun Jul 10 00:18:20 2016 @@ -1,7 +1,7 @@ [Section] Name = MkvToolnix Version = 3.1.0 -Licence = GPL +License = GPL Description = Set of tools for working with files mkv format. Size = 5.3 MiB Category = 2 Modified: trunk/reactos/media/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nirlauncher.txt?rev=71881&r1=71880&r2=71881&view=diff =
[ros-diffs] [hbelusca] 71880: [SHELL32] - Fix the last parameter of a StringCchCopyEx call; fix a misspelling. - Do not exclusively use GetFileAttributesEx to retrieve file attributes (for the file pr
Author: hbelusca Date: Sat Jul 9 23:18:39 2016 New Revision: 71880 URL: http://svn.reactos.org/svn/reactos?rev=71880&view=rev Log: [SHELL32] - Fix the last parameter of a StringCchCopyEx call; fix a misspelling. - Do not exclusively use GetFileAttributesEx to retrieve file attributes (for the file properties dialog). Indeed, it happens that this API (as well as GetFileAttributes), and equivalently, NtQueryFullAttributesFile (as well as NtQueryAttributesFile), can fail on *locked system* files (on Win2k/Win2k3/Win7, and on ROS), such as C:\pagefile.sys . See for example http://stackoverflow.com/questions/16772931/getfileattributes-on-locked-system-file and my comment in CORE-10757 . Therefore to retrieve file attributes also for these files we do a trick: we call FindFirstFile on the full path to said file. It happens that FindFirstFile can work on locked system files, and thus we are able to retrieve their attributes (+ size and file dates) as well! See the code for more details. CORE-10757 #resolve Modified: trunk/reactos/dll/win32/shell32/dialogs/filedefext.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/filedefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/filedefext.cpp?rev=71880&r1=71879&r2=71880&view=diff == --- trunk/reactos/dll/win32/shell32/dialogs/filedefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/filedefext.cpp [iso-8859-1] Sat Jul 9 23:18:39 2016 @@ -189,7 +189,7 @@ /* Copy " bytes" to buffer */ LPWSTR pwszEnd = pwszResult + cchWritten; size_t cchRemaining = cchResultMax - cchWritten; -StringCchCopyExW(pwszEnd, cchRemaining, L" ", &pwszEnd, &cchRemaining, NULL); +StringCchCopyExW(pwszEnd, cchRemaining, L" ", &pwszEnd, &cchRemaining, 0); cchWritten = LoadStringW(shell32_hInstance, IDS_BYTES_FORMAT, pwszEnd, cchRemaining); cchRemaining -= cchWritten; @@ -219,7 +219,7 @@ if (lpQwSize->QuadPart < 1024) return pwszResult; -/* Concate " (" */ +/* Concatenate " (" */ UINT cchWritten = wcslen(pwszResult); LPWSTR pwszEnd = pwszResult + cchWritten; size_t cchRemaining = cchResultMax - cchWritten; @@ -481,12 +481,50 @@ BOOL CFileDefExt::InitFileAttr(HWND hwndDlg) { +BOOL Success; +WIN32_FIND_DATAW FileInfo; // WIN32_FILE_ATTRIBUTE_DATA WCHAR wszBuf[MAX_PATH]; TRACE("InitFileAttr %ls\n", m_wszPath); -WIN32_FILE_ATTRIBUTE_DATA FileInfo; -if (GetFileAttributesExW(m_wszPath, GetFileExInfoStandard, &FileInfo)) +/* + * There are situations where GetFileAttributes(Ex) can fail even if the + * specified path represents a file. This happens when e.g. the file is a + * locked system file, such as C:\pagefile.sys . In this case, the function + * returns INVALID_FILE_ATTRIBUTES and GetLastError returns ERROR_SHARING_VIOLATION. + * (this would allow us to distinguish between this failure and a failure + * due to the fact that the path actually refers to a directory). + * + * Because we really want to retrieve the file attributes/size/date&time, + * we do the following trick: + * - First we call GetFileAttributesEx. If it succeeds we know we have + * a file or a directory, and we have retrieved its attributes. + * - If GetFileAttributesEx fails, we call FindFirstFile on the full path. + * While we could have called FindFirstFile at first and skip GetFileAttributesEx + * altogether, we do it after GetFileAttributesEx because it performs more + * work to retrieve the file attributes. However it actually works even + * for locked system files. + * - If FindFirstFile succeeds we have retrieved its attributes. + * - Otherwise (FindFirstFile has failed), we do not retrieve anything. + * + * The following code also relies on the fact that the first 6 members + * of WIN32_FIND_DATA are *exactly* the same as the WIN32_FILE_ATTRIBUTE_DATA + * structure. Therefore it is safe to use a single WIN32_FIND_DATA + * structure for both the GetFileAttributesEx and FindFirstFile calls. + */ + +Success = GetFileAttributesExW(m_wszPath, + GetFileExInfoStandard, + (LPWIN32_FILE_ATTRIBUTE_DATA)&FileInfo); +if (!Success) +{ +HANDLE hFind = FindFirstFileW(m_wszPath, &FileInfo); +Success = (hFind != INVALID_HANDLE_VALUE); +if (Success) +FindClose(hFind); +} + +if (Success) { /* Update attribute checkboxes */ if (FileInfo.dwFileAttributes & FILE_ATTRIBUTE_READONLY)
[ros-diffs] [hbelusca] 71879: [KERNEL32] - Do not use a "magic number" for the return value 0xFFFFFFFF from GetFileAttributes. - Use a meaningful variable name for retrieving the result of GetFileAttr
Author: hbelusca Date: Sat Jul 9 22:23:23 2016 New Revision: 71879 URL: http://svn.reactos.org/svn/reactos?rev=71879&view=rev Log: [KERNEL32] - Do not use a "magic number" for the return value 0x from GetFileAttributes. - Use a meaningful variable name for retrieving the result of GetFileAttributes. Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/file/create.c?rev=71879&r1=71878&r2=71879&view=diff == --- trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] Sat Jul 9 22:23:23 2016 @@ -435,7 +435,7 @@ switch (dwAttributes) { -case 0x: /* File does not exist */ +case INVALID_FILE_ATTRIBUTES: /* File does not exist */ SetLastError(ERROR_FILE_NOT_FOUND); lpReOpenBuff->nErrCode = (WORD) ERROR_FILE_NOT_FOUND; return -1; Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/proc.c?rev=71879&r1=71878&r2=71879&view=diff == --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sat Jul 9 22:23:23 2016 @@ -2329,7 +2329,7 @@ PCHAR pcScan; SIZE_T n; WCHAR SaveChar; -ULONG Length, CurdirLength, CmdQuoteLength; +ULONG Length, FileAttribs, CmdQuoteLength; ULONG CmdLineLength, ResultSize; PWCHAR QuotedCmdLine, AnsiCmdCommand, ExtBuffer, CurrentDirectory; PWCHAR NullBuffer, ScanString, NameBuffer, SearchPath, DebuggerCmdLine; @@ -2734,9 +2734,9 @@ if ((Length) && (Length < MAX_PATH)) { /* Get file attributes */ -CurdirLength = GetFileAttributesW(NameBuffer); -if ((CurdirLength != 0x) && -(CurdirLength & FILE_ATTRIBUTE_DIRECTORY)) +FileAttribs = GetFileAttributesW(NameBuffer); +if ((FileAttribs != INVALID_FILE_ATTRIBUTES) && +(FileAttribs & FILE_ATTRIBUTE_DIRECTORY)) { /* This was a directory, fail later on */ Length = 0; @@ -4066,9 +4066,9 @@ } /* Make sure the directory is actually valid */ -CurdirLength = GetFileAttributesW(CurrentDirectory); -if ((CurdirLength == 0x) || - !(CurdirLength & FILE_ATTRIBUTE_DIRECTORY)) +FileAttribs = GetFileAttributesW(CurrentDirectory); +if ((FileAttribs == INVALID_FILE_ATTRIBUTES) || + !(FileAttribs & FILE_ATTRIBUTE_DIRECTORY)) { /* It isn't, so bail out */ DPRINT1("Current directory is invalid\n");
[ros-diffs] [tfaber] 71878: [SERVMAN] - Fix MSVC build
Author: tfaber Date: Sat Jul 9 21:05:00 2016 New Revision: 71878 URL: http://svn.reactos.org/svn/reactos?rev=71878&view=rev Log: [SERVMAN] - Fix MSVC build Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/resource.h Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc?rev=71878&r1=71877&r2=71878&view=diff == --- trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] Sat Jul 9 21:05:00 2016 @@ -335,4 +335,4 @@ IDS_RESTART_SERVICE "Restart the Service" IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" -END +END Modified: trunk/reactos/base/applications/mscutils/servman/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/resource.h?rev=71878&r1=71877&r2=71878&view=diff == --- trunk/reactos/base/applications/mscutils/servman/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/resource.h [iso-8859-1] Sat Jul 9 21:05:00 2016 @@ -218,4 +218,4 @@ #define IDS_NO_ACTION12100 #define IDS_RESTART_SERVICE 12101 #define IDS_RUN_PROGRAM 12102 -#define IDS_RESTART_COMPUTER 12103 +#define IDS_RESTART_COMPUTER 12103
[ros-diffs] [tfaber] 71877: [LIBXML2] - Fix MSVC build (already fixed upstream)
Author: tfaber Date: Sat Jul 9 21:01:11 2016 New Revision: 71877 URL: http://svn.reactos.org/svn/reactos?rev=71877&view=rev Log: [LIBXML2] - Fix MSVC build (already fixed upstream) Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/relaxng.c trunk/reactos/sdk/lib/3rdparty/libxml2/xmlschemas.c Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/relaxng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/relaxng.c?rev=71877&r1=71876&r2=71877&view=diff == --- trunk/reactos/sdk/lib/3rdparty/libxml2/relaxng.c[iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libxml2/relaxng.c[iso-8859-1] Sat Jul 9 21:01:11 2016 @@ -2088,6 +2088,7 @@ const xmlChar * arg2) { char msg[1000]; +xmlChar *result; if (arg1 == NULL) arg1 = BAD_CAST ""; @@ -2215,7 +2216,7 @@ snprintf(msg, 1000, "Unknown error code %d\n", err); } msg[1000 - 1] = 0; -xmlChar *result = xmlCharStrdup(msg); +result = xmlCharStrdup(msg); return (xmlEscapeFormatString(&result)); } Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/xmlschemas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/xmlschemas.c?rev=71877&r1=71876&r2=71877&view=diff == --- trunk/reactos/sdk/lib/3rdparty/libxml2/xmlschemas.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/libxml2/xmlschemas.c [iso-8859-1] Sat Jul 9 21:01:11 2016 @@ -3168,8 +3168,8 @@ "valid."); } if (expected) { + xmlChar *expectedEscaped = xmlCharStrdup(expected); msg = xmlStrcat(msg, BAD_CAST " Expected is '"); - xmlChar *expectedEscaped = xmlCharStrdup(expected); msg = xmlStrcat(msg, xmlEscapeFormatString(&expectedEscaped)); FREE_AND_NULL(expectedEscaped); msg = xmlStrcat(msg, BAD_CAST "'.\n");
[ros-diffs] [akhaldi] 71876: [LIBXSLT] Update to v1.1.29. CORE-11557
Author: akhaldi Date: Sat Jul 9 18:30:47 2016 New Revision: 71876 URL: http://svn.reactos.org/svn/reactos?rev=71876&view=rev Log: [LIBXSLT] Update to v1.1.29. CORE-11557 Modified: trunk/reactos/dll/3rdparty/libxslt/Makefile.am trunk/reactos/dll/3rdparty/libxslt/Makefile.in trunk/reactos/dll/3rdparty/libxslt/attributes.c trunk/reactos/dll/3rdparty/libxslt/extensions.c trunk/reactos/dll/3rdparty/libxslt/functions.c trunk/reactos/dll/3rdparty/libxslt/imports.c trunk/reactos/dll/3rdparty/libxslt/keys.c trunk/reactos/dll/3rdparty/libxslt/namespaces.c trunk/reactos/dll/3rdparty/libxslt/numbers.c trunk/reactos/dll/3rdparty/libxslt/pattern.c trunk/reactos/dll/3rdparty/libxslt/preproc.c trunk/reactos/dll/3rdparty/libxslt/transform.c trunk/reactos/dll/3rdparty/libxslt/variables.c trunk/reactos/dll/3rdparty/libxslt/xslt.c trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h.in trunk/reactos/dll/3rdparty/libxslt/xsltutils.c trunk/reactos/media/doc/3rd Party Files.txt trunk/reactos/sdk/include/reactos/libs/libxslt/xsltInternals.h trunk/reactos/sdk/include/reactos/libs/libxslt/xsltconfig.h trunk/reactos/sdk/include/reactos/libs/libxslt/xsltlocale.h trunk/reactos/sdk/include/reactos/libs/libxslt/xsltutils.h Modified: trunk/reactos/dll/3rdparty/libxslt/Makefile.am URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/Makefile.am?rev=71876&r1=71875&r2=71876&view=diff == --- trunk/reactos/dll/3rdparty/libxslt/Makefile.am [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/Makefile.am [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -25,9 +25,10 @@ transform.h \ security.h \ xsltInternals.h \ - xsltconfig.h\ xsltexports.h \ xsltlocale.h +nodist_xsltinc_HEADERS = \ + xsltconfig.h libxslt_la_SOURCES = \ attrvt.c\ @@ -50,9 +51,10 @@ transform.c \ security.c \ win32config.h \ - xsltwin32config.h \ xsltwin32config.h.in\ libxslt.h +nodist_libxslt_la_SOURCES =\ + xsltwin32config.h if USE_VERSION_SCRIPT LIBXSLT_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxslt.syms Modified: trunk/reactos/dll/3rdparty/libxslt/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/Makefile.in?rev=71876&r1=71875&r2=71876&view=diff == --- trunk/reactos/dll/3rdparty/libxslt/Makefile.in [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/Makefile.in [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,23 +16,61 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ -am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ +false; \ + elif test -n '$(MAKE_HOST)'; then \ +true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ +true; \ + else \ +false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ +sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ -echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ -for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ -*=*|--*) ;; \ -*n*) am__dry=yes; break;; \ - esac; \ -done;; \ +bs=\\; \ +sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ -test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ +flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ +test $$skip_next = yes
[ros-diffs] [akhaldi] 71875: [LIBXML2] Update to v2.9.4. CORE-11556
Author: akhaldi Date: Sat Jul 9 18:07:58 2016 New Revision: 71875 URL: http://svn.reactos.org/svn/reactos?rev=71875&view=rev Log: [LIBXML2] Update to v2.9.4. CORE-11556 Modified: trunk/reactos/media/doc/3rd Party Files.txt trunk/reactos/sdk/include/reactos/libs/libxml/dict.h trunk/reactos/sdk/include/reactos/libs/libxml/parser.h trunk/reactos/sdk/include/reactos/libs/libxml/parserInternals.h trunk/reactos/sdk/include/reactos/libs/libxml/schemasInternals.h trunk/reactos/sdk/include/reactos/libs/libxml/xmlerror.h trunk/reactos/sdk/include/reactos/libs/libxml/xmlstring.h trunk/reactos/sdk/include/reactos/libs/libxml/xmlversion.h trunk/reactos/sdk/include/reactos/libs/libxml/xpathInternals.h trunk/reactos/sdk/lib/3rdparty/libxml2/ChangeLog trunk/reactos/sdk/lib/3rdparty/libxml2/HTMLparser.c trunk/reactos/sdk/lib/3rdparty/libxml2/NEWS trunk/reactos/sdk/lib/3rdparty/libxml2/SAX2.c trunk/reactos/sdk/lib/3rdparty/libxml2/catalog.c trunk/reactos/sdk/lib/3rdparty/libxml2/debugXML.c trunk/reactos/sdk/lib/3rdparty/libxml2/dict.c trunk/reactos/sdk/lib/3rdparty/libxml2/encoding.c trunk/reactos/sdk/lib/3rdparty/libxml2/entities.c trunk/reactos/sdk/lib/3rdparty/libxml2/error.c trunk/reactos/sdk/lib/3rdparty/libxml2/libxml.h trunk/reactos/sdk/lib/3rdparty/libxml2/parser.c trunk/reactos/sdk/lib/3rdparty/libxml2/parserInternals.c trunk/reactos/sdk/lib/3rdparty/libxml2/relaxng.c trunk/reactos/sdk/lib/3rdparty/libxml2/schematron.c trunk/reactos/sdk/lib/3rdparty/libxml2/tree.c trunk/reactos/sdk/lib/3rdparty/libxml2/uri.c trunk/reactos/sdk/lib/3rdparty/libxml2/valid.c trunk/reactos/sdk/lib/3rdparty/libxml2/xinclude.c trunk/reactos/sdk/lib/3rdparty/libxml2/xmlIO.c trunk/reactos/sdk/lib/3rdparty/libxml2/xmlcatalog.c trunk/reactos/sdk/lib/3rdparty/libxml2/xmllint.c trunk/reactos/sdk/lib/3rdparty/libxml2/xmlmemory.c trunk/reactos/sdk/lib/3rdparty/libxml2/xmlreader.c trunk/reactos/sdk/lib/3rdparty/libxml2/xmlregexp.c trunk/reactos/sdk/lib/3rdparty/libxml2/xmlsave.c trunk/reactos/sdk/lib/3rdparty/libxml2/xmlschemas.c trunk/reactos/sdk/lib/3rdparty/libxml2/xmlschemastypes.c trunk/reactos/sdk/lib/3rdparty/libxml2/xmlstring.c trunk/reactos/sdk/lib/3rdparty/libxml2/xmlwriter.c trunk/reactos/sdk/lib/3rdparty/libxml2/xpath.c trunk/reactos/sdk/lib/3rdparty/libxml2/xpointer.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Files.txt?rev=71875&r1=71874&r2=71875&view=diff Modified: trunk/reactos/sdk/include/reactos/libs/libxml/dict.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/libxml/dict.h?rev=71875&r1=71874&r2=71875&view=diff Modified: trunk/reactos/sdk/include/reactos/libs/libxml/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/libxml/parser.h?rev=71875&r1=71874&r2=71875&view=diff Modified: trunk/reactos/sdk/include/reactos/libs/libxml/parserInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/libxml/parserInternals.h?rev=71875&r1=71874&r2=71875&view=diff Modified: trunk/reactos/sdk/include/reactos/libs/libxml/schemasInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/libxml/schemasInternals.h?rev=71875&r1=71874&r2=71875&view=diff Modified: trunk/reactos/sdk/include/reactos/libs/libxml/xmlerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/libxml/xmlerror.h?rev=71875&r1=71874&r2=71875&view=diff Modified: trunk/reactos/sdk/include/reactos/libs/libxml/xmlstring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/libxml/xmlstring.h?rev=71875&r1=71874&r2=71875&view=diff Modified: trunk/reactos/sdk/include/reactos/libs/libxml/xmlversion.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/libxml/xmlversion.h?rev=71875&r1=71874&r2=71875&view=diff Modified: trunk/reactos/sdk/include/reactos/libs/libxml/xpathInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/libxml/xpathInternals.h?rev=71875&r1=71874&r2=71875&view=diff Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/ChangeLog?rev=71875&r1=71874&r2=71875&view=diff Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/HTMLparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/HTMLparser.c?rev=71875&r1=71874&r2=71875&view=diff Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/NEWS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/NEWS?rev=71875&r1=71874&r2=71875&view=diff Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/SAX2.c URL: http
[ros-diffs] [akhaldi] 71874: [CMAKE] Update baseaddress.cmake for the GCC build. CORE-11382
Author: akhaldi Date: Sat Jul 9 17:38:40 2016 New Revision: 71874 URL: http://svn.reactos.org/svn/reactos?rev=71874&view=rev Log: [CMAKE] Update baseaddress.cmake for the GCC build. CORE-11382 Modified: trunk/reactos/sdk/cmake/baseaddress.cmake Modified: trunk/reactos/sdk/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/baseaddress.cmake?rev=71874&r1=71873&r2=71874&view=diff == --- trunk/reactos/sdk/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/baseaddress.cmake [iso-8859-1] Sat Jul 9 17:38:40 2016 @@ -1,345 +1,357 @@ -set(baseaddress_ntdll0x7c92) # should be above 0x7c92 -set(baseaddress_kernel32 0x7c75) -set(baseaddress_msvcrt 0x7c6b) -set(baseaddress_advapi32 0x7c61) -set(baseaddress_gdi320x7c57) -set(baseaddress_user32 0x7c3d) -set(baseaddress_dhcpcsvc 0x7c38) -set(baseaddress_dnsapi 0x7c33) -set(baseaddress_icmp 0x7c30) -set(baseaddress_iphlpapi 0x7c2b) -set(baseaddress_ws2_32 0x7c27) -set(baseaddress_ws2help 0x7c24) -set(baseaddress_shlwapi 0x7c19) -set(baseaddress_rpcrt4 0x7c0d) -set(baseaddress_comctl32 0x7bf4) -set(baseaddress_ole320x7bd7) -set(baseaddress_winspool.drv 0x7bd4) -set(baseaddress_winmm0x7bc9) -set(baseaddress_comdlg32 0x7bba) -set(baseaddress_shell32 0x7adb) -set(baseaddress_lz32 0x7ad9) -set(baseaddress_version 0x7ad6) -set(baseaddress_oleaut32 0x7ab9) -set(baseaddress_setupapi 0x7a9c) -set(baseaddress_mpr 0x7a98) -set(baseaddress_crypt32 0x7a87) -set(baseaddress_wininet 0x7a7b) -set(baseaddress_urlmon 0x7a6b) -set(baseaddress_psapi0x7a68) -set(baseaddress_imm320x7a64) -set(baseaddress_msvfw32 0x7a60) -set(baseaddress_dbghelp 0x7a55) -set(baseaddress_devmgr 0x7a4c) -set(baseaddress_msacm32 0x7a48) -set(baseaddress_netapi32 0x7a41) -set(baseaddress_powrprof 0x7a3e) -set(baseaddress_secur32 0x7a3a) -set(baseaddress_wintrust 0x7a34) -set(baseaddress_avicap32 0x7a31) -set(baseaddress_cabinet 0x7a2c) -set(baseaddress_dsound 0x7a24) -set(baseaddress_glu320x7a14) -set(baseaddress_opengl32 0x79f3) -set(baseaddress_riched20 0x79e7) -set(baseaddress_smdll0x79e5) -set(baseaddress_userenv 0x79e0) -set(baseaddress_uxtheme 0x79da) -set(baseaddress_cryptui 0x79cf) -set(baseaddress_csrsrv 0x79cc) -set(baseaddress_basesrv 0x79c9) -set(baseaddress_consrv 0x79c7) -set(baseaddress_winsrv 0x79ba) -set(baseaddress_dplayx 0x79b3) -set(baseaddress_gdiplus 0x79a6) -set(baseaddress_msimg32 0x79a3) -set(baseaddress_mswsock 0x79a0) -set(baseaddress_oledlg 0x799b) -set(baseaddress_rasapi32 0x7998) -set(baseaddress_rsaenh 0x7991) -set(baseaddress_samlib 0x798d) -set(baseaddress_sensapi 0x798a) -set(baseaddress_sfc_os 0x7987) -set(baseaddress_snmpapi 0x7984) -set(baseaddress_spoolss 0x7981) -set(baseaddress_usp100x7979) -set(baseaddress_acledit 0x7976) -set(baseaddress_aclui0x7972) -set(baseaddress_activeds 0x796f) -set(baseaddress_actxprxy 0x7950) -set(baseaddress_advpack 0x794c) -set(baseaddress_amstream 0x7947) -set(baseaddress_atl 0x7943) -set(baseaddress_atl100 0x793f) -set(baseaddress_atl800x793b) -set(baseaddress_authz0x7938) -set(baseaddress_avifil32 0x7931) -set(baseaddress_batt 0x792e) -set(baseaddress_bcrypt 0x792b) -set(baseaddress_beepmidi 0x7928) -set(baseaddress_browseui 0x7918) -set(baseaddress_cards0x790c) -set(baseaddress_cfgmgr32 0x7909) -set(baseaddress_clusapi 0x7906) -set(baseaddress_comcat 0x7903) -set(baseaddress_compstui 0x7900) -set(baseaddress_console
[ros-diffs] [akhaldi] 71873: [FONTSUB] Import from Wine Staging 1.9.13. CORE-11219
Author: akhaldi Date: Sat Jul 9 17:18:33 2016 New Revision: 71873 URL: http://svn.reactos.org/svn/reactos?rev=71873&view=rev Log: [FONTSUB] Import from Wine Staging 1.9.13. CORE-11219 Added: trunk/reactos/dll/win32/fontsub/ trunk/reactos/dll/win32/fontsub/CMakeLists.txt (with props) trunk/reactos/dll/win32/fontsub/fontsub.spec (with props) trunk/reactos/dll/win32/fontsub/main.c (with props) trunk/reactos/sdk/include/psdk/fontsub.h (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?rev=71873&r1=71872&r2=71873&view=diff == --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sat Jul 9 17:18:33 2016 @@ -41,6 +41,7 @@ add_subdirectory(faultrep) add_subdirectory(fltlib) add_subdirectory(fmifs) +add_subdirectory(fontsub) add_subdirectory(framedyn) add_subdirectory(fusion) add_subdirectory(gdiplus) Added: trunk/reactos/dll/win32/fontsub/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fontsub/CMakeLists.txt?rev=71873 == --- trunk/reactos/dll/win32/fontsub/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/fontsub/CMakeLists.txt [iso-8859-1] Sat Jul 9 17:18:33 2016 @@ -0,0 +1,14 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) +spec2def(fontsub.dll fontsub.spec) + +add_library(fontsub SHARED +main.c +${CMAKE_CURRENT_BINARY_DIR}/fontsub_stubs.c +${CMAKE_CURRENT_BINARY_DIR}/fontsub.def) + +set_module_type(fontsub win32dll) +target_link_libraries(fontsub wine) +add_importlibs(fontsub msvcrt kernel32 ntdll) +add_cd_file(TARGET fontsub DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/fontsub/CMakeLists.txt -- svn:eol-style = native Added: trunk/reactos/dll/win32/fontsub/fontsub.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fontsub/fontsub.spec?rev=71873 == --- trunk/reactos/dll/win32/fontsub/fontsub.spec(added) +++ trunk/reactos/dll/win32/fontsub/fontsub.spec[iso-8859-1] Sat Jul 9 17:18:33 2016 @@ -0,0 +1,2 @@ +@ cdecl CreateFontPackage(ptr long ptr ptr ptr long long long long long long ptr long ptr ptr ptr ptr) +@ stub MergeFontPackage Propchange: trunk/reactos/dll/win32/fontsub/fontsub.spec -- svn:eol-style = native Added: trunk/reactos/dll/win32/fontsub/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fontsub/main.c?rev=71873 == --- trunk/reactos/dll/win32/fontsub/main.c (added) +++ trunk/reactos/dll/win32/fontsub/main.c [iso-8859-1] Sat Jul 9 17:18:33 2016 @@ -0,0 +1,65 @@ +/* + * Copyright 2014 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include +#include "windef.h" +#include "winbase.h" +#include "fontsub.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fontsub); + +BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ +TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + +switch (fdwReason) { +case DLL_WINE_PREATTACH: +return FALSE; /* prefer native version */ +case DLL_PROCESS_ATTACH: +DisableThreadLibraryCalls(hinstDLL); +break; +} + +return TRUE; +} + +ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, unsigned char **dest, +ULONG *dest_len, ULONG *written, const unsigned short flags, const unsigned short face_index, +const unsigned short format, const unsigned short lang, const unsigned short platform, const unsigned short encoding, +const unsigned short
[ros-diffs] [ekohl] 71872: [SERVMAN] Add logon and recovery property pages. Still work in progress.
Author: ekohl Date: Sat Jul 9 16:51:21 2016 New Revision: 71872 URL: http://svn.reactos.org/svn/reactos?rev=71872&view=rev Log: [SERVMAN] Add logon and recovery property pages. Still work in progress. Added: trunk/reactos/base/applications/mscutils/servman/propsheet_logon.c (with props) trunk/reactos/base/applications/mscutils/servman/propsheet_recovery.c (with props) Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/servman/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/servman/lang/he-IL.rc trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/servman/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/servman/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/servman/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/servman/lang/zh-TW.rc trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/propsheet.c trunk/reactos/base/applications/mscutils/servman/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt?rev=71872&r1=71871&r2=71872&view=diff Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc?rev=71872&r1=71871&r2=71872&view=diff Modified: trunk/reactos/base/applications/mscutils/servman/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/lang/cs-CZ.rc?rev=71872&r1=71871&r2=71872&view=diff Modified: trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc?rev=71872&r1=71871&r2=71872&view=diff Modified: trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc?rev=71872&r1=71871&r2=71872&view=diff Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc?rev=71872&r1=71871&r2=71872&view=diff Modified: trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc?rev=71872&r1=71871&r2=71872&view=diff Modified: trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc?rev=71872&r1=71871&r2=71872&view=diff Modified: trunk/reactos/base/applications/mscutils/servman/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/lang/he-IL.rc?rev=71872&r1=71871&r2=71872&view=diff Modified: trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc?rev=71872&r1=71871&r2=71872&view=diff Modified: trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc?rev=71872&r1=71871&r2=71872&view=diff Modified: trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc?rev=71872&r1=71871&r2=71872&view=diff Modified: trunk/reactos/base/applications/mscutils/servman/lang
[ros-diffs] [pschweitzer] 71871: [FLTMGR] Fix GCC build
Author: pschweitzer Date: Sat Jul 9 16:41:18 2016 New Revision: 71871 URL: http://svn.reactos.org/svn/reactos?rev=71871&view=rev Log: [FLTMGR] Fix GCC build Modified: trunk/reactos/drivers/filters/CMakeLists.txt trunk/reactos/drivers/filters/fltmgr/Object.c trunk/reactos/drivers/filters/fltmgr/Registration.c Modified: trunk/reactos/drivers/filters/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/CMakeLists.txt?rev=71871&r1=71870&r2=71871&view=diff == --- trunk/reactos/drivers/filters/CMakeLists.txt[iso-8859-1] (original) +++ trunk/reactos/drivers/filters/CMakeLists.txt[iso-8859-1] Sat Jul 9 16:41:18 2016 @@ -1,2 +1,2 @@ - +add_subdirectory(fltmgr) add_subdirectory(mountmgr) Modified: trunk/reactos/drivers/filters/fltmgr/Object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/fltmgr/Object.c?rev=71871&r1=71870&r2=71871&view=diff == --- trunk/reactos/drivers/filters/fltmgr/Object.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/fltmgr/Object.c [iso-8859-1] Sat Jul 9 16:41:18 2016 @@ -25,10 +25,10 @@ NTSTATUS -NTAPI -FltObjectReference(_Inout_ PFLT_OBJECT Object) +FLTAPI +FltObjectReference(_Inout_ PVOID Object) { -if (!FltpExAcquireRundownProtection(&Object->RundownRef)) +if (!FltpExAcquireRundownProtection(&((PFLT_OBJECT)Object)->RundownRef)) { return STATUS_FLT_DELETING_OBJECT; } @@ -37,10 +37,10 @@ } VOID -NTAPI -FltObjectDereference(_Inout_ PFLT_OBJECT Object) +FLTAPI +FltObjectDereference(_Inout_ PVOID Object) { -FltpExReleaseRundownProtection(&Object->RundownRef); +FltpExReleaseRundownProtection(&((PFLT_OBJECT)Object)->RundownRef); } Modified: trunk/reactos/drivers/filters/fltmgr/Registration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/fltmgr/Registration.c?rev=71871&r1=71870&r2=71871&view=diff == --- trunk/reactos/drivers/filters/fltmgr/Registration.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/fltmgr/Registration.c [iso-8859-1] Sat Jul 9 16:41:18 2016 @@ -205,6 +205,7 @@ Instance = CONTAINING_RECORD(CurrentEntry, FLT_INSTANCE, FilterLink); // FIXME: implement +(void)Instance; /* Reset the pointer and move to next entry */ Instance = NULL;
[ros-diffs] [pschweitzer] 71870: [DDK] MS DDK defines FLT_CALLBACK_DATA_QUEUE_FLAGS as ULONG.
Author: pschweitzer Date: Sat Jul 9 16:40:31 2016 New Revision: 71870 URL: http://svn.reactos.org/svn/reactos?rev=71870&view=rev Log: [DDK] MS DDK defines FLT_CALLBACK_DATA_QUEUE_FLAGS as ULONG. Modified: trunk/reactos/sdk/include/ddk/fltkernel.h Modified: trunk/reactos/sdk/include/ddk/fltkernel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/fltkernel.h?rev=71870&r1=71869&r2=71870&view=diff == --- trunk/reactos/sdk/include/ddk/fltkernel.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/fltkernel.h [iso-8859-1] Sat Jul 9 16:40:31 2016 @@ -911,7 +911,7 @@ _Inout_ PFLT_CALLBACK_DATA_QUEUE Cbdq, _Inout_ PFLT_CALLBACK_DATA Cbd); -typedef enum _FLT_CALLBACK_DATA_QUEUE_FLAGS FLT_CALLBACK_DATA_QUEUE_FLAGS; +typedef ULONG FLT_CALLBACK_DATA_QUEUE_FLAGS; typedef struct _FLT_CALLBACK_DATA_QUEUE { IO_CSQ Csq;
[ros-diffs] [pschweitzer] 71869: [NTFS][FREELDR] Cherrypick r71807 by Trevor Thompson
Author: pschweitzer Date: Sat Jul 9 16:21:13 2016 New Revision: 71869 URL: http://svn.reactos.org/svn/reactos?rev=71869&view=rev Log: [NTFS][FREELDR] Cherrypick r71807 by Trevor Thompson Modified: trunk/reactos/boot/freeldr/freeldr/lib/fs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/boot/freeldr/freeldr/lib/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/lib/fs/ntfs.c?rev=71869&r1=71868&r2=71869&view=diff == --- trunk/reactos/boot/freeldr/freeldr/lib/fs/ntfs.c[iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/lib/fs/ntfs.c[iso-8859-1] Sat Jul 9 16:21:13 2016 @@ -320,9 +320,6 @@ } else DataRunStartLCN = -1; - -if (*DataRun == 0) -return AlreadyRead; } while (Length > 0) Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/mft.c?rev=71869&r1=71868&r2=71869&view=diff == --- trunk/reactos/drivers/filesystems/ntfs/mft.c[iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c[iso-8859-1] Sat Jul 9 16:21:13 2016 @@ -273,9 +273,6 @@ } else DataRunStartLCN = -1; - -if (*DataRun == 0) -return AlreadyRead; } while (Length > 0)
[ros-diffs] [tfaber] 71868: [ACPI] - This bus hosts all physical hardware. Surely some of it can be in the paging path...
Author: tfaber Date: Sat Jul 9 15:40:02 2016 New Revision: 71868 URL: http://svn.reactos.org/svn/reactos?rev=71868&view=rev Log: [ACPI] - This bus hosts all physical hardware. Surely some of it can be in the paging path... Modified: trunk/reactos/drivers/bus/acpi/pnp.c Modified: trunk/reactos/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/pnp.c?rev=71868&r1=71867&r2=71868&view=diff == --- trunk/reactos/drivers/bus/acpi/pnp.c[iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/pnp.c[iso-8859-1] Sat Jul 9 15:40:02 2016 @@ -461,8 +461,6 @@ pdoData->Common.DevicePowerState = ntState; pdoData->Common.SystemPowerState = FdoData->Common.SystemPowerState; - -Pdo->Flags |= DO_POWER_PAGABLE; ExAcquireFastMutex (&FdoData->Mutex); InsertTailList(&FdoData->ListOfPDOs, &pdoData->Link);
[ros-diffs] [hbelusca] 71867: [EVENTVWR] - Display 3 different "types" of logs in the tree: "system logs": Application, Security, System, that are the minimal set of standard logs present on NT system
Author: hbelusca Date: Sat Jul 9 12:32:21 2016 New Revision: 71867 URL: http://svn.reactos.org/svn/reactos?rev=71867&view=rev Log: [EVENTVWR] - Display 3 different "types" of logs in the tree: "system logs": Application, Security, System, that are the minimal set of standard logs present on NT systems; "application logs": all the other logs, that are available to the event log service (both "system" and "application" logs are registered in the registry, under the "EventLog" service key). Finally comes the "user logs" that consists in all the log files that are manually opened by the user inthe event log viewer. - Use 'PEVENTLOGRECORD' instead of 'EVENTLOGRECORD *'. - Don't hardcode the buffer length values in the size parameters used in the GetEventUserName function. - Merge both GetDisplayNameFile and GetDisplayNameID helpers into a single GetDisplayNameFileAndID function, since the former two were always called in tandem. - Forbid editing the labels of the tree root nodes "system"/"application"/"user" logs. - Splitter bar: set the cursor only when it is on the bar, not when it is above the status bar... - Resize the status bar only in WM_SIZE events. - Remove few dead code. Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc trunk/reactos/base/applications/mscutils/eventvwr/resource.h Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c?rev=71867&r1=71866&r2=71867&view=diff == --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sat Jul 9 12:32:21 2016 @@ -56,8 +56,16 @@ HFONT hMonospaceFont; } DETAILDATA, *PDETAILDATA; -static const WCHAR szWindowClass[] = L"EVENTVWR"; /* the main window class name */ -static const WCHAR EVENTLOG_BASE_KEY[] = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"; +static const LPCWSTR szWindowClass = L"EVENTVWR"; /* The main window class name */ +static const WCHAR EVENTLOG_BASE_KEY[] = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\"; + +/* The 3 system logs that should always exist in the user's system */ +static const LPCWSTR SystemLogs[] = +{ +L"Application", +L"Security", +L"System" +}; /* MessageFile message buffer size */ #define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 @@ -73,7 +81,7 @@ #define SPLIT_WIDTH 4 /* Globals */ -HINSTANCE hInst;/* current instance */ +HINSTANCE hInst;/* Current instance */ WCHAR szTitle[MAX_LOADSTRING]; /* The title bar text */ WCHAR szTitleTemplate[MAX_LOADSTRING]; /* The logged-on title bar text */ WCHAR szSaveFilter[MAX_LOADSTRING]; /* Filter Mask for the save Dialog */ @@ -85,7 +93,7 @@ HMENU hMainMenu;/* The application's main menu */ WCHAR szStatusBarTemplate[MAX_LOADSTRING]; /* The status bar text */ -HTREEITEM htiSystemLogs = NULL, htiUserLogs = NULL; +HTREEITEM htiSystemLogs = NULL, htiAppLogs = NULL, htiUserLogs = NULL; BOOL NewestEventsFirst = TRUE; PEVENTLOGRECORD *g_RecordPtrs = NULL; @@ -98,7 +106,7 @@ DWORD dwNumLogs = 0; LPWSTR* LogNames = NULL; -/* Forwa