Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 57304: [WPP] Fix build with VS 9 CORE-6636 #resolve
by tkreuzer＠svn.reactos.org 15 Sep '12

15 Sep '12

Author: tkreuzer Date: Sat Sep 15 15:59:06 2012 New Revision: 57304 URL: http://svn.reactos.org/svn/reactos?rev=57304&view=rev Log: [WPP] Fix build with VS 9 CORE-6636 #resolve Modified: trunk/reactos/tools/wpp/CMakeLists.txt Modified: trunk/reactos/tools/wpp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/tools/wpp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/CMakeLists.txt [iso-8859-1] Sat Sep 15 15:59:06 2012 @@ -3,8 +3,13 @@ add_definitions( -Dsnprintf=_snprintf -Dstrtoull=_strtoui64 - -Dstrtoll=_strtoi64 - -Dvsnprintf=_vsnprintf) + -Dstrtoll=_strtoi64) + + # VS 9 doesn't like this + if (NOT MSVC90) + add_definitions( + -Dvsnprintf=_vsnprintf) + endif() endif() list(APPEND SOURCE @@ -15,4 +20,4 @@ add_library(wpp ${SOURCE}) -add_dependencies(wpp build_header) +add_dependencies(wpp build_header)

1 0

[ekohl] 57303: [INFLIB] Remove inflib because it has been replaced by newinflib.
by ekohl＠svn.reactos.org 15 Sep '12

15 Sep '12

Author: ekohl Date: Sat Sep 15 14:31:50 2012 New Revision: 57303 URL: http://svn.reactos.org/svn/reactos?rev=57303&view=rev Log: [INFLIB] Remove inflib because it has been replaced by newinflib. Removed: trunk/reactos/lib/inflib/

1 0

[akhaldi] 57302: [CMAKE] * Don't add the whole absolute path to GCC for preprocessing when creating RC dependency files in Ninja builds.. that complicates the already complicated quoting needs here.
by akhaldi＠svn.reactos.org 15 Sep '12

15 Sep '12

Author: akhaldi Date: Sat Sep 15 13:56:13 2012 New Revision: 57302 URL: http://svn.reactos.org/svn/reactos?rev=57302&view=rev Log: [CMAKE] * Don't add the whole absolute path to GCC for preprocessing when creating RC dependency files in Ninja builds.. that complicates the already complicated quoting needs here. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=57302&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Sep 15 13:56:13 2012 @@ -171,7 +171,7 @@ set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <FLAGS> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${I18N_DEFS} <DEFINES> <SOURCE> <OBJECT>") -set(CMAKE_DEPFILE_FLAGS_RC "--preprocessor \"<CMAKE_C_COMPILER> -E -xc-header -MMD -MF <DEPFILE> -MT <OBJECT>\"") +set(CMAKE_DEPFILE_FLAGS_RC "--preprocessor \"${MINGW_TOOLCHAIN_PREFIX}gcc -E -xc-header -MMD -MF <DEPFILE> -MT <OBJECT>\" ") # Optional 3rd parameter: stdcall stack bytes function(set_entrypoint MODULE ENTRYPOINT)

1 0

[mnordell] 57301: Tempoarily patch away SEGV-inducing code. See JIRA 6660 and 6661.
by mnordell＠svn.reactos.org 15 Sep '12

15 Sep '12

Author: mnordell Date: Sat Sep 15 00:04:58 2012 New Revision: 57301 URL: http://svn.reactos.org/svn/reactos?rev=57301&view=rev Log: Tempoarily patch away SEGV-inducing code. See JIRA 6660 and 6661. Modified: trunk/rostests/winetests/gdiplus/font.c trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff Modified: trunk/rostests/winetests/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/font.c?… ============================================================================== --- trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/font.c [iso-8859-1] Sat Sep 15 00:04:58 2012 @@ -485,6 +485,7 @@ GdipDeleteFontFamily(fontfamily); } +#if CORE_6660_IS_FIXED static int CALLBACK font_enum_proc(const LOGFONTW *lfe, const TEXTMETRICW *ntme, DWORD type, LPARAM lparam) { @@ -721,6 +722,7 @@ GdipDeleteGraphics(graphics); DeleteDC(hdc); } +#endif // CORE_6660_IS_FIXED START_TEST(font) { @@ -734,7 +736,9 @@ GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); +#if CORE_6660_IS_FIXED test_font_metrics(); +#endif test_createfont(); test_logfont(); test_fontfamily(); Modified: trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/gdiplus… ============================================================================== --- trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff [iso-8859-1] Sat Sep 15 00:04:58 2012 @@ -28,3 +28,34 @@ test_get_set_interpolation(); test_get_set_textrenderinghint(); test_getdc_scaled(); + +Index: font.c +=================================================================== +--- font.c (revision 57206) ++++ font.c (working copy) +@@ -485,6 +485,7 @@ + GdipDeleteFontFamily(fontfamily); + } + ++#if CORE_6660_IS_FIXED + static int CALLBACK font_enum_proc(const LOGFONTW *lfe, const TEXTMETRICW *ntme, + DWORD type, LPARAM lparam) + { +@@ -721,6 +722,7 @@ + GdipDeleteGraphics(graphics); + DeleteDC(hdc); + } ++#endif // CORE_6660_IS_FIXED + + START_TEST(font) + { +@@ -734,7 +736,9 @@ + + GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + ++#if CORE_6660_IS_FIXED + test_font_metrics(); ++#endif + test_createfont(); + test_logfont(); + test_fontfamily();

1 0

[mnordell] 57300: Tempoarily patch away SEGV-inducing code. See JIRA 6659.
by mnordell＠svn.reactos.org 14 Sep '12

14 Sep '12

Author: mnordell Date: Fri Sep 14 22:46:37 2012 New Revision: 57300 URL: http://svn.reactos.org/svn/reactos?rev=57300&view=rev Log: Tempoarily patch away SEGV-inducing code. See JIRA 6659. Added: trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff Modified: trunk/rostests/winetests/gdiplus/graphics.c Added: trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/gdiplus… ============================================================================== --- trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff (added) +++ trunk/rostests/winetests/gdiplus/gdiplus_winetest_ros.diff [iso-8859-1] Fri Sep 14 22:46:37 2012 @@ -1,0 +1,30 @@ +Index: graphics.c +=================================================================== +--- graphics.c (revision 57206) ++++ graphics.c (working copy) +@@ -2819,6 +2819,7 @@ + ReleaseDC(hwnd, hdc); + } + ++#if CORE_6659_IS_FIXED + static void test_string_functions(void) + { + GpStatus status; +@@ -3138,6 +3139,7 @@ + + ReleaseDC(hwnd, hdc); + } ++#endif /* CORE_6659_IS_FIXED */ + + static void test_get_set_interpolation(void) + { +@@ -3361,7 +3363,9 @@ + test_clear(); + test_textcontrast(); + test_fromMemoryBitmap(); ++#if CORE_6659_IS_FIXED + test_string_functions(); ++#endif + test_get_set_interpolation(); + test_get_set_textrenderinghint(); + test_getdc_scaled(); Modified: trunk/rostests/winetests/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… ============================================================================== --- trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] Fri Sep 14 22:46:37 2012 @@ -2819,6 +2819,7 @@ ReleaseDC(hwnd, hdc); } +#if CORE_6659_IS_FIXED static void test_string_functions(void) { GpStatus status; @@ -3138,6 +3139,7 @@ ReleaseDC(hwnd, hdc); } +#endif /* CORE_6659_IS_FIXED */ static void test_get_set_interpolation(void) { @@ -3361,7 +3363,9 @@ test_clear(); test_textcontrast(); test_fromMemoryBitmap(); +#if CORE_6659_IS_FIXED test_string_functions(); +#endif test_get_set_interpolation(); test_get_set_textrenderinghint(); test_getdc_scaled();

1 0

[mnordell] 57299: Make GpGraphics save/restore state id's a bit more like Windows. Fixes a winetest graphics state check failure.
by mnordell＠svn.reactos.org 14 Sep '12

14 Sep '12

Author: mnordell Date: Fri Sep 14 21:26:45 2012 New Revision: 57299 URL: http://svn.reactos.org/svn/reactos?rev=57299&view=rev Log: Make GpGraphics save/restore state id's a bit more like Windows. Fixes a winetest graphics state check failure. Added: trunk/reactos/dll/win32/gdiplus/gdiplus_ros.diff Modified: trunk/reactos/dll/win32/gdiplus/graphics.c Added: trunk/reactos/dll/win32/gdiplus/gdiplus_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus_ros.diff (added) +++ trunk/reactos/dll/win32/gdiplus/gdiplus_ros.diff [iso-8859-1] Fri Sep 14 21:26:45 2012 @@ -1,0 +1,45 @@ +Index: graphics.c +=================================================================== +--- graphics.c (revision 57285) ++++ graphics.c (working copy) +@@ -42,6 +42,23 @@ + + WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); + ++/* Mike "tamlin" Nordell 2012-09-14 for ReactOS: ++ * NOTE: Wine uses per-GpGraphics id's ('contid' starting from zero in ++ * every GpGraphics). Windows seems to use process-global id's, or at ++ * least more unique id's. ++ * This have the following implications. It: ++ * 1. fails the current gdiplus test case. ++ * 2. is not what Windows does. ++ * ++ * We therefore "obfuscate" the 'contid' a little to more match Windows' ++ * behaviour. The observable behviour should still remain the same, ++ * except for handing out more "unique" id's. ++ */ ++#define GDIP_CONTID_STEP 64 ++static volatile LONG g_priv_contid = GDIP_CONTID_STEP; ++#define GDIP_GET_NEW_CONTID_FOR(pGpGraphics) \ ++ (UINT)(InterlockedExchangeAdd(&g_priv_contid,GDIP_CONTID_STEP)) ++ + /* looks-right constants */ + #define ANCHOR_WIDTH (2.0) + #define MAX_ITERS (50) +@@ -2203,7 +2220,7 @@ + (*graphics)->busy = FALSE; + (*graphics)->textcontrast = 4; + list_init(&(*graphics)->containers); +- (*graphics)->contid = 0; ++ (*graphics)->contid = GDIP_GET_NEW_CONTID_FOR(*graphics); + + TRACE("<-- %p\n", *graphics); + +@@ -2242,7 +2259,7 @@ + (*graphics)->busy = FALSE; + (*graphics)->textcontrast = 4; + list_init(&(*graphics)->containers); +- (*graphics)->contid = 0; ++ (*graphics)->contid = GDIP_GET_NEW_CONTID_FOR(*graphics); + + TRACE("<-- %p\n", *graphics); Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Fri Sep 14 21:26:45 2012 @@ -41,6 +41,23 @@ #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); + +/* Mike "tamlin" Nordell 2012-09-14 for ReactOS: + * NOTE: Wine uses per-GpGraphics id's ('contid' starting from zero in + * every GpGraphics). Windows seems to use process-global id's, or at + * least more unique id's. + * This have the following implications. It: + * 1. fails the current gdiplus test case. + * 2. is not what Windows does. + * + * We therefore "obfuscate" the 'contid' a little to more match Windows' + * behaviour. The observable behviour should still remain the same, + * except for handing out more "unique" id's. + */ +#define GDIP_CONTID_STEP 64 +static volatile LONG g_priv_contid = GDIP_CONTID_STEP; +#define GDIP_GET_NEW_CONTID_FOR(pGpGraphics) \ + (UINT)(InterlockedExchangeAdd(&g_priv_contid,GDIP_CONTID_STEP)) /* looks-right constants */ #define ANCHOR_WIDTH (2.0) @@ -2203,7 +2220,7 @@ (*graphics)->busy = FALSE; (*graphics)->textcontrast = 4; list_init(&(*graphics)->containers); - (*graphics)->contid = 0; + (*graphics)->contid = GDIP_GET_NEW_CONTID_FOR(*graphics); TRACE("<-- %p\n", *graphics); @@ -2242,7 +2259,7 @@ (*graphics)->busy = FALSE; (*graphics)->textcontrast = 4; list_init(&(*graphics)->containers); - (*graphics)->contid = 0; + (*graphics)->contid = GDIP_GET_NEW_CONTID_FOR(*graphics); TRACE("<-- %p\n", *graphics);

1 0

