Ros-diffs July 2016

ros-diffs@reactos.org

18 participants
358 discussions

[mjansen] 71886: [SDK][XML2SDB] Introducing the xml2sdb host tool, used to convert xml files to appcompat Sdb files. CORE-11302 Uses tinyxml2 to parse the xml. Thanks to Thomas for reviewing / sugg...

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun Jul 10 16:14:39 2016 New Revision: 71886 URL: http://svn.reactos.org/svn/reactos?rev=71886&view=rev Log: [SDK][XML2SDB] Introducing the xml2sdb host tool, used to convert xml files to appcompat Sdb files. CORE-11302 Uses tinyxml2 to parse the xml. Thanks to Thomas for reviewing / suggesting fixes! Added: trunk/reactos/sdk/tools/xml2sdb/ trunk/reactos/sdk/tools/xml2sdb/CMakeLists.txt (with props) trunk/reactos/sdk/tools/xml2sdb/main.cpp (with props) trunk/reactos/sdk/tools/xml2sdb/tinyxml2.cpp (with props) trunk/reactos/sdk/tools/xml2sdb/tinyxml2.h (with props) trunk/reactos/sdk/tools/xml2sdb/xml2sdb.cpp (with props) trunk/reactos/sdk/tools/xml2sdb/xml2sdb.h (with props) Modified: trunk/reactos/CMakeLists.txt trunk/reactos/sdk/cmake/host-tools.cmake trunk/reactos/sdk/tools/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=71886&r… Modified: trunk/reactos/sdk/cmake/host-tools.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/host-tools.cmake… Modified: trunk/reactos/sdk/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/CMakeLists.txt?r… Added: trunk/reactos/sdk/tools/xml2sdb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/xml2sdb/CMakeLis… Added: trunk/reactos/sdk/tools/xml2sdb/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/xml2sdb/main.cpp… Added: trunk/reactos/sdk/tools/xml2sdb/tinyxml2.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/xml2sdb/tinyxml2… Added: trunk/reactos/sdk/tools/xml2sdb/tinyxml2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/xml2sdb/tinyxml2… Added: trunk/reactos/sdk/tools/xml2sdb/xml2sdb.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/xml2sdb/xml2sdb.… Added: trunk/reactos/sdk/tools/xml2sdb/xml2sdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/xml2sdb/xml2sdb.…

8 years, 5 months

