Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjansen] 71882: [WIN32SS] Do not try to call DevModes when it is NULL (mirror drivers). Patch by Victor Matovykh. CORE-11441 #resolve #comment Thanks!
by mjansen＠svn.reactos.org 10 Jul '16

10 Jul '16

Author: mjansen Date: Sun Jul 10 14:23:58 2016 New Revision: 71882 URL: http://svn.reactos.org/svn/reactos?rev=71882&view=rev Log: [WIN32SS] Do not try to call DevModes when it is NULL (mirror drivers). Patch by Victor Matovykh. CORE-11441 #resolve #comment Thanks! Modified: trunk/reactos/win32ss/gdi/eng/ldevobj.c Modified: trunk/reactos/win32ss/gdi/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/ldevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/ldevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/ldevobj.c [iso-8859-1] Sun Jul 10 14:23:58 2016 @@ -122,6 +122,12 @@ TRACE("LDEVOBJ_pdmiGetModes(%p, %p)\n", pldev, hDriver); + /* Mirror drivers may omit this function */ + if (!pldev->pfn.GetModes) + { + return NULL; + } + /* Call the driver to get the required size */ cbSize = pldev->pfn.GetModes(hDriver, 0, NULL); if (!cbSize)

1 0

[mjansen] 71881: [RAPPS] Fix some translated / misspelled tags.
by mjansen＠svn.reactos.org 10 Jul '16

10 Jul '16

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/ac97forvirtual… ============================================================================== --- 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?re… ============================================================================== --- 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?r… ============================================================================== --- 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… ============================================================================== --- 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.tx… ============================================================================== --- trunk/reactos/media/rapps/nirlauncher.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/nirlauncher.txt [iso-8859-1] Sun Jul 10 00:18:20 2016 @@ -19,11 +19,11 @@ Size = 23,1 Mio [Section.0a] -Licence = Gratuita +License = Gratuita Description = Un paquete con mÃ¡s de 180 utilidades. [Section.0418] -Licence = GratuitÄ +License = GratuitÄ Description = Pachet cu peste 180 de utilitare. Size = 23,1 Mio Modified: trunk/reactos/media/rapps/pptview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pptview.txt?re… ============================================================================== --- trunk/reactos/media/rapps/pptview.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/pptview.txt [iso-8859-1] Sun Jul 10 00:18:20 2016 @@ -72,7 +72,7 @@ SHA1 = b5c45563401e2b2d28c79f1b992ecd12f47a9938 [Section.0804] -Licence = æªç¥ +License = æªç¥ Size = 60.8 MiB Description = åè´¹è½¯ä»¶æ¼ç¤ºæç¨¿æ¥çå¨ Office æ ¼å¼ (*.ppt)ã URLDownload = http://download.microsoft.com/download/2/9/C/29CA8826-374F-4EFB-B477-A26D1C… Modified: trunk/reactos/media/rapps/scratch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scratch.txt?re… ============================================================================== --- trunk/reactos/media/rapps/scratch.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/scratch.txt [iso-8859-1] Sun Jul 10 00:18:20 2016 @@ -1,7 +1,7 @@ [Section] Name = Scratch Version = 1.4 -Licence = GPL +License = GPL Description = Visual object-oriented programming enviroment for children. Size = 33.0 MiB Category = 8 Modified: trunk/reactos/media/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tahoma.txt?rev… ============================================================================== --- trunk/reactos/media/rapps/tahoma.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/tahoma.txt [iso-8859-1] Sun Jul 10 00:18:20 2016 @@ -50,7 +50,7 @@ Description = ÐÐ°ÐºÐµÑ ÑÑÐ¸ÑÑÑÐ² Tahoma, ÑÐ¾ Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ñ Ð´ÐµÑÐºÐ¸Ð¼ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°Ð¼ (Steam). Ð²ÐºÐ»ÑÑÐ°Ñ: Tahoma.ttf, Tahomabd.ttf. [Section.0804] -Licence = æªç¥ +License = æªç¥ Description = Tahoma åä½åæéçä¸äºåºç¨ç¨åº (Steam)ãåå«: Tahoma.ttfï¼Tahomabd.ttfã [Section.0813] Modified: trunk/reactos/media/rapps/windirstat.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/windirstat.txt… ============================================================================== --- trunk/reactos/media/rapps/windirstat.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/windirstat.txt [iso-8859-1] Sun Jul 10 00:18:20 2016 @@ -1,7 +1,7 @@ [Section] Name = WinDirStat Version = 1.1.2 -Licence = GPL +License = GPL Description = Program for analyzing disk usage and his cleanup. Size = 630.6 KiB Category = 12

1 0

[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 properties ...
by hbelusca＠svn.reactos.org 09 Jul '16

09 Jul '16

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-sys… 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/… ============================================================================== --- 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)

1 0