[tfaber] 57298: [MSXML3] - Make a copy of the data type information instead of writing to the (read-only) .rsrc section. Already applied upstream. CORE-6645 #comment Should be fixed. Can you retest...
by tfaber＠svn.reactos.org 14 Sep '12

14 Sep '12

Author: tfaber Date: Fri Sep 14 17:22:44 2012 New Revision: 57298 URL: http://svn.reactos.org/svn/reactos?rev=57298&view=rev Log: [MSXML3] - Make a copy of the data type information instead of writing to the (read-only) .rsrc section. Already applied upstream. CORE-6645 #comment Should be fixed. Can you retest with HEAD please? Modified: trunk/reactos/dll/win32/msxml3/schema.c Modified: trunk/reactos/dll/win32/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/schema.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/schema.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/schema.c [iso-8859-1] Fri Sep 14 17:22:44 2012 @@ -68,7 +68,7 @@ static const xmlChar XDR_nsURI[] = "urn:schemas-microsoft-com:xml-data"; static const xmlChar DT_nsURI[] = "urn:schemas-microsoft-com:datatypes"; -static xmlChar const* datatypes_src; +static xmlChar * datatypes_src; static int datatypes_len; static HGLOBAL datatypes_handle; static HRSRC datatypes_rsrc; @@ -728,7 +728,6 @@ void schemasInit(void) { - int len; xmlChar* buf; if (!(datatypes_rsrc = FindResourceA(MSXML_hInstance, "DATATYPES", "XML"))) { @@ -742,14 +741,14 @@ return; } buf = LockResource(datatypes_handle); - len = SizeofResource(MSXML_hInstance, datatypes_rsrc) - 1; + datatypes_len = SizeofResource(MSXML_hInstance, datatypes_rsrc) - 1; /* Resource is loaded as raw data, * need a null-terminated string */ - while (buf[len] != '>') - buf[len--] = 0; - datatypes_src = buf; - datatypes_len = len + 1; + while (buf[datatypes_len - 1] != '>') datatypes_len--; + datatypes_src = HeapAlloc(GetProcessHeap(), 0, datatypes_len + 1); + memcpy(datatypes_src, buf, datatypes_len); + datatypes_src[datatypes_len] = 0; if (xmlGetExternalEntityLoader() != external_entity_loader) { @@ -761,6 +760,7 @@ void schemasCleanup(void) { xmlSchemaFree(datatypes_schema); + HeapFree(GetProcessHeap(), 0, datatypes_src); xmlSetExternalEntityLoader(_external_entity_loader); }

1 0

[akhaldi] 57297: [HAL]: Automatically generate the embedded PCI database. By Hermès Bélusca with improvements from me. CORE-6654 #resolve #comment Patch committed. Thanks !
by akhaldi＠svn.reactos.org 14 Sep '12

14 Sep '12

Author: akhaldi Date: Fri Sep 14 13:14:47 2012 New Revision: 57297 URL: http://svn.reactos.org/svn/reactos?rev=57297&view=rev Log: [HAL]: Automatically generate the embedded PCI database. By Hermès Bélusca with improvements from me. CORE-6654 #resolve #comment Patch committed. Thanks ! Added: trunk/reactos/hal/halx86/legacy/bus/pci_classes.ids (with props) trunk/reactos/hal/halx86/legacy/bus/pci_vendors.ids (with props) Removed: trunk/reactos/hal/halx86/legacy/bus/libpcidata.a trunk/reactos/hal/halx86/legacy/bus/pcidata.c Modified: trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/hal/halx86/legacy/bussupp.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… Removed: trunk/reactos/hal/halx86/legacy/bus/libpcidata.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/libp… Added: trunk/reactos/hal/halx86/legacy/bus/pci_classes.ids URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pci_… Added: trunk/reactos/hal/halx86/legacy/bus/pci_vendors.ids URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pci_… Removed: trunk/reactos/hal/halx86/legacy/bus/pcidata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pcid… Modified: trunk/reactos/hal/halx86/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bussupp.…

1 0

[akhaldi] 57296: [HOST-TOOLS/BIN2C]: Add bin2c host tool, to be used for embedding binary files inside C source code, by transforming them into a byte array. By Hermès Bélusca. CORE-6653 #resolve C...
by akhaldi＠svn.reactos.org 14 Sep '12

14 Sep '12

Author: akhaldi Date: Fri Sep 14 11:12:40 2012 New Revision: 57296 URL: http://svn.reactos.org/svn/reactos?rev=57296&view=rev Log: [HOST-TOOLS/BIN2C]: Add bin2c host tool, to be used for embedding binary files inside C source code, by transforming them into a byte array. By Hermès Bélusca. CORE-6653 #resolve Committed to trunk. Cheers ;) Added: trunk/reactos/tools/bin2c.c (with props) Modified: trunk/reactos/CMakeLists.txt trunk/reactos/tools/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=57296&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Fri Sep 14 11:12:40 2012 @@ -69,9 +69,9 @@ add_subdirectory(lib) if(NOT MSVC) - export(TARGETS widl gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) - else() - export(TARGETS widl gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + export(TARGETS bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + else() + export(TARGETS bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) endif() else() Modified: trunk/reactos/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/CMakeLists.txt?rev=5… ============================================================================== --- trunk/reactos/tools/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/CMakeLists.txt [iso-8859-1] Fri Sep 14 11:12:40 2012 @@ -4,6 +4,8 @@ if(MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif() + +add_executable(bin2c bin2c.c) add_subdirectory(cabman) add_subdirectory(cdmake) Added: trunk/reactos/tools/bin2c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.c?rev=57296&vi… ============================================================================== --- trunk/reactos/tools/bin2c.c (added) +++ trunk/reactos/tools/bin2c.c [iso-8859-1] Fri Sep 14 11:12:40 2012 @@ -1,0 +1,106 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS bin2c + * FILE: tools/bin2c/bin2c.c + * PURPOSE: Converts a binary file into a byte array + * PROGRAMMER: Hermès Bélusca - Maïto + */ + +#include <stdio.h> + +int main(int argc, char *argv[]) +{ + FILE* inFile; + FILE* outCFile; + FILE* outHFile; + unsigned char ch; + unsigned char cnt; + + /* + * Validate the arguments. + */ + if (argc < 5) + { + printf("Usage: bin2c infile.bin outfile.c outfile.h array_name [array_attribute [header_for_attribute]]\n"); + return -1; + } + + /* + * Open the input and the output files. + */ + inFile = fopen(argv[1], "rb"); + if (!inFile) + { + printf("ERROR: Couldn't open data file '%s'.\n", argv[1]); + return -1; + } + outCFile = fopen(argv[2], "w"); + if (!outCFile) + { + fclose(inFile); + printf("ERROR: Couldn't create output source file '%s'.\n", argv[2]); + return -1; + } + outHFile = fopen(argv[3], "w"); + if (!outHFile) + { + fclose(outCFile); + fclose(inFile); + printf("ERROR: Couldn't create output header file '%s'.\n", argv[3]); + return -1; + } + + /* + * Generate the header file and close it. + */ + fprintf(outHFile, "/* This file is autogenerated, do not edit. */\n\n"); + fprintf(outHFile, "#ifndef CHAR\n" + "#define CHAR char\n" + "#endif\n\n"); + fprintf(outHFile, "extern CHAR %s[];\n", argv[4]); + fclose(outHFile); + + /* + * Generate the source file and close it. + */ + fprintf(outCFile, "/* This file is autogenerated, do not edit. */\n\n"); + if (argc >= 7) + { + /* There is a header to be included for defining the array attribute. */ + fprintf(outCFile, "#include \"%s\"\n", argv[6]); + } + fprintf(outCFile, "#include \"%s\"\n\n", argv[3]); + + /* Generate the array. */ + if (argc >= 6) + { + /* There is an array attribute. */ + fprintf(outCFile, "%s ", argv[5]); + } + fprintf(outCFile, "CHAR %s[] =\n{", argv[4]); + + cnt = 0; + ch = fgetc(inFile); + while (!feof(inFile)) + { + if ((cnt % 16) == 0) + { + fprintf(outCFile, "\n "); + cnt = 0; + } + fprintf(outCFile, " 0x%02x,", (unsigned int)ch); + ++cnt; + ch = fgetc(inFile); + } + /* Put a final NULL terminator. */ + fprintf(outCFile, "\n 0x00"); + fprintf(outCFile, "\n};\n"); + fclose(outCFile); + + /* Close the input file. */ + fclose(inFile); + + return 0; +} + +/* EOF */ Propchange: trunk/reactos/tools/bin2c.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 57295: [RTL] Implement RtlpSafeCopyMemory, which uses SEH to copy the memory (not in freeldr) Make RtlLargeIntegerToChar use RtlpSafeCopyMemory to copy the string to the target buffer. C...
by tkreuzer＠svn.reactos.org 14 Sep '12

14 Sep '12

Author: tkreuzer Date: Fri Sep 14 09:56:23 2012 New Revision: 57295 URL: http://svn.reactos.org/svn/reactos?rev=57295&view=rev Log: [RTL] Implement RtlpSafeCopyMemory, which uses SEH to copy the memory (not in freeldr) Make RtlLargeIntegerToChar use RtlpSafeCopyMemory to copy the string to the target buffer. CORE-3767 #resolve Modified: trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/lib/rtl/rtlp.h trunk/reactos/lib/rtl/unicode.c trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/rtl/l… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c [iso-8859-1] Fri Sep 14 09:56:23 2012 @@ -44,3 +44,14 @@ { MmHeapFree(Mem); } + +NTSTATUS +NTAPI +RtlpSafeCopyMemory( + _Out_writes_bytes_all_(Length) VOID UNALIGNED *Destination, + _In_reads_bytes_(Length) CONST VOID UNALIGNED *Source, + _In_ SIZE_T Length) +{ + RtlCopyMemory(Destination, Source, Length); + return STATUS_SUCCESS; +} Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Fri Sep 14 09:56:23 2012 @@ -576,4 +576,24 @@ return STATUS_NOT_IMPLEMENTED; } +NTSTATUS +NTAPI +RtlpSafeCopyMemory( + _Out_writes_bytes_all_(Length) VOID UNALIGNED *Destination, + _In_reads_bytes_(Length) CONST VOID UNALIGNED *Source, + _In_ SIZE_T Length) +{ + _SEH2_TRY + { + RtlCopyMemory(Destination, Source, Length); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + return STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=57295&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Fri Sep 14 09:56:23 2012 @@ -33,6 +33,13 @@ ROUND_DOWN(((ULONG)(n)) + (align) - 1, (align)) #define RVA(m, b) ((PVOID)((ULONG_PTR)(b) + (ULONG_PTR)(m))) + +NTSTATUS +NTAPI +RtlpSafeCopyMemory( + _Out_writes_bytes_all_(Length) VOID UNALIGNED *Destination, + _In_reads_bytes_(Length) CONST VOID UNALIGNED *Source, + _In_ SIZE_T Length); VOID NTAPI Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=5729… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Fri Sep 14 09:56:23 2012 @@ -1735,7 +1735,6 @@ IN OUT PCHAR String) { ULONGLONG Val = Value->QuadPart; - NTSTATUS Status = STATUS_SUCCESS; CHAR Buffer[65]; CHAR Digit; SIZE_T Len; @@ -1769,36 +1768,12 @@ if (Len > Length) return STATUS_BUFFER_OVERFLOW; -#if 1 /* It needs to be removed, when will probably use SEH in rtl */ - - if (String == NULL) - { - return STATUS_ACCESS_VIOLATION; - } - -#endif - -#if 0 - _SEH2_TRY - { -#endif - - if (Len == Length) - RtlCopyMemory(String, Pos, Len); - else - RtlCopyMemory(String, Pos, Len + 1); - -#if 0 - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Get the error code */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; -#endif - - return Status; + /* If possible, add the 0 termination */ + if (Len < Length) + Len += 1; + + /* Copy the string to the target using SEH */ + return RtlpSafeCopyMemory(String, Pos, Len); } /* Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Fri Sep 14 09:56:23 2012 @@ -676,5 +676,25 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +RtlpSafeCopyMemory( + _Out_writes_bytes_all_(Length) VOID UNALIGNED *Destination, + _In_reads_bytes_(Length) CONST VOID UNALIGNED *Source, + _In_ SIZE_T Length) +{ + _SEH2_TRY + { + RtlCopyMemory(Destination, Source, Length); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + return STATUS_SUCCESS; +} + /* EOF */

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