[mjansen] 71885: [APPHELP] Prepare sdbwrite related api for a new hosttool. CORE-11302 - Adding an extra argument to SdbReAlloc - Do not rely on platform wcs* functions.

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun Jul 10 16:06:39 2016 New Revision: 71885 URL: http://svn.reactos.org/svn/reactos?rev=71885&view=rev Log: [APPHELP] Prepare sdbwrite related api for a new hosttool. CORE-11302 - Adding an extra argument to SdbReAlloc - Do not rely on platform wcs* functions. Added: trunk/reactos/dll/appcompat/apphelp/sdbwrite.h (with props) Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.c trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/reactos/dll/appcompat/apphelp/sdbpapi.h trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c trunk/reactos/dll/appcompat/apphelp/sdbwrite.c Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.c [iso-8859-1] Sun Jul 10 16:06:39 2016 @@ -102,7 +102,8 @@ { char Buffer[512]; va_list ArgList; - char* Current = Buffer, *LevelStr; + char* Current = Buffer; + const char* LevelStr; size_t Length = sizeof(Buffer); if (g_ShimDebugLevel == 0xffffffff) Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Sun Jul 10 16:06:39 2016 @@ -178,7 +178,7 @@ return mem; } -LPVOID SdbpReAlloc(LPVOID mem, SIZE_T size +LPVOID SdbpReAlloc(LPVOID mem, SIZE_T size, SIZE_T oldSize #if SDBAPI_DEBUG_ALLOC , int line, const char* file #endif Modified: trunk/reactos/dll/appcompat/apphelp/sdbpapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbp… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbpapi.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbpapi.h [iso-8859-1] Sun Jul 10 16:06:39 2016 @@ -30,21 +30,21 @@ #if SDBAPI_DEBUG_ALLOC LPVOID SdbpAlloc(SIZE_T size, int line, const char* file); -LPVOID SdbpReAlloc(LPVOID mem, SIZE_T size, int line, const char* file); +LPVOID SdbpReAlloc(LPVOID mem, SIZE_T size, SIZE_T oldSize, int line, const char* file); void SdbpFree(LPVOID mem, int line, const char* file); #define SdbAlloc(size) SdbpAlloc(size, __LINE__, __FILE__) -#define SdbReAlloc(mem, size) SdbpReAlloc(mem, size, __LINE__, __FILE__) +#define SdbReAlloc(mem, size, oldSize) SdbpReAlloc(mem, size, oldSize, __LINE__, __FILE__) #define SdbFree(mem) SdbpFree(mem, __LINE__, __FILE__) #else LPVOID SdbpAlloc(SIZE_T size); -LPVOID SdbpReAlloc(LPVOID mem, SIZE_T size); +LPVOID SdbpReAlloc(LPVOID mem, SIZE_T size, SIZE_T oldSize); void SdbpFree(LPVOID mem); #define SdbAlloc(size) SdbpAlloc(size) -#define SdbReAlloc(mem, size) SdbpReAlloc(mem, size) +#define SdbReAlloc(mem, size, oldSize) SdbpReAlloc(mem, size, oldSize) #define SdbFree(mem) SdbpFree(mem) #endif @@ -71,6 +71,9 @@ BOOL WINAPI SdbpCheckTagType(TAG tag, WORD type); BOOL WINAPI SdbpCheckTagIDType(PDB db, TAGID tagid, WORD type); +#ifndef WINAPIV +#define WINAPIV +#endif typedef enum _SHIM_LOG_LEVEL { SHIM_ERR = 1, Modified: trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbs… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c [iso-8859-1] Sun Jul 10 16:06:39 2016 @@ -23,11 +23,20 @@ #include "sdbpapi.h" #else /* !defined(SDBWRITE_HOSTTOOL) */ #include <typedefs.h> +#include <guiddef.h> #include "sdbtypes.h" #include "sdbpapi.h" #endif /* !defined(SDBWRITE_HOSTTOOL) */ #include "sdbstringtable.h" + +#if !defined(offsetof) +#if defined(__GNUC__) +#define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER) +#else +#define offsetof(TYPE, MEMBER) ((size_t)&(((TYPE *)0)->MEMBER)) +#endif +#endif // !defined(offsetof) #define DEFAULT_TABLE_SIZE 0x100 @@ -98,13 +107,48 @@ return hash; } +int Sdbwcscmp(const WCHAR* s1, const WCHAR* s2) +{ + while (*s1 == *s2) + { + if (*s1 == 0) + return 0; + s1++; + s2++; + } + return *s1 - *s2; +} + + +// implementation taken from reactos/sdk/lib/crt/string/wcs.c +INT Sdbwcscpy(WCHAR* wcDest, size_t numElement, const WCHAR *wcSrc) +{ + size_t size = 0; + if(!wcDest || !numElement) + return 22; /* EINVAL */ + + wcDest[0] = 0; + + if(!wcSrc) + return 22; /* EINVAL */ + + size = SdbpStrlen(wcSrc) + 1; + + if(size > numElement) + return 34; /* ERANGE */ + + memcpy(wcDest, wcSrc, size * sizeof(WCHAR)); + + return 0; +} + static struct SdbHashEntry** TableFindPtr(struct SdbStringHashTable* table, const WCHAR* str) { DWORD hash = StringHash(str); struct SdbHashEntry** entry = &table->Entries[hash % table->Size]; while (*entry) { - if (!wcscmp((*entry)->Name, str)) + if (!Sdbwcscmp((*entry)->Name, str)) return entry; entry = &(*entry)->Next; } @@ -114,12 +158,13 @@ static BOOL HashAddString(struct SdbStringHashTable* table, struct SdbHashEntry** position, const WCHAR* str, TAGID tagid) { struct SdbHashEntry* entry; - SIZE_T size; + SIZE_T size, len; if (!position) position = TableFindPtr(table, str); - size = offsetof(struct SdbHashEntry, Name[SdbpStrlen(str) + 2]); + len = SdbpStrlen(str) + 1; + size = offsetof(struct SdbHashEntry, Name[len]); entry = (*position) = SdbAlloc(size); if (!entry) { @@ -127,7 +172,7 @@ return FALSE; } entry->Tagid = tagid; - wcscpy(entry->Name, str); + Sdbwcscpy(entry->Name, len, str); return TRUE; } Modified: trunk/reactos/dll/appcompat/apphelp/sdbwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbw… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] Sun Jul 10 16:06:39 2016 @@ -47,9 +47,10 @@ { if (db->write_iter + size > db->size) { + DWORD oldSize = db->size; /* Round to powers of two to prevent too many reallocations */ while (db->size < db->write_iter + size) db->size <<= 1; - db->data = SdbReAlloc(db->data, db->size); + db->data = SdbReAlloc(db->data, db->size, oldSize); } memcpy(db->data + db->write_iter, data, size); Added: trunk/reactos/dll/appcompat/apphelp/sdbwrite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbw… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbwrite.h (added) +++ trunk/reactos/dll/appcompat/apphelp/sdbwrite.h [iso-8859-1] Sun Jul 10 16:06:39 2016 @@ -0,0 +1,44 @@ +/* + * Copyright 2013 Mislav BlaÅ¾eviÄ + * Copyright 2015,2016 Mark Jansen + * + * 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 SDBWRITE_H +#define SDBWRITE_H + +#ifdef __cplusplus +extern "C" { +#endif + +PDB WINAPI SdbCreateDatabase(LPCWSTR path, PATH_TYPE type); +void WINAPI SdbCloseDatabaseWrite(PDB db); +BOOL WINAPI SdbWriteNULLTag(PDB db, TAG tag); +BOOL WINAPI SdbWriteWORDTag(PDB db, TAG tag, WORD data); +BOOL WINAPI SdbWriteDWORDTag(PDB db, TAG tag, DWORD data); +BOOL WINAPI SdbWriteQWORDTag(PDB db, TAG tag, QWORD data); +BOOL WINAPI SdbWriteStringTag(PDB db, TAG tag, LPCWSTR string); +BOOL WINAPI SdbWriteStringRefTag(PDB db, TAG tag, TAGID tagid); +BOOL WINAPI SdbWriteBinaryTag(PDB db, TAG tag, BYTE* data, DWORD size); +BOOL WINAPI SdbWriteBinaryTagFromFile(PDB db, TAG tag, LPCWSTR path); +TAGID WINAPI SdbBeginWriteListTag(PDB db, TAG tag); +BOOL WINAPI SdbEndWriteListTag(PDB db, TAGID tagid); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // SDBWRITE_H Propchange: trunk/reactos/dll/appcompat/apphelp/sdbwrite.h ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 5 months

[ekohl] 71884: [USETUP] Add CAPS-LOCK support to the keyboard layout. Patch by Carlo Bramini. CORE-3368 #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jul 10 15:51:45 2016 New Revision: 71884 URL: http://svn.reactos.org/svn/reactos?rev=71884&view=rev Log: [USETUP] Add CAPS-LOCK support to the keyboard layout. Patch by Carlo Bramini. CORE-3368 #comment Thanks a lot! Modified: trunk/reactos/base/setup/usetup/native/utils/keytrans.c Modified: trunk/reactos/base/setup/usetup/native/utils/keytrans.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/u… ============================================================================== --- trunk/reactos/base/setup/usetup/native/utils/keytrans.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/native/utils/keytrans.c [iso-8859-1] Sun Jul 10 15:51:45 2016 @@ -173,83 +173,84 @@ UCHAR Normal; UCHAR Shift; UCHAR NumLock; + UCHAR bCAPS; } SCANTOASCII, *PSCANTOASCII; SCANTOASCII ScanToAscii[] = { -{ 0x1e, 0, 'a', 'A', 0 }, -{ 0x30, 0, 'b', 'B', 0 }, -{ 0x2e, 0, 'c', 'C', 0 }, -{ 0x20, 0, 'd', 'D', 0 }, -{ 0x12, 0, 'e', 'E', 0 }, -{ 0x21, 0, 'f', 'F', 0 }, -{ 0x22, 0, 'g', 'G', 0 }, -{ 0x23, 0, 'h', 'H', 0 }, -{ 0x17, 0, 'i', 'I', 0 }, -{ 0x24, 0, 'j', 'J', 0 }, -{ 0x25, 0, 'k', 'K', 0 }, -{ 0x26, 0, 'l', 'L', 0 }, -{ 0x32, 0, 'm', 'M', 0 }, -{ 0x31, 0, 'n', 'N', 0 }, -{ 0x18, 0, 'o', 'O', 0 }, -{ 0x19, 0, 'p', 'P', 0 }, -{ 0x10, 0, 'q', 'Q', 0 }, -{ 0x13, 0, 'r', 'R', 0 }, -{ 0x1f, 0, 's', 'S', 0 }, -{ 0x14, 0, 't', 'T', 0 }, -{ 0x16, 0, 'u', 'U', 0 }, -{ 0x2f, 0, 'v', 'V', 0 }, -{ 0x11, 0, 'w', 'W', 0 }, -{ 0x2d, 0, 'x', 'X', 0 }, -{ 0x15, 0, 'y', 'Y', 0 }, -{ 0x2c, 0, 'z', 'Z', 0 }, - -{ 0x02, 0, '1', '!', 0 }, -{ 0x03, 0, '2', '@', 0 }, -{ 0x04, 0, '3', '#', 0 }, -{ 0x05, 0, '4', '$', 0 }, -{ 0x06, 0, '5', '%', 0 }, -{ 0x07, 0, '6', '^', 0 }, -{ 0x08, 0, '7', '&', 0 }, -{ 0x09, 0, '8', '*', 0 }, -{ 0x0a, 0, '9', '(', 0 }, -{ 0x0b, 0, '0', ')', 0 }, - -{ 0x29, 0, '\'', '~', 0 }, -{ 0x0c, 0, '-', '_', 0 }, -{ 0x0d, 0, '=', '+', 0 }, -{ 0x1a, 0, '[', '{', 0 }, -{ 0x1b, 0, ']', '}', 0 }, -{ 0x2b, 0, '\\', '|', 0 }, -{ 0x27, 0, ';', ':', 0 }, -{ 0x28, 0, '\'', '"', 0 }, -{ 0x33, 0, ',', '<', 0 }, -{ 0x34, 0, '.', '>', 0 }, -{ 0x35, 0, '/', '?', 0 }, - -{ 0x4f, 0, 0, 0, '1' }, -{ 0x50, 0, 0, 0, '2' }, -{ 0x51, 0, 0, 0, '3' }, -{ 0x4b, 0, 0, 0, '4' }, -{ 0x4c, 0, 0, 0, '5' }, -{ 0x4d, 0, 0, 0, '6' }, -{ 0x47, 0, 0, 0, '7' }, -{ 0x48, 0, 0, 0, '8' }, -{ 0x49, 0, 0, 0, '9' }, -{ 0x52, 0, 0, 0, '0' }, - -{ 0x4a, 0, '-', '-', 0 }, -{ 0x4e, 0, '+', '+', 0 }, -{ 0x37, 0, '*', '*', 0 }, -{ 0x35, 1, '/', '/', 0 }, -{ 0x53, 0, 0, 0, '.' }, - -{ 0x39, 0, ' ', ' ', 0 }, - -{ 0x1c, 0, '\r', '\r', 0 }, -{ 0x1c, 1, '\r', '\r', 0 }, -{ 0x0e, 0, 0x08, 0x08, 0 }, /* backspace */ - -{ 0, 0, 0, 0, 0 } +{ 0x1e, 0, 'a', 'A', 0, TRUE }, +{ 0x30, 0, 'b', 'B', 0, TRUE }, +{ 0x2e, 0, 'c', 'C', 0, TRUE }, +{ 0x20, 0, 'd', 'D', 0, TRUE }, +{ 0x12, 0, 'e', 'E', 0, TRUE }, +{ 0x21, 0, 'f', 'F', 0, TRUE }, +{ 0x22, 0, 'g', 'G', 0, TRUE }, +{ 0x23, 0, 'h', 'H', 0, TRUE }, +{ 0x17, 0, 'i', 'I', 0, TRUE }, +{ 0x24, 0, 'j', 'J', 0, TRUE }, +{ 0x25, 0, 'k', 'K', 0, TRUE }, +{ 0x26, 0, 'l', 'L', 0, TRUE }, +{ 0x32, 0, 'm', 'M', 0, TRUE }, +{ 0x31, 0, 'n', 'N', 0, TRUE }, +{ 0x18, 0, 'o', 'O', 0, TRUE }, +{ 0x19, 0, 'p', 'P', 0, TRUE }, +{ 0x10, 0, 'q', 'Q', 0, TRUE }, +{ 0x13, 0, 'r', 'R', 0, TRUE }, +{ 0x1f, 0, 's', 'S', 0, TRUE }, +{ 0x14, 0, 't', 'T', 0, TRUE }, +{ 0x16, 0, 'u', 'U', 0, TRUE }, +{ 0x2f, 0, 'v', 'V', 0, TRUE }, +{ 0x11, 0, 'w', 'W', 0, TRUE }, +{ 0x2d, 0, 'x', 'X', 0, TRUE }, +{ 0x15, 0, 'y', 'Y', 0, TRUE }, +{ 0x2c, 0, 'z', 'Z', 0, TRUE }, + +{ 0x02, 0, '1', '!', 0, FALSE }, +{ 0x03, 0, '2', '@', 0, FALSE }, +{ 0x04, 0, '3', '#', 0, FALSE }, +{ 0x05, 0, '4', '$', 0, FALSE }, +{ 0x06, 0, '5', '%', 0, FALSE }, +{ 0x07, 0, '6', '^', 0, FALSE }, +{ 0x08, 0, '7', '&', 0, FALSE }, +{ 0x09, 0, '8', '*', 0, FALSE }, +{ 0x0a, 0, '9', '(', 0, FALSE }, +{ 0x0b, 0, '0', ')', 0, FALSE }, + +{ 0x29, 0, '\'', '~', 0, FALSE }, +{ 0x0c, 0, '-', '_', 0, FALSE }, +{ 0x0d, 0, '=', '+', 0, FALSE }, +{ 0x1a, 0, '[', '{', 0, FALSE }, +{ 0x1b, 0, ']', '}', 0, FALSE }, +{ 0x2b, 0, '\\', '|', 0, FALSE }, +{ 0x27, 0, ';', ':', 0, FALSE }, +{ 0x28, 0, '\'', '"', 0, FALSE }, +{ 0x33, 0, ',', '<', 0, FALSE }, +{ 0x34, 0, '.', '>', 0, FALSE }, +{ 0x35, 0, '/', '?', 0, FALSE }, + +{ 0x4f, 0, 0, 0, '1', FALSE }, +{ 0x50, 0, 0, 0, '2', FALSE }, +{ 0x51, 0, 0, 0, '3', FALSE }, +{ 0x4b, 0, 0, 0, '4', FALSE }, +{ 0x4c, 0, 0, 0, '5', FALSE }, +{ 0x4d, 0, 0, 0, '6', FALSE }, +{ 0x47, 0, 0, 0, '7', FALSE }, +{ 0x48, 0, 0, 0, '8', FALSE }, +{ 0x49, 0, 0, 0, '9', FALSE }, +{ 0x52, 0, 0, 0, '0', FALSE }, + +{ 0x4a, 0, '-', '-', 0, FALSE }, +{ 0x4e, 0, '+', '+', 0, FALSE }, +{ 0x37, 0, '*', '*', 0, FALSE }, +{ 0x35, 1, '/', '/', 0, FALSE }, +{ 0x53, 0, 0, 0, '.', FALSE }, + +{ 0x39, 0, ' ', ' ', 0, FALSE }, + +{ 0x1c, 0, '\r', '\r', 0, FALSE }, +{ 0x1c, 1, '\r', '\r', 0, FALSE }, +{ 0x0e, 0, 0x08, 0x08, 0, FALSE }, /* backspace */ + +{ 0, 0, 0, 0, 0, FALSE } }; @@ -276,11 +277,24 @@ Value = LEFT_ALT_PRESSED; break; + case 0x3A: + Value = CAPSLOCK_ON; + if (!(InputData->Flags & KEY_BREAK)) + *State ^= Value; + return; + case 0x45: Value = NUMLOCK_ON; if (!(InputData->Flags & KEY_BREAK)) *State ^= Value; return; + + case 0x46: + Value = SCROLLLOCK_ON; + if (!(InputData->Flags & KEY_BREAK)) + *State ^= Value; + return; + default: return; } @@ -342,6 +356,10 @@ return ScanToAscii[Counter].Normal; } } + + if ((KeyState & CAPSLOCK_ON) && ScanToAscii[Counter].bCAPS) + KeyState ^= SHIFT_PRESSED; + if (KeyState & SHIFT_PRESSED) return ScanToAscii[Counter].Shift;

8 years, 5 months

[tfaber] 71883: [NTOS:CC] - Raise exceptions on failure in CcMapData if RAISE_FROM_CC_MAP_DATA is defined. This is how the function should behave, and should be enabled once all our file system dri...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 10 14:46:37 2016 New Revision: 71883 URL: http://svn.reactos.org/svn/reactos?rev=71883&view=rev Log: [NTOS:CC] - Raise exceptions on failure in CcMapData if RAISE_FROM_CC_MAP_DATA is defined. This is how the function should behave, and should be enabled once all our file system drivers correctly handle this. CORE-9848 Modified: trunk/reactos/ntoskrnl/cc/pin.c Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=7188… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Sun Jul 10 14:46:37 2016 @@ -16,6 +16,8 @@ /* GLOBALS *******************************************************************/ +//#define RAISE_FROM_CC_MAP_DATA + extern NPAGED_LOOKASIDE_LIST iBcbLookasideList; /* FUNCTIONS *****************************************************************/ @@ -62,7 +64,11 @@ { CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n", FileObject, FileOffset, Length, Flags); +#ifdef RAISE_FROM_CC_MAP_DATA + ExRaiseStatus(STATUS_INVALID_PARAMETER); +#else return FALSE; +#endif } ROffset = ROUND_DOWN(ReadOffset, VACB_MAPPING_GRANULARITY); @@ -75,7 +81,11 @@ { CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n", FileObject, FileOffset, Length, Flags); +#ifdef RAISE_FROM_CC_MAP_DATA + ExRaiseStatus(Status); +#else return FALSE; +#endif } if (!Valid) @@ -88,12 +98,17 @@ return FALSE; } - if (!NT_SUCCESS(CcReadVirtualAddress(Vacb))) + Status = CcReadVirtualAddress(Vacb); + if (!NT_SUCCESS(Status)) { CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE, FALSE); CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n", FileObject, FileOffset, Length, Flags); +#ifdef RAISE_FROM_CC_MAP_DATA + ExRaiseStatus(Status); +#else return FALSE; +#endif } } @@ -104,7 +119,11 @@ CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, FALSE, FALSE); CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n", FileObject, FileOffset, Length, Flags); +#ifdef RAISE_FROM_CC_MAP_DATA + ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); +#else return FALSE; +#endif } RtlZeroMemory(iBcb, sizeof(*iBcb));

8 years, 5 months

[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

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)

8 years, 5 months

[mjansen] 71881: [RAPPS] Fix some translated / misspelled tags.

by mjansen＠svn.reactos.org

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

8 years, 5 months

[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

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)

8 years, 5 months

[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

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");

8 years, 5 months

[tfaber] 71878: [SERVMAN] - Fix MSVC build

by tfaber＠svn.reactos.org

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

8 years, 5 months

[tfaber] 71877: [LIBXML2] - Fix MSVC build (already fixed upstream)

by tfaber＠svn.reactos.org

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");

8 years, 5 months

← Newer
1
...
16
17
18
19
20
21
22
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2016