[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 GetFileAttributes.
by hbelusca＠svn.reactos.org 09 Jul '16

09 Jul '16

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 0xFFFFFFFF 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/… ============================================================================== --- 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 0xFFFFFFFF: /* 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/… ============================================================================== --- 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 != 0xFFFFFFFF) && - (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 == 0xffffffff) || - !(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");

1 0

[tfaber] 71878: [SERVMAN] - Fix MSVC build
by tfaber＠svn.reactos.org 09 Jul '16

09 Jul '16

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… ============================================================================== --- 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… ============================================================================== --- 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_ACTION 12100 #define IDS_RESTART_SERVICE 12101 #define IDS_RUN_PROGRAM 12102 -#define IDS_RESTART_COMPUTER 12103 +#define IDS_RESTART_COMPUTER 12103

1 0

[tfaber] 71877: [LIBXML2] - Fix MSVC build (already fixed upstream)
by tfaber＠svn.reactos.org 09 Jul '16

09 Jul '16

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/r… ============================================================================== --- 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/x… ============================================================================== --- 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");

1 0

[akhaldi] 71876: [LIBXSLT] Update to v1.1.29. CORE-11557
by akhaldi＠svn.reactos.org 09 Jul '16

09 Jul '16

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/Makef… ============================================================================== --- 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/Makef… ============================================================================== --- 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 && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,13 +90,12 @@ build_triplet = @build@ host_triplet = @host@ subdir = libxslt -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/xsltconfig.h.in $(srcdir)/xsltwin32config.h.in \ - $(xsltinc_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(xsltinc_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = xsltconfig.h xsltwin32config.h @@ -92,7 +128,7 @@ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" \ - "$(DESTDIR)$(xsltincdir)" + "$(DESTDIR)$(xsltincdir)" "$(DESTDIR)$(xsltincdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libxslt_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) @@ -100,13 +136,28 @@ pattern.lo templates.lo variables.lo keys.lo numbers.lo \ extensions.lo extra.lo functions.lo namespaces.lo imports.lo \ attributes.lo documents.lo preproc.lo transform.lo security.lo -libxslt_la_OBJECTS = $(am_libxslt_la_OBJECTS) +nodist_libxslt_la_OBJECTS = +libxslt_la_OBJECTS = $(am_libxslt_la_OBJECTS) \ + $(nodist_libxslt_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libxslt_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libxslt_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -119,21 +170,17 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(libxslt_la_SOURCES) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libxslt_la_SOURCES) $(nodist_libxslt_la_SOURCES) DIST_SOURCES = $(libxslt_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ @@ -143,9 +190,28 @@ man3dir = $(mandir)/man3 NROFF = nroff MANS = $(man_MANS) -HEADERS = $(xsltinc_HEADERS) +HEADERS = $(nodist_xsltinc_HEADERS) $(xsltinc_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/xsltconfig.h.in \ + $(srcdir)/xsltwin32config.h.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -161,6 +227,7 @@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYPTO_TESTDIR = @CRYPTO_TESTDIR@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -215,6 +282,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -346,9 +414,11 @@ transform.h \ security.h \ xsltInternals.h \ - xsltconfig.h \ xsltexports.h \ xsltlocale.h + +nodist_xsltinc_HEADERS = \ + xsltconfig.h libxslt_la_SOURCES = \ attrvt.c \ @@ -371,9 +441,11 @@ transform.c \ security.c \ win32config.h \ - xsltwin32config.h \ xsltwin32config.h.in \ libxslt.h + +nodist_libxslt_la_SOURCES = \ + xsltwin32config.h @USE_VERSION_SCRIPT_FALSE@LIBXSLT_VERSION_SCRIPT = @USE_VERSION_SCRIPT_TRUE@LIBXSLT_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxslt.syms @@ -401,7 +473,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libxslt/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu libxslt/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -423,6 +494,7 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ xsltwin32config.h: $(top_builddir)/config.status $(srcdir)/xsltwin32config.h.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -449,12 +521,15 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libxslt.la: $(libxslt_la_OBJECTS) $(libxslt_la_DEPENDENCIES) $(EXTRA_libxslt_la_DEPENDENCIES) $(AM_V_CCLD)$(libxslt_la_LINK) -rpath $(libdir) $(libxslt_la_OBJECTS) $(libxslt_la_LIBADD) $(LIBS) @@ -489,14 +564,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -553,6 +628,27 @@ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir) +install-nodist_xsltincHEADERS: $(nodist_xsltinc_HEADERS) + @$(NORMAL_INSTALL) + @list='$(nodist_xsltinc_HEADERS)'; test -n "$(xsltincdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(xsltincdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(xsltincdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(xsltincdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(xsltincdir)" || exit $$?; \ + done + +uninstall-nodist_xsltincHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(nodist_xsltinc_HEADERS)'; test -n "$(xsltincdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(xsltincdir)'; $(am__uninstall_files_from_dir) install-xsltincHEADERS: $(xsltinc_HEADERS) @$(NORMAL_INSTALL) @list='$(xsltinc_HEADERS)'; test -n "$(xsltincdir)" || list=; \ @@ -575,26 +671,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(xsltincdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -606,15 +691,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -623,24 +704,26 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -674,7 +757,7 @@ check: check-am all-am: Makefile $(LTLIBRARIES) $(MANS) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(xsltincdir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(xsltincdir)" "$(DESTDIR)$(xsltincdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -730,7 +813,8 @@ info-am: -install-data-am: install-man install-xsltincHEADERS +install-data-am: install-man install-nodist_xsltincHEADERS \ + install-xsltincHEADERS install-dvi: install-dvi-am @@ -778,27 +862,31 @@ ps-am: uninstall-am: uninstall-libLTLIBRARIES uninstall-man \ + uninstall-nodist_xsltincHEADERS uninstall-xsltincHEADERS + +uninstall-man: uninstall-man3 + +.MAKE: install-am install-exec-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-exec-hook install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ + install-man install-man3 install-nodist_xsltincHEADERS \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-xsltincHEADERS installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \ + uninstall-man uninstall-man3 uninstall-nodist_xsltincHEADERS \ uninstall-xsltincHEADERS -uninstall-man: uninstall-man3 - -.MAKE: install-am install-exec-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-exec-hook \ - install-html install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-man3 install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-xsltincHEADERS installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-libLTLIBRARIES uninstall-man \ - uninstall-man3 uninstall-xsltincHEADERS +.PRECIOUS: Makefile xsltproc: all Modified: trunk/reactos/dll/3rdparty/libxslt/attributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/attri… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/attributes.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/attributes.c [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -259,9 +259,11 @@ return; value = xmlGetNsProp(cur, (const xmlChar *)"name", NULL); - if (value == NULL) { + if ((value == NULL) || (*value == 0)) { xsltGenericError(xsltGenericErrorContext, "xsl:attribute-set : name is missing\n"); + if (value) + xmlFree(value); return; } @@ -444,19 +446,27 @@ } /** - * xsltResolveSASCallback,: + * xsltResolveSASCallbackInt: * @style: the XSLT stylesheet * * resolve the references in an attribute set. */ static void -xsltResolveSASCallback(xsltAttrElemPtr values, xsltStylesheetPtr style, +xsltResolveSASCallbackInt(xsltAttrElemPtr values, xsltStylesheetPtr style, const xmlChar *name, const xmlChar *ns, - ATTRIBUTE_UNUSED const xmlChar *ignored) { + int depth) { xsltAttrElemPtr tmp; xsltAttrElemPtr refs; tmp = values; + if ((name == NULL) || (name[0] == 0)) + return; + if (depth > 100) { + xsltGenericError(xsltGenericErrorContext, + "xsl:attribute-set : use-attribute-sets recursion detected on %s\n", + name); + return; + } while (tmp != NULL) { if (tmp->set != NULL) { /* @@ -481,7 +491,7 @@ /* * recurse first for cleanup */ - xsltResolveSASCallback(refs, style, name, ns, NULL); + xsltResolveSASCallbackInt(refs, style, name, ns, depth + 1); /* * Then merge */ @@ -496,6 +506,19 @@ } tmp = tmp->next; } +} + +/** + * xsltResolveSASCallback,: + * @style: the XSLT stylesheet + * + * resolve the references in an attribute set. + */ +static void +xsltResolveSASCallback(xsltAttrElemPtr values, xsltStylesheetPtr style, + const xmlChar *name, const xmlChar *ns, + ATTRIBUTE_UNUSED const xmlChar *ignored) { + xsltResolveSASCallbackInt(values, style, name, ns, 1); } /** Modified: trunk/reactos/dll/3rdparty/libxslt/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/exten… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/extensions.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/extensions.c [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -350,8 +350,11 @@ i++; } - if (*(i - 1) == '_') + /* Strip underscores from end of string. */ + while (i > ext_name && *(i - 1) == '_') { + i--; *i = '\0'; + } /* determine module directory */ ext_directory = (xmlChar *) getenv("LIBXSLT_PLUGINS_PATH"); @@ -1605,7 +1608,7 @@ xsltPreComputeFunction precomp, xsltTransformFunction transform) { - int ret; + int ret = 0; xsltExtElementPtr ext; @@ -1631,7 +1634,7 @@ done: xmlMutexUnlock(xsltExtMutex); - return (0); + return (ret); } /** Modified: trunk/reactos/dll/3rdparty/libxslt/functions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/funct… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/functions.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/functions.c [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -152,7 +152,6 @@ resObj = xmlXPtrEval(fragment, xptrctxt); xmlXPathFreeContext(xptrctxt); #endif - xmlFree(fragment); if (resObj == NULL) goto out_fragment; @@ -176,6 +175,7 @@ } valuePush(ctxt, resObj); + xmlFree(fragment); return; out_object: @@ -183,6 +183,7 @@ out_fragment: valuePush(ctxt, xmlXPathNewNodeSet(NULL)); + xmlFree(fragment); } /** @@ -637,7 +638,6 @@ xmlXPathObjectPtr obj = NULL; long val; xmlChar str[30]; - xmlDocPtr doc; if (nargs == 0) { cur = ctxt->context->node; @@ -670,30 +670,15 @@ ctxt->error = XPATH_INVALID_ARITY; return; } - /* - * Okay this is ugly but should work, use the NodePtr address - * to forge the ID - */ - if (cur->type != XML_NAMESPACE_DECL) - doc = cur->doc; - else { - xmlNsPtr ns = (xmlNsPtr) cur; - - if (ns->context != NULL) - doc = ns->context; - else - doc = ctxt->context->doc; - - } if (obj) xmlXPathFreeObject(obj); val = (long)((char *)cur - (char *)&base_address); if (val >= 0) { - sprintf((char *)str, "idp%ld", val); - } else { - sprintf((char *)str, "idm%ld", -val); + snprintf((char *)str, sizeof(str), "idp%ld", val); + } else { + snprintf((char *)str, sizeof(str), "idm%ld", -val); } valuePush(ctxt, xmlXPathNewString(str)); } Modified: trunk/reactos/dll/3rdparty/libxslt/imports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/impor… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/imports.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/imports.c [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -363,17 +363,12 @@ return(NULL); style = ctxt->style; while (style != NULL) { - cur = style->templates; - while (cur != NULL) { - if (xmlStrEqual(name, cur->name)) { - if (((nameURI == NULL) && (cur->nameURI == NULL)) || - ((nameURI != NULL) && (cur->nameURI != NULL) && - (xmlStrEqual(nameURI, cur->nameURI)))) { - return(cur); - } - } - cur = cur->next; - } + if (style->namedTemplates != NULL) { + cur = (xsltTemplatePtr) + xmlHashLookup2(style->namedTemplates, name, nameURI); + if (cur != NULL) + return(cur); + } style = xsltNextImport(style); } Modified: trunk/reactos/dll/3rdparty/libxslt/keys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/keys.… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/keys.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/keys.c [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -741,6 +741,7 @@ cur = matchList->nodeTab[i]; if (! IS_XSLT_REAL_NODE(cur)) continue; + ctxt->node = cur; xpctxt->node = cur; /* * Process the 'use' of the xsl:key. Modified: trunk/reactos/dll/3rdparty/libxslt/namespaces.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/names… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/namespaces.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/namespaces.c [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -752,8 +752,10 @@ /* TODO apply cascading */ URI = (const xmlChar *) xmlHashLookup(ctxt->style->nsAliases, cur->href); - if (URI == UNDEFINED_DEFAULT_NS) + if (URI == UNDEFINED_DEFAULT_NS) { + cur = cur->next; continue; + } if (URI != NULL) { q = xmlNewNs(node, URI, cur->prefix); } else { Modified: trunk/reactos/dll/3rdparty/libxslt/numbers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/numbe… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/numbers.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/numbers.c [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -210,7 +210,8 @@ } static void -xsltNumberFormatAlpha(xmlBufferPtr buffer, +xsltNumberFormatAlpha(xsltNumberDataPtr data, + xmlBufferPtr buffer, double number, int is_upper) { @@ -220,6 +221,26 @@ char *alpha_list; double alpha_size = (double)(sizeof(alpha_upper_list) - 1); + /* + * XSLT 1.0 isn't clear on how to handle zero, but XSLT 2.0 says: + * + * For all format tokens other than the first kind above (one that + * consists of decimal digits), there may be implementation-defined + * lower and upper bounds on the range of numbers that can be + * formatted using this format token; indeed, for some numbering + * sequences there may be intrinsic limits. [...] Numbers that fall + * outside this range must be formatted using the format token 1. + * + * The "a" token has an intrinsic lower limit of 1. + */ + if (number < 1.0) { + xsltNumberFormatDecimal(buffer, number, '0', 1, + data->digitsPerGroup, + data->groupingCharacter, + data->groupingCharacterLen); + return; + } + /* Build buffer from back */ pointer = &temp_string[sizeof(temp_string)]; *(--pointer) = 0; @@ -229,17 +250,30 @@ number--; *(--pointer) = alpha_list[((int)fmod(number, alpha_size))]; number /= alpha_size; - if (fabs(number) < 1.0) + if (number < 1.0) break; /* for */ } xmlBufferCCat(buffer, pointer); } static void -xsltNumberFormatRoman(xmlBufferPtr buffer, +xsltNumberFormatRoman(xsltNumberDataPtr data, + xmlBufferPtr buffer, double number, int is_upper) { + /* + * See discussion in xsltNumberFormatAlpha. Also use a reasonable upper + * bound to avoid denial of service. + */ + if (number < 1.0 || number > 5000.0) { + xsltNumberFormatDecimal(buffer, number, '0', 1, + data->digitsPerGroup, + data->groupingCharacter, + data->groupingCharacterLen); + return; + } + /* * Based on an example by Jim Walsh */ @@ -423,6 +457,23 @@ for (i = 0; i < numbers_max; i++) { /* Insert number */ number = numbers[(numbers_max - 1) - i]; + /* Round to nearest like XSLT 2.0 */ + number = floor(number + 0.5); + /* + * XSLT 1.0 isn't clear on how to handle negative numbers, but XSLT + * 2.0 says: + * + * It is a non-recoverable dynamic error if any undiscarded item + * in the atomized sequence supplied as the value of the value + * attribute of xsl:number cannot be converted to an integer, or + * if the resulting integer is less than 0 (zero). + */ + if (number < 0.0) { + xsltTransformError(NULL, NULL, NULL, + "xsl-number : negative value\n"); + /* Recover by treating negative values as zero. */ + number = 0.0; + } if (i < tokens->nTokens) { /* * The "n"th format token will be used to format the "n"th @@ -466,28 +517,16 @@ switch (token->token) { case 'A': - xsltNumberFormatAlpha(buffer, - number, - TRUE); - + xsltNumberFormatAlpha(data, buffer, number, TRUE); break; case 'a': - xsltNumberFormatAlpha(buffer, - number, - FALSE); - + xsltNumberFormatAlpha(data, buffer, number, FALSE); break; case 'I': - xsltNumberFormatRoman(buffer, - number, - TRUE); - + xsltNumberFormatRoman(data, buffer, number, TRUE); break; case 'i': - xsltNumberFormatRoman(buffer, - number, - FALSE); - + xsltNumberFormatRoman(data, buffer, number, FALSE); break; default: if (IS_DIGIT_ZERO(token->token)) { @@ -515,13 +554,48 @@ } static int +xsltTestCompMatchCount(xsltTransformContextPtr context, + xmlNodePtr node, + xsltCompMatchPtr countPat, + xmlNodePtr cur) +{ + if (countPat != NULL) { + return xsltTestCompMatchList(context, node, countPat); + } + else { + /* + * 7.7 Numbering + * + * If count attribute is not specified, then it defaults to the + * pattern that matches any node with the same node type as the + * current node and, if the current node has an expanded-name, with + * the same expanded-name as the current node. + */ + if (node->type != cur->type) + return 0; + if (node->type == XML_NAMESPACE_DECL) + /* + * Namespace nodes have no preceding siblings and no parents + * that are namespace nodes. This means that node == cur. + */ + return 1; + /* TODO: Skip node types without expanded names like text nodes. */ + if (!xmlStrEqual(node->name, cur->name)) + return 0; + if (node->ns == cur->ns) + return 1; + if ((node->ns == NULL) || (cur->ns == NULL)) + return 0; + return (xmlStrEqual(node->ns->href, cur->ns->href)); + } +} + +static int xsltNumberFormatGetAnyLevel(xsltTransformContextPtr context, xmlNodePtr node, xsltCompMatchPtr countPat, xsltCompMatchPtr fromPat, - double *array, - xmlDocPtr doc, - xmlNodePtr elem) + double *array) { int amount = 0; int cnt = 0; @@ -547,21 +621,8 @@ while (cur != NULL) { /* process current node */ - if (countPat == NULL) { - if ((node->type == cur->type) && - /* FIXME: must use expanded-name instead of local name */ - xmlStrEqual(node->name, cur->name)) { - if ((node->ns == cur->ns) || - ((node->ns != NULL) && - (cur->ns != NULL) && - (xmlStrEqual(node->ns->href, - cur->ns->href) ))) - cnt++; - } - } else { - if (xsltTestCompMatchList(context, cur, countPat)) - cnt++; - } + if (xsltTestCompMatchCount(context, cur, countPat, node)) + cnt++; if ((fromPat != NULL) && xsltTestCompMatchList(context, cur, fromPat)) { break; /* while */ @@ -598,9 +659,7 @@ xsltCompMatchPtr countPat, xsltCompMatchPtr fromPat, double *array, - int max, - xmlDocPtr doc, - xmlNodePtr elem) + int max) { int amount = 0; int cnt; @@ -620,30 +679,18 @@ xsltTestCompMatchList(context, ancestor, fromPat)) break; /* for */ - if ((countPat == NULL && node->type == ancestor->type && - xmlStrEqual(node->name, ancestor->name)) || - xsltTestCompMatchList(context, ancestor, countPat)) { + if (xsltTestCompMatchCount(context, ancestor, countPat, node)) { /* count(preceding-sibling::*) */ - cnt = 0; - for (preceding = ancestor; + cnt = 1; + for (preceding = + xmlXPathNextPrecedingSibling(parser, ancestor); preceding != NULL; preceding = xmlXPathNextPrecedingSibling(parser, preceding)) { - if (countPat == NULL) { - if ((preceding->type == ancestor->type) && - xmlStrEqual(preceding->name, ancestor->name)){ - if ((preceding->ns == ancestor->ns) || - ((preceding->ns != NULL) && - (ancestor->ns != NULL) && - (xmlStrEqual(preceding->ns->href, - ancestor->ns->href) ))) - cnt++; - } - } else { - if (xsltTestCompMatchList(context, preceding, - countPat)) - cnt++; - } + + if (xsltTestCompMatchCount(context, preceding, countPat, + node)) + cnt++; } array[amount++] = (double)cnt; if (amount >= max) @@ -700,23 +747,28 @@ int amount, i; double number; xsltFormat tokens; - int tempformat = 0; - - if ((data->format == NULL) && (data->has_format != 0)) { - data->format = xsltEvalAttrValueTemplate(ctxt, data->node, + + if (data->format != NULL) { + xsltNumberFormatTokenize(data->format, &tokens); + } + else { + xmlChar *format; + + /* The format needs to be recomputed each time */ + if (data->has_format == 0) + return; + format = xsltEvalAttrValueTemplate(ctxt, data->node, (const xmlChar *) "format", XSLT_NAMESPACE); - tempformat = 1; - } - if (data->format == NULL) { - return; + if (format == NULL) + return; + xsltNumberFormatTokenize(format, &tokens); + xmlFree(format); } output = xmlBufferCreate(); if (output == NULL) goto XSLT_NUMBER_FORMAT_END; - - xsltNumberFormatTokenize(data->format, &tokens); /* * Evaluate the XPath expression to find the value(s) @@ -742,9 +794,7 @@ data->countPat, data->fromPat, &number, - 1, - data->doc, - data->node); + 1); if (amount == 1) { xsltNumberFormatInsertNumbers(data, &number, @@ -760,9 +810,7 @@ data->countPat, data->fromPat, numarray, - max, - data->doc, - data->node); + max); if (amount > 0) { xsltNumberFormatInsertNumbers(data, numarray, @@ -775,9 +823,7 @@ node, data->countPat, data->fromPat, - &number, - data->doc, - data->node); + &number); if (amount > 0) { xsltNumberFormatInsertNumbers(data, &number, @@ -790,6 +836,9 @@ /* Insert number as text node */ xsltCopyTextString(ctxt, ctxt->insert, xmlBufferContent(output), 0); + xmlBufferFree(output); + +XSLT_NUMBER_FORMAT_END: if (tokens.start != NULL) xmlFree(tokens.start); if (tokens.end != NULL) @@ -798,14 +847,6 @@ if (tokens.tokens[i].separator != NULL) xmlFree(tokens.tokens[i].separator); } - -XSLT_NUMBER_FORMAT_END: - if (tempformat == 1) { - /* The format need to be recomputed each time */ - data->format = NULL; - } - if (output != NULL) - xmlBufferFree(output); } static int Modified: trunk/reactos/dll/3rdparty/libxslt/pattern.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/patte… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/pattern.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/pattern.c [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -432,11 +432,14 @@ xsltCompMatchAdd(ctxt, comp, XSLT_OP_END, NULL, NULL, 0); /* - * detect consecutive XSLT_OP_PREDICATE indicating a direct - * matching should be done. + * Detect consecutive XSLT_OP_PREDICATE and predicates on ops which + * haven't been optimized yet indicating a direct matching should be done. */ for (i = 0;i < comp->nbStep - 1;i++) { - if ((comp->steps[i].op == XSLT_OP_PREDICATE) && + xsltOp op = comp->steps[i].op; + + if ((op != XSLT_OP_ELEM) && + (op != XSLT_OP_ALL) && (comp->steps[i + 1].op == XSLT_OP_PREDICATE)) { comp->direct = 1; @@ -602,6 +605,280 @@ } /** + * xsltTestPredicateMatch: + * @ctxt: a XSLT process context + * @comp: the precompiled pattern + * @node: a node + * @step: the predicate step + * @sel: the previous step + * + * Test whether the node matches the predicate + * + * Returns 1 if it matches, 0 if it doesn't and -1 in case of failure + */ +static int +xsltTestPredicateMatch(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp, + xmlNodePtr node, xsltStepOpPtr step, + xsltStepOpPtr sel) { + xmlNodePtr oldNode; + xmlDocPtr doc; + int oldCS, oldCP; + int pos = 0, len = 0; + int isRVT; + int match; + + if (step->value == NULL) + return(0); + if (step->comp == NULL) + return(0); + + doc = node->doc; + if (XSLT_IS_RES_TREE_FRAG(doc)) + isRVT = 1; + else + isRVT = 0; + + /* + * Recompute contextSize and proximityPosition. + * + * TODO: Make this work for additional ops. Currently, only XSLT_OP_ELEM + * and XSLT_OP_ALL are supported. + */ + oldCS = ctxt->xpathCtxt->contextSize; + oldCP = ctxt->xpathCtxt->proximityPosition; + if ((sel != NULL) && + (sel->op == XSLT_OP_ELEM) && + (sel->value != NULL) && + (node->type == XML_ELEMENT_NODE) && + (node->parent != NULL)) { + xmlNodePtr previous; + int nocache = 0; + + previous = (xmlNodePtr) + XSLT_RUNTIME_EXTRA(ctxt, sel->previousExtra, ptr); + if ((previous != NULL) && + (previous->parent == node->parent)) { + /* + * just walk back to adjust the index + */ + int indx = 0; + xmlNodePtr sibling = node; + + while (sibling != NULL) { + if (sibling == previous) + break; + if ((sibling->type == XML_ELEMENT_NODE) && + (previous->name != NULL) && + (sibling->name != NULL) && + (previous->name[0] == sibling->name[0]) && + (xmlStrEqual(previous->name, sibling->name))) + { + if ((sel->value2 == NULL) || + ((sibling->ns != NULL) && + (xmlStrEqual(sel->value2, sibling->ns->href)))) + indx++; + } + sibling = sibling->prev; + } + if (sibling == NULL) { + /* hum going backward in document order ... */ + indx = 0; + sibling = node; + while (sibling != NULL) { + if (sibling == previous) + break; + if ((sibling->type == XML_ELEMENT_NODE) && + (previous->name != NULL) && + (sibling->name != NULL) && + (previous->name[0] == sibling->name[0]) && + (xmlStrEqual(previous->name, sibling->name))) + { + if ((sel->value2 == NULL) || + ((sibling->ns != NULL) && + (xmlStrEqual(sel->value2, + sibling->ns->href)))) + { + indx--; + } + } + sibling = sibling->next; + } + } + if (sibling != NULL) { + pos = XSLT_RUNTIME_EXTRA(ctxt, sel->indexExtra, ival) + indx; + /* + * If the node is in a Value Tree we need to + * save len, but cannot cache the node! + * (bugs 153137 and 158840) + */ + if (node->doc != NULL) { + len = XSLT_RUNTIME_EXTRA(ctxt, sel->lenExtra, ival); + if (!isRVT) { + XSLT_RUNTIME_EXTRA(ctxt, + sel->previousExtra, ptr) = node; + XSLT_RUNTIME_EXTRA(ctxt, sel->indexExtra, ival) = pos; + } + } + } else + pos = 0; + } else { + /* + * recompute the index + */ + xmlNodePtr parent = node->parent; + xmlNodePtr siblings = NULL; + + if (parent) siblings = parent->children; + + while (siblings != NULL) { + if (siblings->type == XML_ELEMENT_NODE) { + if (siblings == node) { + len++; + pos = len; + } else if ((node->name != NULL) && + (siblings->name != NULL) && + (node->name[0] == siblings->name[0]) && + (xmlStrEqual(node->name, siblings->name))) { + if ((sel->value2 == NULL) || + ((siblings->ns != NULL) && + (xmlStrEqual(sel->value2, siblings->ns->href)))) + len++; + } + } + siblings = siblings->next; + } + if ((parent == NULL) || (node->doc == NULL)) + nocache = 1; + else { + while (parent->parent != NULL) + parent = parent->parent; + if (((parent->type != XML_DOCUMENT_NODE) && + (parent->type != XML_HTML_DOCUMENT_NODE)) || + (parent != (xmlNodePtr) node->doc)) + nocache = 1; + } + } + if (pos != 0) { + ctxt->xpathCtxt->contextSize = len; + ctxt->xpathCtxt->proximityPosition = pos; + /* + * If the node is in a Value Tree we cannot + * cache it ! + */ + if ((!isRVT) && (node->doc != NULL) && + (nocache == 0)) { + XSLT_RUNTIME_EXTRA(ctxt, sel->previousExtra, ptr) = node; + XSLT_RUNTIME_EXTRA(ctxt, sel->indexExtra, ival) = pos; + XSLT_RUNTIME_EXTRA(ctxt, sel->lenExtra, ival) = len; + } + } + } else if ((sel != NULL) && (sel->op == XSLT_OP_ALL) && + (node->type == XML_ELEMENT_NODE)) { + xmlNodePtr previous; + int nocache = 0; + + previous = (xmlNodePtr) + XSLT_RUNTIME_EXTRA(ctxt, sel->previousExtra, ptr); + if ((previous != NULL) && + (previous->parent == node->parent)) { + /* + * just walk back to adjust the index + */ + int indx = 0; + xmlNodePtr sibling = node; + + while (sibling != NULL) { + if (sibling == previous) + break; + if (sibling->type == XML_ELEMENT_NODE) + indx++; + sibling = sibling->prev; + } + if (sibling == NULL) { + /* hum going backward in document order ... */ + indx = 0; + sibling = node; + while (sibling != NULL) { + if (sibling == previous) + break; + if (sibling->type == XML_ELEMENT_NODE) + indx--; + sibling = sibling->next; + } + } + if (sibling != NULL) { + pos = XSLT_RUNTIME_EXTRA(ctxt, + sel->indexExtra, ival) + indx; + /* + * If the node is in a Value Tree we cannot + * cache it ! + */ + if ((node->doc != NULL) && !isRVT) { + len = XSLT_RUNTIME_EXTRA(ctxt, sel->lenExtra, ival); + XSLT_RUNTIME_EXTRA(ctxt, sel->previousExtra, ptr) = node; + XSLT_RUNTIME_EXTRA(ctxt, sel->indexExtra, ival) = pos; + } + } else + pos = 0; + } else { + /* + * recompute the index + */ + xmlNodePtr parent = node->parent; + xmlNodePtr siblings = NULL; + + if (parent) siblings = parent->children; + + while (siblings != NULL) { + if (siblings->type == XML_ELEMENT_NODE) { + len++; + if (siblings == node) { + pos = len; + } + } + siblings = siblings->next; + } + if ((parent == NULL) || (node->doc == NULL)) + nocache = 1; + else { + while (parent->parent != NULL) + parent = parent->parent; + if (((parent->type != XML_DOCUMENT_NODE) && + (parent->type != XML_HTML_DOCUMENT_NODE)) || + (parent != (xmlNodePtr) node->doc)) + nocache = 1; + } + } + if (pos != 0) { + ctxt->xpathCtxt->contextSize = len; + ctxt->xpathCtxt->proximityPosition = pos; + /* + * If the node is in a Value Tree we cannot + * cache it ! + */ + if ((node->doc != NULL) && (nocache == 0) && !isRVT) { + XSLT_RUNTIME_EXTRA(ctxt, sel->previousExtra, ptr) = node; + XSLT_RUNTIME_EXTRA(ctxt, sel->indexExtra, ival) = pos; + XSLT_RUNTIME_EXTRA(ctxt, sel->lenExtra, ival) = len; + } + } + } + + oldNode = ctxt->node; + ctxt->node = node; + + match = xsltEvalXPathPredicate(ctxt, step->comp, comp->nsList, comp->nsNr); + + if (pos != 0) { + ctxt->xpathCtxt->contextSize = oldCS; + ctxt->xpathCtxt->proximityPosition = oldCP; + } + ctxt->node = oldNode; + + return match; +} + +/** * xsltTestCompMatch: * @ctxt: a XSLT process context * @comp: the precompiled pattern @@ -615,9 +892,10 @@ */ static int xsltTestCompMatch(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp, - xmlNodePtr node, const xmlChar *mode, + xmlNodePtr matchNode, const xmlChar *mode, const xmlChar *modeURI) { int i; + xmlNodePtr node = matchNode; xsltStepOpPtr step, sel = NULL; xsltStepStates states = {0, 0, NULL}; /* // may require backtrack */ @@ -835,14 +1113,9 @@ goto rollback; break; case XSLT_OP_PREDICATE: { - xmlNodePtr oldNode; - xmlDocPtr doc; - int oldCS, oldCP; - int pos = 0, len = 0; - int isRVT; - /* - * when there is cascading XSLT_OP_PREDICATE, then use a + * When there is cascading XSLT_OP_PREDICATE or a predicate + * after an op which hasn't been optimized yet, then use a * direct computation approach. It's not done directly * at the beginning of the routine to filter out as much * as possible this costly computation. @@ -852,278 +1125,14 @@ /* Free the rollback states */ xmlFree(states.states); } - return(xsltTestCompMatchDirect(ctxt, comp, node, + return(xsltTestCompMatchDirect(ctxt, comp, matchNode, comp->nsList, comp->nsNr)); } - doc = node->doc; - if (XSLT_IS_RES_TREE_FRAG(doc)) - isRVT = 1; - else - isRVT = 0; - - /* - * Depending on the last selection, one may need to - * recompute contextSize and proximityPosition. - */ - oldCS = ctxt->xpathCtxt->contextSize; - oldCP = ctxt->xpathCtxt->proximityPosition; - if ((sel != NULL) && - (sel->op == XSLT_OP_ELEM) && - (sel->value != NULL) && - (node->type == XML_ELEMENT_NODE) && - (node->parent != NULL)) { - xmlNodePtr previous; - int nocache = 0; - - previous = (xmlNodePtr) - XSLT_RUNTIME_EXTRA(ctxt, sel->previousExtra, ptr); - if ((previous != NULL) && - (previous->parent == node->parent)) { - /* - * just walk back to adjust the index - */ - int indx = 0; - xmlNodePtr sibling = node; - - while (sibling != NULL) { - if (sibling == previous) - break; - if ((sibling->type == XML_ELEMENT_NODE) && - (previous->name != NULL) && - (sibling->name != NULL) && - (previous->name[0] == sibling->name[0]) && - (xmlStrEqual(previous->name, sibling->name))) - { - if ((sel->value2 == NULL) || - ((sibling->ns != NULL) && - (xmlStrEqual(sel->value2, - sibling->ns->href)))) - indx++; - } - sibling = sibling->prev; - } - if (sibling == NULL) { - /* hum going backward in document order ... */ - indx = 0; - sibling = node; - while (sibling != NULL) { - if (sibling == previous) - break; - if ((sibling->type == XML_ELEMENT_NODE) && - (previous->name != NULL) && - (sibling->name != NULL) && - (previous->name[0] == sibling->name[0]) && - (xmlStrEqual(previous->name, sibling->name))) - { - if ((sel->value2 == NULL) || - ((sibling->ns != NULL) && - (xmlStrEqual(sel->value2, - sibling->ns->href)))) - { - indx--; - } - } - sibling = sibling->next; - } - } - if (sibling != NULL) { - pos = XSLT_RUNTIME_EXTRA(ctxt, - sel->indexExtra, ival) + indx; - /* - * If the node is in a Value Tree we need to - * save len, but cannot cache the node! - * (bugs 153137 and 158840) - */ - if (node->doc != NULL) { - len = XSLT_RUNTIME_EXTRA(ctxt, - sel->lenExtra, ival); - if (!isRVT) { - XSLT_RUNTIME_EXTRA(ctxt, - sel->previousExtra, ptr) = node; - XSLT_RUNTIME_EXTRA(ctxt, - sel->indexExtra, ival) = pos; - } - } - } else - pos = 0; - } else { - /* - * recompute the index - */ - xmlNodePtr parent = node->parent; - xmlNodePtr siblings = NULL; - - if (parent) siblings = parent->children; - - while (siblings != NULL) { - if (siblings->type == XML_ELEMENT_NODE) { - if (siblings == node) { - len++; - pos = len; - } else if ((node->name != NULL) && - (siblings->name != NULL) && - (node->name[0] == siblings->name[0]) && - (xmlStrEqual(node->name, siblings->name))) { - if ((sel->value2 == NULL) || - ((siblings->ns != NULL) && - (xmlStrEqual(sel->value2, - siblings->ns->href)))) - len++; - } - } - siblings = siblings->next; - } - if ((parent == NULL) || (node->doc == NULL)) - nocache = 1; - else { - while (parent->parent != NULL) - parent = parent->parent; - if (((parent->type != XML_DOCUMENT_NODE) && - (parent->type != XML_HTML_DOCUMENT_NODE)) || - (parent != (xmlNodePtr) node->doc)) - nocache = 1; - } - } - if (pos != 0) { - ctxt->xpathCtxt->contextSize = len; - ctxt->xpathCtxt->proximityPosition = pos; - /* - * If the node is in a Value Tree we cannot - * cache it ! - */ - if ((!isRVT) && (node->doc != NULL) && - (nocache == 0)) { - XSLT_RUNTIME_EXTRA(ctxt, sel->previousExtra, ptr) = - node; - XSLT_RUNTIME_EXTRA(ctxt, sel->indexExtra, ival) = - pos; - XSLT_RUNTIME_EXTRA(ctxt, sel->lenExtra, ival) = - len; - } - } - } else if ((sel != NULL) && (sel->op == XSLT_OP_ALL) && - (node->type == XML_ELEMENT_NODE)) { - xmlNodePtr previous; - int nocache = 0; - - previous = (xmlNodePtr) - XSLT_RUNTIME_EXTRA(ctxt, sel->previousExtra, ptr); - if ((previous != NULL) && - (previous->parent == node->parent)) { - /* - * just walk back to adjust the index - */ - int indx = 0; - xmlNodePtr sibling = node; - - while (sibling != NULL) { - if (sibling == previous) - break; - if (sibling->type == XML_ELEMENT_NODE) - indx++; - sibling = sibling->prev; - } - if (sibling == NULL) { - /* hum going backward in document order ... */ - indx = 0; - sibling = node; - while (sibling != NULL) { - if (sibling == previous) - break; - if (sibling->type == XML_ELEMENT_NODE) - indx--; - sibling = sibling->next; - } - } - if (sibling != NULL) { - pos = XSLT_RUNTIME_EXTRA(ctxt, - sel->indexExtra, ival) + indx; - /* - * If the node is in a Value Tree we cannot - * cache it ! - */ - if ((node->doc != NULL) && !isRVT) { - len = XSLT_RUNTIME_EXTRA(ctxt, - sel->lenExtra, ival); - XSLT_RUNTIME_EXTRA(ctxt, - sel->previousExtra, ptr) = node; - XSLT_RUNTIME_EXTRA(ctxt, - sel->indexExtra, ival) = pos; - } - } else - pos = 0; - } else { - /* - * recompute the index - */ - xmlNodePtr parent = node->parent; - xmlNodePtr siblings = NULL; - - if (parent) siblings = parent->children; - - while (siblings != NULL) { - if (siblings->type == XML_ELEMENT_NODE) { - len++; - if (siblings == node) { - pos = len; - } - } - siblings = siblings->next; - } - if ((parent == NULL) || (node->doc == NULL)) - nocache = 1; - else { - while (parent->parent != NULL) - parent = parent->parent; - if (((parent->type != XML_DOCUMENT_NODE) && - (parent->type != XML_HTML_DOCUMENT_NODE)) || - (parent != (xmlNodePtr) node->doc)) - nocache = 1; - } - } - if (pos != 0) { - ctxt->xpathCtxt->contextSize = len; - ctxt->xpathCtxt->proximityPosition = pos; - /* - * If the node is in a Value Tree we cannot - * cache it ! - */ - if ((node->doc != NULL) && (nocache == 0) && !isRVT) { - XSLT_RUNTIME_EXTRA(ctxt, sel->previousExtra, ptr) = - node; - XSLT_RUNTIME_EXTRA(ctxt, sel->indexExtra, ival) = - pos; - XSLT_RUNTIME_EXTRA(ctxt, sel->lenExtra, ival) = - len; - } - } - } - oldNode = ctxt->node; - ctxt->node = node; - - if (step->value == NULL) - goto wrong_index; - if (step->comp == NULL) - goto wrong_index; - - if (!xsltEvalXPathPredicate(ctxt, step->comp, comp->nsList, - comp->nsNr)) - goto wrong_index; - - if (pos != 0) { - ctxt->xpathCtxt->contextSize = oldCS; - ctxt->xpathCtxt->proximityPosition = oldCP; - } - ctxt->node = oldNode; + if (!xsltTestPredicateMatch(ctxt, comp, node, step, sel)) + goto rollback; + break; -wrong_index: - if (pos != 0) { - ctxt->xpathCtxt->contextSize = oldCS; - ctxt->xpathCtxt->proximityPosition = oldCP; - } - ctxt->node = oldNode; - goto rollback; } case XSLT_OP_PI: if (node->type != XML_PI_NODE) @@ -1405,6 +1414,7 @@ if (CUR != ',') { xsltTransformError(NULL, NULL, NULL, "xsltCompileIdKeyPattern : , expected\n"); + xmlFree(lit); ctxt->error = 1; return; } @@ -2061,8 +2071,33 @@ const xmlChar *name = NULL; float priority; /* the priority */ - if ((style == NULL) || (cur == NULL) || (cur->match == NULL)) + if ((style == NULL) || (cur == NULL)) return(-1); + + /* Register named template */ + if (cur->name != NULL) { + if (style->namedTemplates == NULL) { + style->namedTemplates = xmlHashCreate(10); + if (style->namedTemplates == NULL) + return(-1); + } + else { + void *dup = xmlHashLookup2(style->namedTemplates, cur->name, + cur->nameURI); + if (dup != NULL) { + xsltTransformError(NULL, style, cur->elem, + "xsl:template: error duplicate name '%s'\n", + cur->name); + style->errors++; + return(-1); + } + } + + xmlHashAddEntry2(style->namedTemplates, cur->name, cur->nameURI, cur); + } + + if (cur->match == NULL) + return(0); priority = cur->priority; pat = xsltCompilePatternInternal(cur->match, style->doc, cur->elem, @@ -2533,5 +2568,7 @@ xsltFreeCompMatchList(style->piMatch); if (style->commentMatch != NULL) xsltFreeCompMatchList(style->commentMatch); -} - + if (style->namedTemplates != NULL) + xmlHashFree(style->namedTemplates, NULL); +} + Modified: trunk/reactos/dll/3rdparty/libxslt/preproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/prepr… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/preproc.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/preproc.c [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -925,6 +925,8 @@ #ifdef XSLT_REFACTORED comp->nsPrefix = prefix; comp->name = name; +#else + (void)name; /* Suppress unused variable warning. */ #endif } else if (prefix != NULL) { xsltTransformError(NULL, style, inst, @@ -1050,6 +1052,8 @@ #ifdef XSLT_REFACTORED comp->nsPrefix = prefix; comp->name = name; +#else + (void)name; /* Suppress unused variable warning. */ #endif } else { xsltTransformError(NULL, style, inst, @@ -1277,7 +1281,8 @@ if (prop == NULL) { style->errors++; } else { - *localName = prop; + if (localName) + *localName = prop; if (hasProp) *hasProp = 1; if (URI != NULL) { @@ -2221,7 +2226,8 @@ } else if (IS_XSLT_NAME(inst, "attribute")) { xmlNodePtr parent = inst->parent; - if ((parent == NULL) || (parent->ns == NULL) || + if ((parent == NULL) || + (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) || ((parent->ns != inst->ns) && (!xmlStrEqual(parent->ns->href, inst->ns->href))) || (!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) { Modified: trunk/reactos/dll/3rdparty/libxslt/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/trans… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/transform.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/transform.c [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -303,6 +303,104 @@ templ->templCountTab[templ->templNr] = 1; templ->templNr++; } +} + +/** + * xsltPreCompEval: + * @ctxt: transform context + * @node: context node + * @comp: precompiled expression + * + * Evaluate a precompiled XPath expression. + */ +static xmlXPathObjectPtr +xsltPreCompEval(xsltTransformContextPtr ctxt, xmlNodePtr node, + xsltStylePreCompPtr comp) { + xmlXPathObjectPtr res; + xmlXPathContextPtr xpctxt; + xmlNodePtr oldXPContextNode; + xmlNsPtr *oldXPNamespaces; + int oldXPProximityPosition, oldXPContextSize, oldXPNsNr; + + xpctxt = ctxt->xpathCtxt; + oldXPContextNode = xpctxt->node; + oldXPProximityPosition = xpctxt->proximityPosition; + oldXPContextSize = xpctxt->contextSize; + oldXPNsNr = xpctxt->nsNr; + oldXPNamespaces = xpctxt->namespaces; + + xpctxt->node = node; +#ifdef XSLT_REFACTORED + if (comp->inScopeNs != NULL) { + xpctxt->namespaces = comp->inScopeNs->list; + xpctxt->nsNr = comp->inScopeNs->xpathNumber; + } else { + xpctxt->namespaces = NULL; + xpctxt->nsNr = 0; + } +#else + xpctxt->namespaces = comp->nsList; + xpctxt->nsNr = comp->nsNr; +#endif + + res = xmlXPathCompiledEval(comp->comp, xpctxt); + + xpctxt->node = oldXPContextNode; + xpctxt->proximityPosition = oldXPProximityPosition; + xpctxt->contextSize = oldXPContextSize; + xpctxt->nsNr = oldXPNsNr; + xpctxt->namespaces = oldXPNamespaces; + + return(res); +} + +/** + * xsltPreCompEvalToBoolean: + * @ctxt: transform context + * @node: context node + * @comp: precompiled expression + * + * Evaluate a precompiled XPath expression as boolean. + */ +static int +xsltPreCompEvalToBoolean(xsltTransformContextPtr ctxt, xmlNodePtr node, + xsltStylePreCompPtr comp) { + int res; + xmlXPathContextPtr xpctxt; + xmlNodePtr oldXPContextNode; + xmlNsPtr *oldXPNamespaces; + int oldXPProximityPosition, oldXPContextSize, oldXPNsNr; + + xpctxt = ctxt->xpathCtxt; + oldXPContextNode = xpctxt->node; + oldXPProximityPosition = xpctxt->proximityPosition; + oldXPContextSize = xpctxt->contextSize; + oldXPNsNr = xpctxt->nsNr; + oldXPNamespaces = xpctxt->namespaces; + + xpctxt->node = node; +#ifdef XSLT_REFACTORED + if (comp->inScopeNs != NULL) { + xpctxt->namespaces = comp->inScopeNs->list; + xpctxt->nsNr = comp->inScopeNs->xpathNumber; + } else { + xpctxt->namespaces = NULL; + xpctxt->nsNr = 0; + } +#else + xpctxt->namespaces = comp->nsList; + xpctxt->nsNr = comp->nsNr; +#endif + + res = xmlXPathCompiledEvalToBoolean(comp->comp, xpctxt); + + xpctxt->node = oldXPContextNode; + xpctxt->proximityPosition = oldXPProximityPosition; + xpctxt->contextSize = oldXPContextSize; + xpctxt->nsNr = oldXPNsNr; + xpctxt->namespaces = oldXPNamespaces; + + return(res); } /************************************************************************ @@ -798,9 +896,9 @@ } copy = xmlNewTextLen(string, len); } + if (copy != NULL && target != NULL) + copy = xsltAddChild(target, copy); if (copy != NULL) { - if (target != NULL) - copy = xsltAddChild(target, copy); ctxt->lasttext = copy->content; ctxt->lasttsize = len; ctxt->lasttuse = len; @@ -1189,6 +1287,11 @@ if (copy != NULL) { copy->doc = ctxt->output; copy = xsltAddChild(insert, copy); + if (copy == NULL) { + xsltTransformError(ctxt, NULL, node, + "xsltShallowCopyElem: copy failed\n"); + return (copy); + } if (node->type == XML_ELEMENT_NODE) { /* @@ -1522,6 +1625,11 @@ if (copy != NULL) { copy->doc = ctxt->output; copy = xsltAddChild(insert, copy); + if (copy == NULL) { + xsltTransformError(ctxt, NULL, invocNode, + "xsltCopyTreeInternal: Copying of '%s' failed.\n", node->name); + return (copy); + } /* * The node may have been coalesced into another text node. */ @@ -3573,8 +3681,7 @@ xmlDictReference(res->dict); } else if (xmlStrEqual(method, (const xmlChar *) "xhtml")) { xsltTransformError(ctxt, NULL, inst, - "xsltDocumentElem: unsupported method xhtml\n", - style->method); + "xsltDocumentElem: unsupported method xhtml\n"); ctxt->type = XSLT_OUTPUT_HTML; res = htmlNewDocNoDtD(doctypeSystem, doctypePublic); if (res == NULL) @@ -3594,8 +3701,8 @@ #endif } else { xsltTransformError(ctxt, NULL, inst, - "xsltDocumentElem: unsupported method %s\n", - style->method); + "xsltDocumentElem: unsupported method (%s)\n", + method); goto error; } } else { @@ -4001,6 +4108,11 @@ return; } copy = xsltAddChild(ctxt->insert, copy); + if (copy == NULL) { + xsltTransformError(ctxt, NULL, inst, + "xsl:element : xsltAddChild failed\n"); + return; + } /* * Namespace @@ -4254,11 +4366,6 @@ xmlXPathObjectPtr res = NULL; xmlNodeSetPtr list = NULL; int i; - xmlDocPtr oldXPContextDoc; - xmlNsPtr *oldXPNamespaces; - xmlNodePtr oldXPContextNode; - int oldXPProximityPosition, oldXPContextSize, oldXPNsNr; - xmlXPathContextPtr xpctxt; if ((ctxt == NULL) || (node == NULL) || (inst == NULL)) return; @@ -4294,42 +4401,7 @@ /* * Evaluate the "select" expression. */ - xpctxt = ctxt->xpathCtxt; - oldXPContextDoc = xpctxt->doc; - oldXPContextNode = xpctxt->node; - oldXPProximityPosition = xpctxt->proximityPosition; - oldXPContextSize = xpctxt->contextSize; - oldXPNsNr = xpctxt->nsNr; - oldXPNamespaces = xpctxt->namespaces; - - xpctxt->node = node; - if (comp != NULL) { - -#ifdef XSLT_REFACTORED - if (comp->inScopeNs != NULL) { - xpctxt->namespaces = comp->inScopeNs->list; - xpctxt->nsNr = comp->inScopeNs->xpathNumber; - } else { - xpctxt->namespaces = NULL; - xpctxt->nsNr = 0; - } -#else - xpctxt->namespaces = comp->nsList; - xpctxt->nsNr = comp->nsNr; -#endif - } else { - xpctxt->namespaces = NULL; - xpctxt->nsNr = 0; - } - - res = xmlXPathCompiledEval(comp->comp, xpctxt); - - xpctxt->doc = oldXPContextDoc; - xpctxt->node = oldXPContextNode; - xpctxt->contextSize = oldXPContextSize; - xpctxt->proximityPosition = oldXPProximityPosition; - xpctxt->nsNr = oldXPNsNr; - xpctxt->namespaces = oldXPNamespaces; + res = xsltPreCompEval(ctxt, node, comp); if (res != NULL) { if (res->type == XPATH_NODESET) { @@ -4439,11 +4511,6 @@ #endif xmlXPathObjectPtr res = NULL; xmlChar *value = NULL; - xmlDocPtr oldXPContextDoc; - xmlNsPtr *oldXPNamespaces; - xmlNodePtr oldXPContextNode; - int oldXPProximityPosition, oldXPContextSize, oldXPNsNr; - xmlXPathContextPtr xpctxt; if ((ctxt == NULL) || (node == NULL) || (inst == NULL)) return; @@ -4460,42 +4527,7 @@ "xsltValueOf: select %s\n", comp->select)); #endif - xpctxt = ctxt->xpathCtxt; - oldXPContextDoc = xpctxt->doc; - oldXPContextNode = xpctxt->node; - oldXPProximityPosition = xpctxt->proximityPosition; - oldXPContextSize = xpctxt->contextSize; - oldXPNsNr = xpctxt->nsNr; - oldXPNamespaces = xpctxt->namespaces; - - xpctxt->node = node; - if (comp != NULL) { - -#ifdef XSLT_REFACTORED - if (comp->inScopeNs != NULL) { - xpctxt->namespaces = comp->inScopeNs->list; - xpctxt->nsNr = comp->inScopeNs->xpathNumber; - } else { - xpctxt->namespaces = NULL; - xpctxt->nsNr = 0; - } -#else - xpctxt->namespaces = comp->nsList; - xpctxt->nsNr = comp->nsNr; -#endif - } else { - xpctxt->namespaces = NULL; - xpctxt->nsNr = 0; - } - - res = xmlXPathCompiledEval(comp->comp, xpctxt); - - xpctxt->doc = oldXPContextDoc; - xpctxt->node = oldXPContextNode; - xpctxt->contextSize = oldXPContextSize; - xpctxt->proximityPosition = oldXPProximityPosition; - xpctxt->nsNr = oldXPNsNr; - xpctxt->namespaces = oldXPNamespaces; + res = xsltPreCompEval(ctxt, node, comp); /* * Cast the XPath object to string. @@ -4551,6 +4583,10 @@ #else xsltStylePreCompPtr comp = castedComp; #endif + xmlXPathContextPtr xpctxt; + xmlNsPtr *oldXPNamespaces; + int oldXPNsNr; + if (comp == NULL) { xsltTransformError(ctxt, NULL, inst, "xsl:number : compilation failed\n"); @@ -4563,7 +4599,27 @@ comp->numdata.doc = inst->doc; comp->numdata.node = inst; + xpctxt = ctxt->xpathCtxt; + oldXPNsNr = xpctxt->nsNr; + oldXPNamespaces = xpctxt->namespaces; + +#ifdef XSLT_REFACTORED + if (comp->inScopeNs != NULL) { + xpctxt->namespaces = comp->inScopeNs->list; + xpctxt->nsNr = comp->inScopeNs->xpathNumber; + } else { + xpctxt->namespaces = NULL; + xpctxt->nsNr = 0; + } +#else + xpctxt->namespaces = comp->nsList; + xpctxt->nsNr = comp->nsNr; +#endif + xsltNumberFormat(ctxt, &comp->numdata, node); + + xpctxt->nsNr = oldXPNsNr; + xpctxt->namespaces = oldXPNamespaces; } /** @@ -4757,12 +4813,11 @@ xmlNodePtr cur, delNode = NULL, oldContextNode; xmlNodeSetPtr list = NULL, oldList; xsltStackElemPtr withParams = NULL; - int oldXPProximityPosition, oldXPContextSize, oldXPNsNr; + int oldXPProximityPosition, oldXPContextSize; const xmlChar *oldMode, *oldModeURI; xmlDocPtr oldXPDoc; xsltDocumentPtr oldDocInfo; xmlXPathContextPtr xpctxt; - xmlNsPtr *oldXPNamespaces; if (comp == NULL) { xsltTransformError(ctxt, NULL, inst, @@ -4796,8 +4851,6 @@ oldXPContextSize = xpctxt->contextSize; oldXPProximityPosition = xpctxt->proximityPosition; oldXPDoc = xpctxt->doc; - oldXPNsNr = xpctxt->nsNr; - oldXPNamespaces = xpctxt->namespaces; /* * Set up contexts. @@ -4818,26 +4871,8 @@ "xsltApplyTemplates: select %s\n", comp->select)); #endif - /* - * Set up XPath. - */ - xpctxt->node = node; /* Set the "context node" */ -#ifdef XSLT_REFACTORED - if (comp->inScopeNs != NULL) { - xpctxt->namespaces = comp->inScopeNs->list; - xpctxt->nsNr = comp->inScopeNs->xpathNumber; - } else { - xpctxt->namespaces = NULL; - xpctxt->nsNr = 0; - } -#else - xpctxt->namespaces = comp->nsList; - xpctxt->nsNr = comp->nsNr; -#endif - res = xmlXPathCompiledEval(comp->comp, xpctxt); - - xpctxt->contextSize = oldXPContextSize; - xpctxt->proximityPosition = oldXPProximityPosition; + res = xsltPreCompEval(ctxt, node, comp); + if (res != NULL) { if (res->type == XPATH_NODESET) { list = res->nodesetval; /* consume the node set */ @@ -5120,8 +5155,6 @@ /* * Restore context states. */ - xpctxt->nsNr = oldXPNsNr; - xpctxt->namespaces = oldXPNamespaces; xpctxt->doc = oldXPDoc; xpctxt->contextSize = oldXPContextSize; xpctxt->proximityPosition = oldXPProximityPosition; @@ -5177,12 +5210,6 @@ { int testRes = 0, res = 0; - xmlXPathContextPtr xpctxt = ctxt->xpathCtxt; - xmlDocPtr oldXPContextDoc = xpctxt->doc; - int oldXPProximityPosition = xpctxt->proximityPosition; - int oldXPContextSize = xpctxt->contextSize; - xmlNsPtr *oldXPNamespaces = xpctxt->namespaces; - int oldXPNsNr = xpctxt->nsNr; #ifdef XSLT_REFACTORED xsltStyleItemWhenPtr wcomp = NULL; @@ -5219,27 +5246,8 @@ "xsltChoose: test %s\n", wcomp->test)); #endif - xpctxt->node = contextNode; - xpctxt->doc = oldXPContextDoc; - xpctxt->proximityPosition = oldXPProximityPosition; - xpctxt->contextSize = oldXPContextSize; - -#ifdef XSLT_REFACTORED - if (wcomp->inScopeNs != NULL) { - xpctxt->namespaces = wcomp->inScopeNs->list; - xpctxt->nsNr = wcomp->inScopeNs->xpathNumber; - } else { - xpctxt->namespaces = NULL; - xpctxt->nsNr = 0; - } -#else - xpctxt->namespaces = wcomp->nsList; - xpctxt->nsNr = wcomp->nsNr; -#endif - - #ifdef XSLT_FAST_IF - res = xmlXPathCompiledEvalToBoolean(wcomp->comp, xpctxt); + res = xsltPreCompEvalToBoolean(ctxt, contextNode, wcomp); if (res == -1) { ctxt->state = XSLT_STATE_STOPPED; @@ -5249,7 +5257,7 @@ #else /* XSLT_FAST_IF */ - res = xmlXPathCompiledEval(wcomp->comp, xpctxt); + res = xsltPreCompEval(ctxt, cotextNode, wcomp); if (res != NULL) { if (res->type != XPATH_BOOLEAN) @@ -5298,22 +5306,10 @@ #endif goto test_is_true; } - xpctxt->node = contextNode; - xpctxt->doc = oldXPContextDoc; - xpctxt->proximityPosition = oldXPProximityPosition; - xpctxt->contextSize = oldXPContextSize; - xpctxt->namespaces = oldXPNamespaces; - xpctxt->nsNr = oldXPNsNr; goto exit; test_is_true: - xpctxt->node = contextNode; - xpctxt->doc = oldXPContextDoc; - xpctxt->proximityPosition = oldXPProximityPosition; - xpctxt->contextSize = oldXPContextSize; - xpctxt->namespaces = oldXPNamespaces; - xpctxt->nsNr = oldXPNsNr; goto process_sequence; } @@ -5367,38 +5363,9 @@ #ifdef XSLT_FAST_IF { - xmlXPathContextPtr xpctxt = ctxt->xpathCtxt; - xmlDocPtr oldXPContextDoc = xpctxt->doc; - xmlNsPtr *oldXPNamespaces = xpctxt->namespaces; - xmlNodePtr oldXPContextNode = xpctxt->node; - int oldXPProximityPosition = xpctxt->proximityPosition; - int oldXPContextSize = xpctxt->contextSize; - int oldXPNsNr = xpctxt->nsNr; xmlDocPtr oldLocalFragmentTop = ctxt->localRVT; - xpctxt->node = contextNode; - if (comp != NULL) { - -#ifdef XSLT_REFACTORED - if (comp->inScopeNs != NULL) { - xpctxt->namespaces = comp->inScopeNs->list; - xpctxt->nsNr = comp->inScopeNs->xpathNumber; - } else { - xpctxt->namespaces = NULL; - xpctxt->nsNr = 0; - } -#else - xpctxt->namespaces = comp->nsList; - xpctxt->nsNr = comp->nsNr; -#endif - } else { - xpctxt->namespaces = NULL; - xpctxt->nsNr = 0; - } - /* - * This XPath function is optimized for boolean results. - */ - res = xmlXPathCompiledEvalToBoolean(comp->comp, xpctxt); + res = xsltPreCompEvalToBoolean(ctxt, contextNode, comp); /* * Cleanup fragments created during evaluation of the @@ -5406,13 +5373,6 @@ */ if (oldLocalFragmentTop != ctxt->localRVT) xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop); - - xpctxt->doc = oldXPContextDoc; - xpctxt->node = oldXPContextNode; - xpctxt->contextSize = oldXPContextSize; - xpctxt->proximityPosition = oldXPProximityPosition; - xpctxt->nsNr = oldXPNsNr; - xpctxt->namespaces = oldXPNamespaces; } #ifdef WITH_XSLT_DEBUG_PROCESS @@ -5434,51 +5394,10 @@ #else /* XSLT_FAST_IF */ { - xmlXPathObjectPtr xpobj = NULL; /* * OLD CODE: */ - { - xmlXPathContextPtr xpctxt = ctxt->xpathCtxt; - xmlDocPtr oldXPContextDoc = xpctxt->doc; - xmlNsPtr *oldXPNamespaces = xpctxt->namespaces; - xmlNodePtr oldXPContextNode = xpctxt->node; - int oldXPProximityPosition = xpctxt->proximityPosition; - int oldXPContextSize = xpctxt->contextSize; - int oldXPNsNr = xpctxt->nsNr; - - xpctxt->node = contextNode; - if (comp != NULL) { - -#ifdef XSLT_REFACTORED - if (comp->inScopeNs != NULL) { - xpctxt->namespaces = comp->inScopeNs->list; - xpctxt->nsNr = comp->inScopeNs->xpathNumber; - } else { - xpctxt->namespaces = NULL; - xpctxt->nsNr = 0; - } -#else - xpctxt->namespaces = comp->nsList; - xpctxt->nsNr = comp->nsNr; -#endif - } else { - xpctxt->namespaces = NULL; - xpctxt->nsNr = 0; - } - - /* - * This XPath function is optimized for boolean results. - */ - xpobj = xmlXPathCompiledEval(comp->comp, xpctxt); - - xpctxt->doc = oldXPContextDoc; - xpctxt->node = oldXPContextNode; - xpctxt->contextSize = oldXPContextSize; - xpctxt->proximityPosition = oldXPProximityPosition; - xpctxt->nsNr = oldXPNsNr; - xpctxt->namespaces = oldXPNamespaces; - } + xmlXPathObjectPtr xpobj = xsltPreCompEval(ctxt, contextNode, comp); if (xpobj != NULL) { if (xpobj->type != XPATH_BOOLEAN) xpobj = xmlXPathConvertBoolean(xpobj); @@ -5585,27 +5504,11 @@ oldXPDoc = xpctxt->doc; oldXPProximityPosition = xpctxt->proximityPosition; oldXPContextSize = xpctxt->contextSize; - /* - * Set up XPath. - */ - xpctxt->node = contextNode; -#ifdef XSLT_REFACTORED - if (comp->inScopeNs != NULL) { - xpctxt->namespaces = comp->inScopeNs->list; - xpctxt->nsNr = comp->inScopeNs->xpathNumber; - } else { - xpctxt->namespaces = NULL; - xpctxt->nsNr = 0; - } -#else - xpctxt->namespaces = comp->nsList; - xpctxt->nsNr = comp->nsNr; -#endif /* * Evaluate the 'select' expression. */ - res = xmlXPathCompiledEval(comp->comp, ctxt->xpathCtxt); + res = xsltPreCompEval(ctxt, contextNode, comp); if (res != NULL) { if (res->type == XPATH_NODESET) @@ -5634,13 +5537,6 @@ XSLT_TRACE(ctxt,XSLT_TRACE_FOR_EACH,xsltGenericDebug(xsltGenericDebugContext, "xsltForEach: select evaluates to %d nodes\n", list->nodeNr)); #endif - - /* - * Restore XPath states for the "current node". - */ - xpctxt->contextSize = oldXPContextSize; - xpctxt->proximityPosition = oldXPProximityPosition; - xpctxt->node = contextNode; /* * Set the list; this has to be done already here for xsltDoSortFunction(). @@ -6043,8 +5939,7 @@ #endif } else if (xmlStrEqual(method, (const xmlChar *) "xhtml")) { xsltTransformError(ctxt, NULL, (xmlNodePtr) doc, - "xsltApplyStylesheetInternal: unsupported method xhtml, using html\n", - style->method); + "xsltApplyStylesheetInternal: unsupported method xhtml, using html\n"); ctxt->type = XSLT_OUTPUT_HTML; res = htmlNewDoc(doctypeSystem, doctypePublic); if (res == NULL) @@ -6070,8 +5965,8 @@ #endif } else { xsltTransformError(ctxt, NULL, (xmlNodePtr) doc, - "xsltApplyStylesheetInternal: unsupported method %s\n", - style->method); + "xsltApplyStylesheetInternal: unsupported method (%s)\n", + method); goto error; } } else { Modified: trunk/reactos/dll/3rdparty/libxslt/variables.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/varia… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/variables.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/variables.c [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -1424,21 +1424,35 @@ /* * Name lookup */ - - name = xsltSplitQName(ctxt->dict, name, &prefix); href = NULL; - if (prefix != NULL) { - xmlNsPtr ns; - - ns = xmlSearchNs(style->doc, xmlDocGetRootElement(style->doc), - prefix); - if (ns == NULL) { - xsltTransformError(ctxt, style, NULL, - "user param : no namespace bound to prefix %s\n", prefix); - href = NULL; - } else { - href = ns->href; - } + + if (name[0] == '{') { + int len = 0; + + while ((name[len] != 0) && (name[len] != '}')) len++; + if (name[len] == 0) { + xsltTransformError(ctxt, style, NULL, + "user param : malformed parameter name : %s\n", name); + } else { + href = xmlDictLookup(ctxt->dict, &name[1], len-1); + name = xmlDictLookup(ctxt->dict, &name[len + 1], -1); + } + } + else { + name = xsltSplitQName(ctxt->dict, name, &prefix); + if (prefix != NULL) { + xmlNsPtr ns; + + ns = xmlSearchNs(style->doc, xmlDocGetRootElement(style->doc), + prefix); + if (ns == NULL) { + xsltTransformError(ctxt, style, NULL, + "user param : no namespace bound to prefix %s\n", prefix); + href = NULL; + } else { + href = ns->href; + } + } } if (name == NULL) Modified: trunk/reactos/dll/3rdparty/libxslt/xslt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xslt.… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/xslt.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/xslt.c [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -3525,7 +3525,7 @@ } } else if (cur->type == XML_TEXT_NODE) { if (IS_BLANK_NODE(cur)) { - if (xmlNodeGetSpacePreserve(cur) != 1) { + if (xmlNodeGetSpacePreserve(cur->parent) != 1) { deleteNode = cur; } } else if ((cur->content != NULL) && (internalize) && @@ -5354,7 +5354,6 @@ prop = xmlGetNsProp(template, (const xmlChar *)"name", NULL); if (prop != NULL) { const xmlChar *URI; - xsltTemplatePtr cur; /* * TODO: Don't use xsltGetQNameURI(). @@ -5377,19 +5376,6 @@ ret->nameURI = xmlDictLookup(style->dict, BAD_CAST URI, -1); else ret->nameURI = NULL; - cur = ret->next; - while (cur != NULL) { - if ((URI != NULL && xmlStrEqual(cur->name, ret->name) && - xmlStrEqual(cur->nameURI, URI) ) || - (URI == NULL && cur->nameURI == NULL && - xmlStrEqual(cur->name, ret->name))) { - xsltTransformError(NULL, style, template, - "xsl:template: error duplicate name '%s'\n", ret->name); - style->errors++; - goto error; - } - cur = cur->next; - } } } Modified: trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltc… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h.in [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h.in [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -153,6 +153,17 @@ #endif /** + * LIBXSLT_ATTR_FORMAT: + * + * This macro is used to indicate to GCC the parameters are printf-like + */ +#ifdef __GNUC__ +#define LIBXSLT_ATTR_FORMAT(fmt,args) __attribute__((__format__(__printf__,fmt,args))) +#else +#define LIBXSLT_ATTR_FORMAT(fmt,args) +#endif + +/** * LIBXSLT_PUBLIC: * * This macro is used to declare PUBLIC variables for Cygwin and for MSC on Windows Modified: trunk/reactos/dll/3rdparty/libxslt/xsltutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltu… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/xsltutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/xsltutils.c [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -495,7 +495,7 @@ * * Default handler for out of context error messages. */ -static void +static void LIBXSLT_ATTR_FORMAT(2,3) xsltGenericErrorDefaultFunc(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) { va_list args; @@ -541,7 +541,7 @@ * * Default handler for out of context error messages. */ -static void +static void LIBXSLT_ATTR_FORMAT(2,3) xsltGenericDebugDefaultFunc(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) { va_list args; @@ -1939,7 +1939,7 @@ int nb, i,j,k,l; int max; int total; - long totalt; + unsigned long totalt; xsltTemplatePtr *templates; xsltStylesheetPtr style; xsltTemplatePtr templ1,templ2; @@ -2052,7 +2052,7 @@ for (i = 0; i < nb; i++) { char ix_str[20], timep_str[20], times_str[20], timec_str[20], called_str[20]; - int t; + unsigned long t; templ1 = templates[i]; /* callers */ @@ -2063,9 +2063,9 @@ break; } t=templ2?templ2->time:totalt; - sprintf(times_str,"%8.3f",(float)t/XSLT_TIMESTAMP_TICS_PER_SEC); - sprintf(timec_str,"%8.3f",(float)childt[k]/XSLT_TIMESTAMP_TICS_PER_SEC); - sprintf(called_str,"%6d/%d", + snprintf(times_str,sizeof(times_str),"%8.3f",(float)t/XSLT_TIMESTAMP_TICS_PER_SEC); + snprintf(timec_str,sizeof(timec_str),"%8.3f",(float)childt[k]/XSLT_TIMESTAMP_TICS_PER_SEC); + snprintf(called_str,sizeof(called_str),"%6d/%d", templ1->templCountTab[j], /* number of times caller calls 'this' */ templ1->nbCalls); /* total number of calls to 'this' */ @@ -2074,10 +2074,10 @@ (templ2?(templ2->name?(char *)templ2->name:pretty_templ_match(templ2)):"-"),k); } /* this */ - sprintf(ix_str,"[%d]",i); - sprintf(timep_str,"%6.2f",(float)templ1->time*100.0/totalt); - sprintf(times_str,"%8.3f",(float)templ1->time/XSLT_TIMESTAMP_TICS_PER_SEC); - sprintf(timec_str,"%8.3f",(float)childt[i]/XSLT_TIMESTAMP_TICS_PER_SEC); + snprintf(ix_str,sizeof(ix_str),"[%d]",i); + snprintf(timep_str,sizeof(timep_str),"%6.2f",(float)templ1->time*100.0/totalt); + snprintf(times_str,sizeof(times_str),"%8.3f",(float)templ1->time/XSLT_TIMESTAMP_TICS_PER_SEC); + snprintf(timec_str,sizeof(timec_str),"%8.3f",(float)childt[i]/XSLT_TIMESTAMP_TICS_PER_SEC); fprintf(output, "%-5s %-6s %-8s %-8s %6d %s [%d]\n", ix_str, timep_str,times_str,timec_str, templ1->nbCalls, @@ -2099,9 +2099,9 @@ templ2 = templates[k]; for (l = 0; l < templ2->templNr; l++) { if (templ2->templCalledTab[l] == templ1) { - sprintf(times_str,"%8.3f",(float)templ2->time/XSLT_TIMESTAMP_TICS_PER_SEC); - sprintf(timec_str,"%8.3f",(float)childt[k]/XSLT_TIMESTAMP_TICS_PER_SEC); - sprintf(called_str,"%6d/%d", + snprintf(times_str,sizeof(times_str),"%8.3f",(float)templ2->time/XSLT_TIMESTAMP_TICS_PER_SEC); + snprintf(timec_str,sizeof(timec_str),"%8.3f",(float)childt[k]/XSLT_TIMESTAMP_TICS_PER_SEC); + snprintf(called_str,sizeof(called_str),"%6d/%d", templ2->templCountTab[l], /* number of times 'this' calls callee */ total); /* total number of calls from 'this' */ fprintf(output, " %-8s %-8s %-12s %s [%d]\n", @@ -2221,19 +2221,19 @@ for (i = 0; i < nb; i++) { child = xmlNewChild(root, NULL, BAD_CAST "template", NULL); - sprintf(buf, "%d", i + 1); + snprintf(buf, sizeof(buf), "%d", i + 1); xmlSetProp(child, BAD_CAST "rank", BAD_CAST buf); xmlSetProp(child, BAD_CAST "match", BAD_CAST templates[i]->match); xmlSetProp(child, BAD_CAST "name", BAD_CAST templates[i]->name); xmlSetProp(child, BAD_CAST "mode", BAD_CAST templates[i]->mode); - sprintf(buf, "%d", templates[i]->nbCalls); + snprintf(buf, sizeof(buf), "%d", templates[i]->nbCalls); xmlSetProp(child, BAD_CAST "calls", BAD_CAST buf); - sprintf(buf, "%ld", templates[i]->time); + snprintf(buf, sizeof(buf), "%ld", templates[i]->time); xmlSetProp(child, BAD_CAST "time", BAD_CAST buf); - sprintf(buf, "%ld", templates[i]->time / templates[i]->nbCalls); + snprintf(buf, sizeof(buf), "%ld", templates[i]->time / templates[i]->nbCalls); xmlSetProp(child, BAD_CAST "average", BAD_CAST buf); }; Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… ============================================================================== --- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -47,7 +47,7 @@ Website: http://xmlsoft.org | ftp://xmlsoft.org/libxml2/ Title: Libxslt -Used Version: 1.1.28 +Used Version: 1.1.29 Website: http://xmlsoft.org Title: ZLib Modified: trunk/reactos/sdk/include/reactos/libs/libxslt/xsltInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libxslt/xsltInternals.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libxslt/xsltInternals.h [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -1639,6 +1639,8 @@ * Forwards-compatible processing */ int forwards_compatible; + + xmlHashTablePtr namedTemplates; /* hash table of named templates */ }; typedef struct _xsltTransformCache xsltTransformCache; Modified: trunk/reactos/sdk/include/reactos/libs/libxslt/xsltconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libxslt/xsltconfig.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libxslt/xsltconfig.h [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -20,28 +20,28 @@ * * the version string like "1.2.3" */ -#define LIBXSLT_DOTTED_VERSION "1.1.28" +#define LIBXSLT_DOTTED_VERSION "1.1.29" /** * LIBXSLT_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXSLT_VERSION 10128 +#define LIBXSLT_VERSION 10129 /** * LIBXSLT_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXSLT_VERSION_STRING "10128" +#define LIBXSLT_VERSION_STRING "10129" /** * LIBXSLT_VERSION_EXTRA: * * extra version information, used to show a CVS compilation */ -#define LIBXSLT_VERSION_EXTRA "-GITv1.1.27-16-g9382efe" +#define LIBXSLT_VERSION_EXTRA "" /** * WITH_XSLT_DEBUG: @@ -153,6 +153,17 @@ #endif /** + * LIBXSLT_ATTR_FORMAT: + * + * This macro is used to indicate to GCC the parameters are printf-like + */ +#ifdef __GNUC__ +#define LIBXSLT_ATTR_FORMAT(fmt,args) __attribute__((__format__(__printf__,fmt,args))) +#else +#define LIBXSLT_ATTR_FORMAT(fmt,args) +#endif + +/** * LIBXSLT_PUBLIC: * * This macro is used to declare PUBLIC variables for Cygwin and for MSC on Windows Modified: trunk/reactos/sdk/include/reactos/libs/libxslt/xsltlocale.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libxslt/xsltlocale.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libxslt/xsltlocale.h [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -12,6 +12,7 @@ #define __XML_XSLTLOCALE_H__ #include <libxml/xmlstring.h> +#include "xsltexports.h" #ifdef XSLT_LOCALE_XLOCALE @@ -53,10 +54,18 @@ #endif -xsltLocale xsltNewLocale(const xmlChar *langName); -void xsltFreeLocale(xsltLocale locale); -xsltLocaleChar *xsltStrxfrm(xsltLocale locale, const xmlChar *string); -int xsltLocaleStrcmp(xsltLocale locale, const xsltLocaleChar *str1, const xsltLocaleChar *str2); -void xsltFreeLocales(void); +XSLTPUBFUN xsltLocale XSLTCALL + xsltNewLocale (const xmlChar *langName); +XSLTPUBFUN void XSLTCALL + xsltFreeLocale (xsltLocale locale); +XSLTPUBFUN xsltLocaleChar * XSLTCALL + xsltStrxfrm (xsltLocale locale, + const xmlChar *string); +XSLTPUBFUN int XSLTCALL + xsltLocaleStrcmp (xsltLocale locale, + const xsltLocaleChar *str1, + const xsltLocaleChar *str2); +XSLTPUBFUN void XSLTCALL + xsltFreeLocales (void); #endif /* __XML_XSLTLOCALE_H__ */ Modified: trunk/reactos/sdk/include/reactos/libs/libxslt/xsltutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/libxslt/xsltutils.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/libxslt/xsltutils.h [iso-8859-1] Sat Jul 9 18:30:47 2016 @@ -165,7 +165,7 @@ xsltStylesheetPtr style, xmlNodePtr node, const char *msg, - ...); + ...) LIBXSLT_ATTR_FORMAT(4,5); XSLTPUBFUN int XSLTCALL xsltSetCtxtParseOptions (xsltTransformContextPtr ctxt,

1 0

[akhaldi] 71875: [LIBXML2] Update to v2.9.4. CORE-11556
by akhaldi＠svn.reactos.org 09 Jul '16

09 Jul '16

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%20Fi… Modified: trunk/reactos/sdk/include/reactos/libs/libxml/dict.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libxml/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libxml/parserInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libxml/schemasInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libxml/xmlerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libxml/xmlstring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libxml/xmlversion.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/include/reactos/libs/libxml/xpathInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/l… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/C… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/HTMLparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/H… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/NEWS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/N… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/SAX2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/S… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/catalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/c… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/debugXML.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/d… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/dict.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/d… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/encoding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/e… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/entities.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/e… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/e… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/libxml.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/l… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/p… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/parserInternals.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/p… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/relaxng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/r… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/schematron.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/s… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/t… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/u… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/valid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/v… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/xinclude.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/x… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/xmlIO.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/x… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/xmlcatalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/x… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/xmllint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/x… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/xmlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/x… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/xmlreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/x… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/xmlregexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/x… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/xmlsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/x… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/xmlschemas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/x… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/xmlschemastypes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/x… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/xmlstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/x… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/xmlwriter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/x… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/xpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/x… Modified: trunk/reactos/sdk/lib/3rdparty/libxml2/xpointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/libxml2/x…

1 0

[akhaldi] 71874: [CMAKE] Update baseaddress.cmake for the GCC build. CORE-11382
by akhaldi＠svn.reactos.org 09 Jul '16

09 Jul '16

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.cmak… ============================================================================== --- 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_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x7c750000) -set(baseaddress_msvcrt 0x7c6b0000) -set(baseaddress_advapi32 0x7c610000) -set(baseaddress_gdi32 0x7c570000) -set(baseaddress_user32 0x7c3d0000) -set(baseaddress_dhcpcsvc 0x7c380000) -set(baseaddress_dnsapi 0x7c330000) -set(baseaddress_icmp 0x7c300000) -set(baseaddress_iphlpapi 0x7c2b0000) -set(baseaddress_ws2_32 0x7c270000) -set(baseaddress_ws2help 0x7c240000) -set(baseaddress_shlwapi 0x7c190000) -set(baseaddress_rpcrt4 0x7c0d0000) -set(baseaddress_comctl32 0x7bf40000) -set(baseaddress_ole32 0x7bd70000) -set(baseaddress_winspool.drv 0x7bd40000) -set(baseaddress_winmm 0x7bc90000) -set(baseaddress_comdlg32 0x7bba0000) -set(baseaddress_shell32 0x7adb0000) -set(baseaddress_lz32 0x7ad90000) -set(baseaddress_version 0x7ad60000) -set(baseaddress_oleaut32 0x7ab90000) -set(baseaddress_setupapi 0x7a9c0000) -set(baseaddress_mpr 0x7a980000) -set(baseaddress_crypt32 0x7a870000) -set(baseaddress_wininet 0x7a7b0000) -set(baseaddress_urlmon 0x7a6b0000) -set(baseaddress_psapi 0x7a680000) -set(baseaddress_imm32 0x7a640000) -set(baseaddress_msvfw32 0x7a600000) -set(baseaddress_dbghelp 0x7a550000) -set(baseaddress_devmgr 0x7a4c0000) -set(baseaddress_msacm32 0x7a480000) -set(baseaddress_netapi32 0x7a410000) -set(baseaddress_powrprof 0x7a3e0000) -set(baseaddress_secur32 0x7a3a0000) -set(baseaddress_wintrust 0x7a340000) -set(baseaddress_avicap32 0x7a310000) -set(baseaddress_cabinet 0x7a2c0000) -set(baseaddress_dsound 0x7a240000) -set(baseaddress_glu32 0x7a140000) -set(baseaddress_opengl32 0x79f30000) -set(baseaddress_riched20 0x79e70000) -set(baseaddress_smdll 0x79e50000) -set(baseaddress_userenv 0x79e00000) -set(baseaddress_uxtheme 0x79da0000) -set(baseaddress_cryptui 0x79cf0000) -set(baseaddress_csrsrv 0x79cc0000) -set(baseaddress_basesrv 0x79c90000) -set(baseaddress_consrv 0x79c70000) -set(baseaddress_winsrv 0x79ba0000) -set(baseaddress_dplayx 0x79b30000) -set(baseaddress_gdiplus 0x79a60000) -set(baseaddress_msimg32 0x79a30000) -set(baseaddress_mswsock 0x79a00000) -set(baseaddress_oledlg 0x799b0000) -set(baseaddress_rasapi32 0x79980000) -set(baseaddress_rsaenh 0x79910000) -set(baseaddress_samlib 0x798d0000) -set(baseaddress_sensapi 0x798a0000) -set(baseaddress_sfc_os 0x79870000) -set(baseaddress_snmpapi 0x79840000) -set(baseaddress_spoolss 0x79810000) -set(baseaddress_usp10 0x79790000) -set(baseaddress_acledit 0x79760000) -set(baseaddress_aclui 0x79720000) -set(baseaddress_activeds 0x796f0000) -set(baseaddress_actxprxy 0x79500000) -set(baseaddress_advpack 0x794c0000) -set(baseaddress_amstream 0x79470000) -set(baseaddress_atl 0x79430000) -set(baseaddress_atl100 0x793f0000) -set(baseaddress_atl80 0x793b0000) -set(baseaddress_authz 0x79380000) -set(baseaddress_avifil32 0x79310000) -set(baseaddress_batt 0x792e0000) -set(baseaddress_bcrypt 0x792b0000) -set(baseaddress_beepmidi 0x79280000) -set(baseaddress_browseui 0x79180000) -set(baseaddress_cards 0x790c0000) -set(baseaddress_cfgmgr32 0x79090000) -set(baseaddress_clusapi 0x79060000) -set(baseaddress_comcat 0x79030000) -set(baseaddress_compstui 0x79000000) -set(baseaddress_console 0x78f80000) -set(baseaddress_credui 0x78f40000) -set(baseaddress_crtdll 0x78ee0000) -set(baseaddress_cryptdlg 0x78eb0000) -set(baseaddress_cryptdll 0x78e80000) -set(baseaddress_cryptnet 0x78e50000) -set(baseaddress_d3d8 0x78df0000) -set(baseaddress_d3d8thk 0x78dd0000) -set(baseaddress_d3d9 0x78d60000) -set(baseaddress_d3dcompiler_43 0x78cb0000) -set(baseaddress_d3drm 0x78c30000) -set(baseaddress_d3dwine 0x78a30000) -set(baseaddress_d3dx9_24 0x78a00000) -set(baseaddress_d3dx9_25 0x789c0000) -set(baseaddress_d3dx9_26 0x78990000) -set(baseaddress_d3dx9_27 0x78960000) -set(baseaddress_d3dx9_28 0x78930000) -set(baseaddress_d3dx9_29 0x78900000) -set(baseaddress_d3dx9_30 0x788d0000) -set(baseaddress_d3dx9_31 0x788a0000) -set(baseaddress_d3dx9_32 0x78870000) -set(baseaddress_d3dx9_33 0x78840000) -set(baseaddress_d3dx9_34 0x78810000) -set(baseaddress_d3dx9_35 0x787e0000) -set(baseaddress_d3dx9_36 0x78700000) -set(baseaddress_d3dx9_37 0x786d0000) -set(baseaddress_d3dx9_38 0x786a0000) -set(baseaddress_d3dx9_39 0x78670000) -set(baseaddress_d3dx9_40 0x78640000) -set(baseaddress_d3dx9_41 0x78610000) -set(baseaddress_d3dx9_42 0x785e0000) -set(baseaddress_d3dx9_43 0x785b0000) -set(baseaddress_d3dxof 0x78570000) -set(baseaddress_dciman32 0x78540000) -set(baseaddress_ddraw 0x78480000) -set(baseaddress_deskadp 0x78440000) -set(baseaddress_deskmon 0x78400000) -set(baseaddress_devcpux 0x783d0000) -set(baseaddress_devenum 0x78380000) -set(baseaddress_dinput 0x78320000) -set(baseaddress_dinput8 0x782f0000) -set(baseaddress_dmusic 0x782a0000) -set(baseaddress_dplay 0x78270000) -set(baseaddress_dwmapi 0x78240000) -set(baseaddress_dxdiagn 0x781f0000) -set(baseaddress_dxgi 0x781b0000) -set(baseaddress_faultrep 0x78180000) -set(baseaddress_fltlib 0x78150000) -set(baseaddress_fmifs 0x78130000) -set(baseaddress_fontext 0x78100000) -set(baseaddress_framebuf 0x780e0000) -set(baseaddress_framebuf_new 0x780c0000) -set(baseaddress_framedyn 0x78080000) -set(baseaddress_genincdata 0x78050000) -set(baseaddress_getuname 0x77d80000) -set(baseaddress_hid 0x77d50000) -set(baseaddress_hlink 0x77d10000) -set(baseaddress_hnetcfg 0x77cd0000) -set(baseaddress_httpapi 0x77ca0000) -set(baseaddress_iccvid 0x77c70000) -set(baseaddress_ieframe 0x77b80000) -set(baseaddress_iernonce 0x77b50000) -set(baseaddress_imagehlp 0x77b20000) -set(baseaddress_inetcomm 0x77ac0000) -set(baseaddress_inetmib1 0x77a90000) -set(baseaddress_initpki 0x77a60000) -set(baseaddress_input 0x77a00000) -set(baseaddress_inseng 0x779d0000) -set(baseaddress_iologmsg 0x779b0000) -set(baseaddress_itircl 0x77980000) -set(baseaddress_itss 0x77940000) -set(baseaddress_jscript 0x77830000) -set(baseaddress_jsproxy 0x77800000) -set(baseaddress_kbsdll 0x777d0000) -set(baseaddress_kernel32_vista 0x777a0000) -set(baseaddress_ksuser 0x77770000) -set(baseaddress_libjpeg 0x776e0000) -set(baseaddress_libpng 0x77650000) -set(baseaddress_libtiff 0x77570000) -set(baseaddress_libxslt 0x772a0000) -set(baseaddress_loadperf 0x77270000) -set(baseaddress_localspl 0x77230000) -set(baseaddress_localui 0x77200000) -set(baseaddress_lpk 0x771d0000) -set(baseaddress_lsasrv 0x77170000) -set(baseaddress_mapi32 0x77130000) -set(baseaddress_mciavi32 0x770f0000) -set(baseaddress_mcicda 0x770c0000) -set(baseaddress_mciqtz32 0x77080000) -set(baseaddress_mciseq 0x77050000) -set(baseaddress_mciwave 0x77020000) -set(baseaddress_mgmtapi 0x76ff0000) -set(baseaddress_midimap 0x76fc0000) -set(baseaddress_mlang 0x76f80000) -set(baseaddress_mmdevapi 0x76f40000) -set(baseaddress_mmdrv 0x76f10000) -set(baseaddress_modemui 0x76ea0000) -set(baseaddress_mprapi 0x76e70000) -set(baseaddress_msafd 0x76e30000) -set(baseaddress_mscat32 0x76e00000) -set(baseaddress_mscms 0x76dd0000) -set(baseaddress_mscoree 0x76d80000) -set(baseaddress_msctf 0x76d20000) -set(baseaddress_msdmo 0x76cf0000) -set(baseaddress_msftedit 0x76cc0000) -set(baseaddress_msgina 0x76c30000) -set(baseaddress_mshtml 0x76950000) -set(baseaddress_msi 0x767e0000) -set(baseaddress_msimtf 0x767b0000) -set(baseaddress_msisip 0x76780000) -set(baseaddress_mspatcha 0x76750000) -set(baseaddress_msports 0x76720000) -set(baseaddress_msrle32 0x766f0000) -set(baseaddress_mssign32 0x766c0000) -set(baseaddress_mssip32 0x76690000) -set(baseaddress_mstask 0x76650000) -set(baseaddress_msv1_0 0x76620000) -set(baseaddress_msvcrt20 0x76560000) -set(baseaddress_msvcrt40 0x76490000) -set(baseaddress_msvidc32 0x76460000) -set(baseaddress_msxml 0x76430000) -set(baseaddress_msxml2 0x76400000) -set(baseaddress_msxml3 0x76040000) -set(baseaddress_msxml4 0x76000000) -set(baseaddress_msxml6 0x75fc0000) -set(baseaddress_mycomput 0x75fa0000) -set(baseaddress_nddeapi 0x75f70000) -set(baseaddress_netcfgx 0x75ee0000) -set(baseaddress_netevent 0x75ec0000) -set(baseaddress_netid 0x75e70000) -set(baseaddress_netshell 0x75de0000) -set(baseaddress_newdev 0x75d80000) -set(baseaddress_npptools 0x75d50000) -set(baseaddress_ntdsapi 0x75d20000) -set(baseaddress_ntlanman 0x75cf0000) -set(baseaddress_ntmarta 0x75cc0000) -set(baseaddress_ntobjshex 0x75c10000) -set(baseaddress_ntprint 0x75be0000) -set(baseaddress_objsel 0x75bb0000) -set(baseaddress_odbc32 0x75b70000) -set(baseaddress_odbccp32 0x75b40000) -set(baseaddress_oleacc 0x75ab0000) -set(baseaddress_olecli32 0x75a80000) -set(baseaddress_olepro32 0x75a50000) -set(baseaddress_olesvr32 0x75a20000) -set(baseaddress_olethk32 0x759f0000) -set(baseaddress_pdh 0x759b0000) -set(baseaddress_pidgen 0x75980000) -set(baseaddress_printui 0x75950000) -set(baseaddress_propsys 0x75910000) -set(baseaddress_pstorec 0x758e0000) -set(baseaddress_qedit 0x75890000) -set(baseaddress_qmgr 0x75850000) -set(baseaddress_qmgrprxy 0x757f0000) -set(baseaddress_quartz 0x75680000) -set(baseaddress_query 0x75650000) -set(baseaddress_rasadhlp 0x75620000) -set(baseaddress_rasdlg 0x75450000) -set(baseaddress_rasman 0x75420000) -set(baseaddress_resutils 0x753f0000) -set(baseaddress_riched32 0x753c0000) -set(baseaddress_rsabase 0x753a0000) -set(baseaddress_rshell 0x75310000) -set(baseaddress_samsrv 0x752a0000) -set(baseaddress_sccbase 0x75270000) -set(baseaddress_schannel 0x75230000) -set(baseaddress_schedsvc 0x75200000) -set(baseaddress_scrrun 0x751a0000) -set(baseaddress_security 0x75180000) -set(baseaddress_serialui 0x75150000) -set(baseaddress_sfc 0x75120000) -set(baseaddress_shdoclc 0x750e0000) -set(baseaddress_shdocvw 0x75090000) -set(baseaddress_shfolder 0x75070000) -set(baseaddress_shimgvw 0x75020000) -set(baseaddress_slayer 0x74ff0000) -set(baseaddress_slbcsp 0x74fc0000) -set(baseaddress_sndblst 0x74f90000) -set(baseaddress_softpub 0x74f70000) -set(baseaddress_srclient 0x74f40000) -set(baseaddress_srvsvc 0x74f10000) -set(baseaddress_sti 0x74ed0000) -set(baseaddress_stobject 0x74e60000) -set(baseaddress_streamci 0x74e30000) -set(baseaddress_sxs 0x74e00000) -set(baseaddress_syssetup 0x74d50000) -set(baseaddress_t2embed 0x74d20000) -set(baseaddress_tapi32 0x74ce0000) -set(baseaddress_tapiui 0x74c60000) -set(baseaddress_testvdd 0x74c30000) -set(baseaddress_themeui 0x74c10000) -set(baseaddress_traffic 0x74be0000) -set(baseaddress_twain_32 0x74bb0000) -set(baseaddress_uext2 0x74b70000) -set(baseaddress_ufat 0x74b50000) -set(baseaddress_ufatx 0x74b30000) -set(baseaddress_umpnpmgr 0x74b00000) -set(baseaddress_untfs 0x74ae0000) -set(baseaddress_updspapi 0x74ab0000) -set(baseaddress_url 0x74a80000) -set(baseaddress_vbscript 0x749e0000) -set(baseaddress_vdmdbg 0x749b0000) -set(baseaddress_wbemdisp 0x74970000) -set(baseaddress_wbemprox 0x74910000) -set(baseaddress_windowscodecs 0x747f0000) -set(baseaddress_windowscodecsext 0x747c0000) -set(baseaddress_winfax 0x74790000) -set(baseaddress_wing32 0x74760000) -set(baseaddress_winhttp 0x74700000) -set(baseaddress_winscard 0x746d0000) -set(baseaddress_winsta 0x746a0000) -set(baseaddress_wkssvc 0x74670000) -set(baseaddress_wlanapi 0x74640000) -set(baseaddress_wldap32 0x74600000) -set(baseaddress_wlnotify 0x745e0000) -set(baseaddress_wmi 0x745c0000) -set(baseaddress_wmisvc 0x74590000) -set(baseaddress_wmiutils 0x74550000) -set(baseaddress_ws2_32_new 0x74500000) -set(baseaddress_wshirda 0x744d0000) -set(baseaddress_wshtcpip 0x744a0000) -set(baseaddress_wsock32 0x74470000) -set(baseaddress_wtsapi32 0x74440000) -set(baseaddress_wuapi 0x74400000) -set(baseaddress_xinput1_1 0x743d0000) -set(baseaddress_xinput1_2 0x743a0000) -set(baseaddress_xinput1_3 0x74370000) -set(baseaddress_xinput9_1_0 0x74340000) -set(baseaddress_xmllite 0x74300000) -set(baseaddress_access 0x74280000) -set(baseaddress_appwiz 0x74210000) -set(baseaddress_cmicpl 0x741d0000) -set(baseaddress_desk 0x74130000) -set(baseaddress_hdwwiz 0x740a0000) -set(baseaddress_hhctrl 0x74050000) -set(baseaddress_imaadp32.acm 0x74020000) -set(baseaddress_inetcpl 0x73fa0000) -set(baseaddress_intl 0x73f30000) -set(baseaddress_joy 0x73ef0000) -set(baseaddress_main 0x73e40000) -set(baseaddress_mmsys 0x73d40000) -set(baseaddress_msacm32.drv 0x73d10000) -set(baseaddress_msadp32.acm 0x73ce0000) -set(baseaddress_msg711.acm 0x73cb0000) -set(baseaddress_msgsm32.acm 0x73c80000) -set(baseaddress_msisys 0x73c50000) -set(baseaddress_ncpa 0x73c20000) -set(baseaddress_odbccp32i 0x73bf0000) -set(baseaddress_powercfg 0x73b80000) -set(baseaddress_sysdm 0x73aa0000) -set(baseaddress_telephon 0x73a70000) -set(baseaddress_timedate 0x73a10000) -set(baseaddress_usrmgr 0x739b0000) -set(baseaddress_wdmaud.drv 0x737f0000) -set(baseaddress_wined3dcfg 0x737c0000) -set(baseaddress_winemp3.acm 0x73740000) -set(baseaddress_wshom 0x736f0000) -set(baseaddress_fusion 0x73500000) -set(baseaddress_fusion_1_1 0x734e0000) -set(baseaddress_fusion_2_0 0x734b0000) +set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 +set(baseaddress_kernel32 0x7c760000) +set(baseaddress_msvcrt 0x7c6b0000) +set(baseaddress_advapi32 0x7c600000) +set(baseaddress_gdi32 0x7c560000) +set(baseaddress_user32 0x7c3e0000) +set(baseaddress_dhcpcsvc 0x7c390000) +set(baseaddress_dnsapi 0x7c340000) +set(baseaddress_icmp 0x7c310000) +set(baseaddress_iphlpapi 0x7c2c0000) +set(baseaddress_ws2_32 0x7c280000) +set(baseaddress_ws2help 0x7c250000) +set(baseaddress_shlwapi 0x7c1a0000) +set(baseaddress_rpcrt4 0x7c0d0000) +set(baseaddress_comctl32 0x7bf40000) +set(baseaddress_ole32 0x7bd60000) +set(baseaddress_winspool.drv 0x7bd30000) +set(baseaddress_winmm 0x7bc70000) +set(baseaddress_comdlg32 0x7bb70000) +set(baseaddress_shell32 0x7b1d0000) +set(baseaddress_lz32 0x7b1b0000) +set(baseaddress_version 0x7b180000) +set(baseaddress_oleaut32 0x7afb0000) +set(baseaddress_setupapi 0x7ae40000) +set(baseaddress_mpr 0x7ae00000) +set(baseaddress_crypt32 0x7acf0000) +set(baseaddress_wininet 0x7ac30000) +set(baseaddress_urlmon 0x7ab30000) +set(baseaddress_psapi 0x7ab00000) +set(baseaddress_imm32 0x7aac0000) +set(baseaddress_msvfw32 0x7aa70000) +set(baseaddress_dbghelp 0x7a9c0000) +set(baseaddress_devmgr 0x7a8e0000) +set(baseaddress_msacm32 0x7a8a0000) +set(baseaddress_netapi32 0x7a830000) +set(baseaddress_powrprof 0x7a800000) +set(baseaddress_secur32 0x7a7c0000) +set(baseaddress_wintrust 0x7a760000) +set(baseaddress_avicap32 0x7a730000) +set(baseaddress_cabinet 0x7a6e0000) +set(baseaddress_dsound 0x7a660000) +set(baseaddress_glu32 0x7a560000) +set(baseaddress_opengl32 0x7a350000) +set(baseaddress_riched20 0x7a290000) +set(baseaddress_smdll 0x7a270000) +set(baseaddress_userenv 0x7a220000) +set(baseaddress_uxtheme 0x7a1c0000) +set(baseaddress_cryptui 0x7a110000) +set(baseaddress_csrsrv 0x7a0e0000) +set(baseaddress_basesrv 0x7a0b0000) +set(baseaddress_winsrv 0x7a010000) +set(baseaddress_dplayx 0x79fa0000) +set(baseaddress_gdiplus 0x79ed0000) +set(baseaddress_msimg32 0x79ea0000) +set(baseaddress_mswsock 0x79e70000) +set(baseaddress_oledlg 0x79e20000) +set(baseaddress_rasapi32 0x79df0000) +set(baseaddress_rsaenh 0x79d80000) +set(baseaddress_samlib 0x79d40000) +set(baseaddress_sensapi 0x79d10000) +set(baseaddress_sfc_os 0x79ce0000) +set(baseaddress_snmpapi 0x79cb0000) +set(baseaddress_spoolss 0x79c80000) +set(baseaddress_usp10 0x79c00000) +set(baseaddress_aclayers 0x79bd0000) +set(baseaddress_acledit 0x79ba0000) +set(baseaddress_aclui 0x79b60000) +set(baseaddress_acppage 0x79b10000) +set(baseaddress_activeds 0x79ae0000) +set(baseaddress_actxprxy 0x798e0000) +set(baseaddress_advapi32_vista 0x798c0000) +set(baseaddress_advpack 0x79880000) +set(baseaddress_amstream 0x79830000) +set(baseaddress_apphelp 0x797f0000) +set(baseaddress_atl 0x797b0000) +set(baseaddress_atl100 0x79770000) +set(baseaddress_atl80 0x79730000) +set(baseaddress_authz 0x79700000) +set(baseaddress_avifil32 0x79680000) +set(baseaddress_batt 0x79650000) +set(baseaddress_bcrypt 0x79620000) +set(baseaddress_beepmidi 0x795f0000) +set(baseaddress_browseui 0x794e0000) +set(baseaddress_cards 0x79420000) +set(baseaddress_cfgmgr32 0x793f0000) +set(baseaddress_clusapi 0x793c0000) +set(baseaddress_comcat 0x79390000) +set(baseaddress_compstui 0x79360000) +set(baseaddress_console 0x79310000) +set(baseaddress_credui 0x792d0000) +set(baseaddress_crtdll 0x79270000) +set(baseaddress_cryptdlg 0x79240000) +set(baseaddress_cryptdll 0x79210000) +set(baseaddress_cryptnet 0x791e0000) +set(baseaddress_d3d8 0x79180000) +set(baseaddress_d3d8thk 0x79160000) +set(baseaddress_d3d9 0x790f0000) +set(baseaddress_d3dcompiler_43 0x79040000) +set(baseaddress_d3drm 0x78fb0000) +set(baseaddress_d3dwine 0x78da0000) +set(baseaddress_d3dx9_24 0x78d70000) +set(baseaddress_d3dx9_25 0x78d30000) +set(baseaddress_d3dx9_26 0x78d00000) +set(baseaddress_d3dx9_27 0x78cd0000) +set(baseaddress_d3dx9_28 0x78ca0000) +set(baseaddress_d3dx9_29 0x78c70000) +set(baseaddress_d3dx9_30 0x78c40000) +set(baseaddress_d3dx9_31 0x78c10000) +set(baseaddress_d3dx9_32 0x78be0000) +set(baseaddress_d3dx9_33 0x78bb0000) +set(baseaddress_d3dx9_34 0x78b80000) +set(baseaddress_d3dx9_35 0x78b50000) +set(baseaddress_d3dx9_36 0x78a60000) +set(baseaddress_d3dx9_37 0x78a30000) +set(baseaddress_d3dx9_38 0x78a00000) +set(baseaddress_d3dx9_39 0x789d0000) +set(baseaddress_d3dx9_40 0x789a0000) +set(baseaddress_d3dx9_41 0x78970000) +set(baseaddress_d3dx9_42 0x78940000) +set(baseaddress_d3dx9_43 0x78910000) +set(baseaddress_d3dxof 0x788d0000) +set(baseaddress_dciman32 0x788a0000) +set(baseaddress_ddraw 0x787e0000) +set(baseaddress_deskadp 0x787b0000) +set(baseaddress_deskmon 0x78780000) +set(baseaddress_devcpux 0x78750000) +set(baseaddress_devenum 0x78700000) +set(baseaddress_dinput 0x786a0000) +set(baseaddress_dinput8 0x78670000) +set(baseaddress_dmusic 0x78620000) +set(baseaddress_dplay 0x785f0000) +set(baseaddress_dxdiagn 0x785a0000) +set(baseaddress_esent 0x78570000) +set(baseaddress_faultrep 0x78540000) +set(baseaddress_fltlib 0x78510000) +set(baseaddress_fmifs 0x784f0000) +set(baseaddress_fontext 0x784c0000) +set(baseaddress_fontsub 0x78490000) +set(baseaddress_framebuf 0x78470000) +set(baseaddress_framebuf_new 0x78450000) +set(baseaddress_framedyn 0x78410000) +set(baseaddress_genincdata 0x783e0000) +set(baseaddress_getuname 0x78110000) +set(baseaddress_hid 0x780e0000) +set(baseaddress_hlink 0x780a0000) +set(baseaddress_hnetcfg 0x78060000) +set(baseaddress_httpapi 0x78030000) +set(baseaddress_iccvid 0x78000000) +set(baseaddress_ieframe 0x77f10000) +set(baseaddress_iernonce 0x77ee0000) +set(baseaddress_imagehlp 0x77eb0000) +set(baseaddress_inetcomm 0x77e50000) +set(baseaddress_inetmib1 0x77e20000) +set(baseaddress_initpki 0x77df0000) +set(baseaddress_input 0x77d90000) +set(baseaddress_inseng 0x77d60000) +set(baseaddress_iologmsg 0x77d40000) +set(baseaddress_itircl 0x77d10000) +set(baseaddress_itss 0x77cd0000) +set(baseaddress_jscript 0x77bc0000) +set(baseaddress_jsproxy 0x77b90000) +set(baseaddress_kbsdll 0x77b60000) +set(baseaddress_kernel32_vista 0x77b40000) +set(baseaddress_ksuser 0x77b10000) +set(baseaddress_libjpeg 0x77a80000) +set(baseaddress_libpng 0x779f0000) +set(baseaddress_libtiff 0x77910000) +set(baseaddress_libxslt 0x77640000) +set(baseaddress_loadperf 0x77610000) +set(baseaddress_localspl 0x775d0000) +set(baseaddress_localui 0x775a0000) +set(baseaddress_lpk 0x77570000) +set(baseaddress_lsasrv 0x77500000) +set(baseaddress_mapi32 0x774c0000) +set(baseaddress_mciavi32 0x77480000) +set(baseaddress_mcicda 0x77450000) +set(baseaddress_mciqtz32 0x77410000) +set(baseaddress_mciseq 0x773e0000) +set(baseaddress_mciwave 0x773b0000) +set(baseaddress_mgmtapi 0x77380000) +set(baseaddress_midimap 0x77350000) +set(baseaddress_mlang 0x77310000) +set(baseaddress_mmdrv 0x772e0000) +set(baseaddress_modemui 0x77270000) +set(baseaddress_mprapi 0x77240000) +set(baseaddress_msafd 0x77200000) +set(baseaddress_mscat32 0x771d0000) +set(baseaddress_mscms 0x771a0000) +set(baseaddress_mscoree 0x77150000) +set(baseaddress_msctf 0x770f0000) +set(baseaddress_msdmo 0x770c0000) +set(baseaddress_msftedit 0x77090000) +set(baseaddress_msgina 0x77000000) +set(baseaddress_mshtml 0x76d00000) +set(baseaddress_msi 0x76b90000) +set(baseaddress_msimtf 0x76b60000) +set(baseaddress_msisip 0x76b30000) +set(baseaddress_mspatcha 0x76b00000) +set(baseaddress_msports 0x76ad0000) +set(baseaddress_msrle32 0x76aa0000) +set(baseaddress_mssign32 0x76a70000) +set(baseaddress_mssip32 0x76a40000) +set(baseaddress_mstask 0x76a00000) +set(baseaddress_msv1_0 0x769d0000) +set(baseaddress_msvcrt_crt_dll_startup 0x769a0000) +set(baseaddress_msvcrt20 0x768d0000) +set(baseaddress_msvcrt40 0x76800000) +set(baseaddress_msvidc32 0x767d0000) +set(baseaddress_msxml 0x767a0000) +set(baseaddress_msxml2 0x76770000) +set(baseaddress_msxml3 0x76390000) +set(baseaddress_msxml4 0x76350000) +set(baseaddress_msxml6 0x76310000) +set(baseaddress_mycomput 0x762f0000) +set(baseaddress_nddeapi 0x762c0000) +set(baseaddress_netcfgx 0x76230000) +set(baseaddress_netevent 0x76210000) +set(baseaddress_netid 0x761c0000) +set(baseaddress_netshell 0x76110000) +set(baseaddress_newdev 0x760b0000) +set(baseaddress_normaliz 0x76080000) +set(baseaddress_npptools 0x76050000) +set(baseaddress_ntdsapi 0x76020000) +set(baseaddress_ntlanman 0x75ff0000) +set(baseaddress_ntmarta 0x75fc0000) +set(baseaddress_ntobjshex 0x75f20000) +set(baseaddress_ntprint 0x75ef0000) +set(baseaddress_objsel 0x75ec0000) +set(baseaddress_odbc32 0x75e80000) +set(baseaddress_odbccp32 0x75e50000) +set(baseaddress_oleacc 0x75dc0000) +set(baseaddress_olecli32 0x75d90000) +set(baseaddress_olepro32 0x75d60000) +set(baseaddress_olesvr32 0x75d30000) +set(baseaddress_olethk32 0x75d00000) +set(baseaddress_pdh 0x75cc0000) +set(baseaddress_pidgen 0x75c90000) +set(baseaddress_pifmgr 0x75c10000) +set(baseaddress_printui 0x75be0000) +set(baseaddress_propsys 0x75ba0000) +set(baseaddress_pstorec 0x75b70000) +set(baseaddress_qedit 0x75b20000) +set(baseaddress_qmgr 0x75ae0000) +set(baseaddress_qmgrprxy 0x75a80000) +set(baseaddress_quartz 0x75900000) +set(baseaddress_query 0x758d0000) +set(baseaddress_rasadhlp 0x758a0000) +set(baseaddress_rasdlg 0x756d0000) +set(baseaddress_rasman 0x756a0000) +set(baseaddress_resutils 0x75670000) +set(baseaddress_riched32 0x75640000) +set(baseaddress_rsabase 0x75620000) +set(baseaddress_rshell 0x75590000) +set(baseaddress_samsrv 0x75520000) +set(baseaddress_sccbase 0x754f0000) +set(baseaddress_schannel 0x754b0000) +set(baseaddress_schedsvc 0x75480000) +set(baseaddress_scrrun 0x75420000) +set(baseaddress_security 0x75400000) +set(baseaddress_serialui 0x753d0000) +set(baseaddress_sfc 0x753a0000) +set(baseaddress_shdoclc 0x75360000) +set(baseaddress_shdocvw 0x75310000) +set(baseaddress_shfolder 0x752f0000) +set(baseaddress_shimgvw 0x752a0000) +set(baseaddress_slayer 0x75270000) +set(baseaddress_slbcsp 0x75240000) +set(baseaddress_sndblst 0x75210000) +set(baseaddress_softpub 0x751f0000) +set(baseaddress_srclient 0x751c0000) +set(baseaddress_srvsvc 0x75190000) +set(baseaddress_sti 0x75150000) +set(baseaddress_stobject 0x750e0000) +set(baseaddress_streamci 0x750b0000) +set(baseaddress_sxs 0x75080000) +set(baseaddress_syssetup 0x74fd0000) +set(baseaddress_t2embed 0x74fa0000) +set(baseaddress_tapi32 0x74f60000) +set(baseaddress_tapiui 0x74ee0000) +set(baseaddress_testvdd 0x74eb0000) +set(baseaddress_themeui 0x74e90000) +set(baseaddress_traffic 0x74e60000) +set(baseaddress_twain_32 0x74e30000) +set(baseaddress_ubtrfs 0x74e10000) +set(baseaddress_uext2 0x74dd0000) +set(baseaddress_ufat 0x74d90000) +set(baseaddress_ufatx 0x74d70000) +set(baseaddress_uffs 0x74d50000) +set(baseaddress_umpnpmgr 0x74d20000) +set(baseaddress_untfs 0x74d00000) +set(baseaddress_updspapi 0x74cd0000) +set(baseaddress_ureiserfs 0x74cb0000) +set(baseaddress_url 0x74c80000) +set(baseaddress_vbscript 0x74be0000) +set(baseaddress_vdmdbg 0x74bb0000) +set(baseaddress_vssapi 0x74b80000) +set(baseaddress_wbemdisp 0x74b40000) +set(baseaddress_wbemprox 0x74ae0000) +set(baseaddress_win32kdll 0x74ab0000) +set(baseaddress_win32kdll_2k3sp2 0x74a80000) +set(baseaddress_win32kdll_xpsp2 0x74a50000) +set(baseaddress_windowscodecs 0x74930000) +set(baseaddress_windowscodecsext 0x74900000) +set(baseaddress_winfax 0x748d0000) +set(baseaddress_wing32 0x748a0000) +set(baseaddress_winhttp 0x74830000) +set(baseaddress_winscard 0x74800000) +set(baseaddress_winsta 0x747d0000) +set(baseaddress_wkssvc 0x747a0000) +set(baseaddress_wlanapi 0x74770000) +set(baseaddress_wldap32 0x74730000) +set(baseaddress_wmi 0x74710000) +set(baseaddress_wmisvc 0x746e0000) +set(baseaddress_wmiutils 0x746b0000) +set(baseaddress_wmvcore 0x74680000) +set(baseaddress_ws2_32_new 0x74630000) +set(baseaddress_wshirda 0x74600000) +set(baseaddress_wshtcpip 0x745d0000) +set(baseaddress_wsock32 0x745a0000) +set(baseaddress_wtsapi32 0x74570000) +set(baseaddress_wuapi 0x74530000) +set(baseaddress_xinput1_1 0x74500000) +set(baseaddress_xinput1_2 0x744d0000) +set(baseaddress_xinput1_3 0x744a0000) +set(baseaddress_xinput9_1_0 0x74470000) +set(baseaddress_xmllite 0x74430000) +set(baseaddress_access 0x743b0000) +set(baseaddress_appwiz 0x74330000) +set(baseaddress_cmicpl 0x742f0000) +set(baseaddress_desk 0x74250000) +set(baseaddress_hdwwiz 0x741d0000) +set(baseaddress_hhctrl 0x74180000) +set(baseaddress_imaadp32.acm 0x74150000) +set(baseaddress_inetcpl 0x740f0000) +set(baseaddress_intl 0x74080000) +set(baseaddress_joy 0x74040000) +set(baseaddress_main 0x73fa0000) +set(baseaddress_mmsys 0x73ed0000) +set(baseaddress_msacm32.drv 0x73ea0000) +set(baseaddress_msadp32.acm 0x73e70000) +set(baseaddress_msg711.acm 0x73e40000) +set(baseaddress_msgsm32.acm 0x73e10000) +set(baseaddress_msisys 0x73de0000) +set(baseaddress_ncpa 0x73db0000) +set(baseaddress_odbccp32i 0x73d80000) +set(baseaddress_powercfg 0x73d20000) +set(baseaddress_sysdm 0x73c40000) +set(baseaddress_telephon 0x73c10000) +set(baseaddress_timedate 0x73b90000) +set(baseaddress_usrmgr 0x73b40000) +set(baseaddress_wdmaud.drv 0x73980000) +set(baseaddress_wined3dcfg 0x73950000) +set(baseaddress_winemp3.acm 0x738d0000) +set(baseaddress_wshom 0x73880000) +set(baseaddress_fusion 0x73850000) +set(baseaddress_fusion_1_1 0x73810000) +set(baseaddress_fusion_2_0 0x737d0000)

1 0

[akhaldi] 71873: [FONTSUB] Import from Wine Staging 1.9.13. CORE-11219
by akhaldi＠svn.reactos.org 09 Jul '16

09 Jul '16

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?r… ============================================================================== --- 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/CMakeLis… ============================================================================== --- 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.… ============================================================================== --- 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?r… ============================================================================== --- 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 <stdarg.h> +#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 *keep_list, const unsigned short keep_len, CFP_ALLOCPROC allocproc, + CFP_REALLOCPROC reallocproc, CFP_FREEPROC freeproc, void *reserved) +{ + FIXME("(%p %u %p %p %p %#x %u %u %u %u %u %p %u %p %p %p %p): stub\n", src, src_len, dest, dest_len, + written, flags, face_index, format, lang, platform, encoding, keep_list, keep_len, allocproc, + reallocproc, freeproc, reserved); + + if (format != TTFCFP_SUBSET) + return ERR_GENERIC; + + *dest = allocproc(src_len); + if (!*dest) + return ERR_MEM; + + memcpy(*dest, src, src_len); + *dest_len = src_len; + *written = src_len; + + return NO_ERROR; +} Propchange: trunk/reactos/dll/win32/fontsub/main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 9 17:18:33 2016 @@ -67,6 +67,7 @@ reactos/dll/win32/dciman32 # Synced to WineStaging-1.9.11 reactos/dll/win32/faultrep # Synced to WineStaging-1.9.11 reactos/dll/win32/fltlib # Synced to WineStaging-1.9.11 +reactos/dll/win32/fontsub # Synced to WineStaging-1.9.13 reactos/dll/win32/fusion # Synced to WineStaging-1.9.11 reactos/dll/win32/gdiplus # Synced to WineStaging-1.9.11 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.9.11 Added: trunk/reactos/sdk/include/psdk/fontsub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/fontsub.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/fontsub.h (added) +++ trunk/reactos/sdk/include/psdk/fontsub.h [iso-8859-1] Sat Jul 9 17:18:33 2016 @@ -0,0 +1,64 @@ +/* + * Copyright 2016 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 + */ + +#ifndef __WINE_FONTSUB_H +#define __WINE_FONTSUB_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void *(__cdecl *CFP_ALLOCPROC)(size_t); +typedef void *(__cdecl *CFP_REALLOCPROC)(void *, size_t); +typedef void (__cdecl *CFP_FREEPROC)(void *); + +#define TTFCFP_SUBSET 0 +#define TTFCFP_SUBSET1 1 +#define TTFCFP_DELTA 2 + +#define TTFCFP_UNICODE_PLATFORMID 0 +#define TTFCFP_APPLE_PLATFORMID 1 +#define TTFCFP_ISO_PLATFORMID 2 +#define TTFCFP_MS_PLATFORMID 3 + +#define TTFCFP_STD_MAC_CHAR_SET 0 +#define TTFCFP_SYMBOL_CHAR_SET 0 +#define TTFCFP_UNICODE_CHAR_SET 1 +#define TTFCFP_DONT_CARE 0xffff + +#define TTFCFP_LANG_KEEP_ALL 0 + +#define TTFCFP_FLAGS_SUBSET 0x0001 +#define TTFCFP_FLAGS_COMPRESS 0x0002 +#define TTFCFP_FLAGS_TTC 0x0004 +#define TTFCFP_FLAGS_GLYPHLIST 0x0008 + +#define ERR_GENERIC 1000 +#define ERR_MEM 1005 + +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 *keep_list, const unsigned short keep_len, + CFP_ALLOCPROC allocproc, CFP_REALLOCPROC reallocproc, CFP_FREEPROC freeproc, void *reserved); + +#ifdef __cplusplus +} +#endif + +#endif Propchange: trunk/reactos/sdk/include/psdk/fontsub.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs