Ros-diffs September 2012

ros-diffs@reactos.org

17 participants
236 discussions

[tkreuzer] 57307: {CSRSRV] Silence an uninformative DPRINT
by tkreuzer＠svn.reactos.org 15 Sep '12

15 Sep '12

Author: tkreuzer Date: Sat Sep 15 16:33:30 2012 New Revision: 57307 URL: http://svn.reactos.org/svn/reactos?rev=57307&view=rev Log: {CSRSRV] Silence an uninformative DPRINT Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Sat Sep 15 16:33:30 2012 @@ -187,7 +187,7 @@ DPRINT1("CSRSS: %s Api Request received from server process\n", ServerDll->NameTable[ApiId]); } - + /* Validation complete, start SEH */ _SEH2_TRY { @@ -433,7 +433,7 @@ 0, 0, 0, 0, 0, 0, 0, &RestrictedSid); ASSERT(NT_SUCCESS(Status)); - + /* Allocate one ACL with 3 ACEs each for one SID */ AclLength = sizeof(ACL) + 3 * sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(SystemSid) + @@ -471,7 +471,7 @@ ASSERT(NT_SUCCESS(Status)); Status = RtlAddAccessAllowedAce(*RestrictedDacl, ACL_REVISION2, DIRECTORY_TRAVERSE, RestrictedSid); ASSERT(NT_SUCCESS(Status)); - + /* The SIDs are captured, can free them now */ RtlFreeHeap(CsrHeap, 0, SystemSid); RtlFreeHeap(CsrHeap, 0, WorldSid); @@ -511,7 +511,7 @@ }, {0} }; - + /* Get the session ID */ SessionId = NtCurrentPeb()->SessionId; @@ -641,7 +641,7 @@ ASSERT(BnoSd); Status = RtlCreateSecurityDescriptor(BnoSd, SECURITY_DESCRIPTOR_REVISION); ASSERT(NT_SUCCESS(Status)); - + /* Create the BNO and \Restricted DACLs */ Status = CreateBaseAcls(&BnoDacl, &BnoRestrictedDacl); ASSERT(NT_SUCCESS(Status)); @@ -769,7 +769,7 @@ DPRINT1("CSRSRV: Unknown process: %lx. Will be rejecting connection\n", Request->ClientId.UniqueProcess); } - + if ((ProcessData) && (ProcessData != CsrRootProcess)) { /* Attach the Shared Section */ @@ -1068,13 +1068,13 @@ continue; } } - + /* Use whatever Client ID we got */ Teb->RealClientId = Request->Header.ClientId; /* Get the Message Type */ MessageType = Request->Header.u2.s2.Type; - + /* Handle connection requests */ if (MessageType == LPC_CONNECTION_REQUEST) { @@ -1085,7 +1085,7 @@ ReplyPort = CsrApiPort; continue; } - + /* It's some other kind of request. Get the lock for the lookup */ CsrAcquireProcessLock(); @@ -1098,7 +1098,7 @@ { /* This wasn't a CSR Thread, release lock */ CsrReleaseProcessLock(); - + /* If this was an exception, handle it */ if (MessageType == LPC_EXCEPTION) { @@ -1111,7 +1111,7 @@ MessageType == LPC_CLIENT_DIED) { /* The Client or Port are gone, loop again */ - DPRINT1("Death from unknown thread, just continue\n"); + DPRINT("Death from unknown thread, just continue\n"); Reply = NULL; ReplyPort = CsrApiPort; } @@ -1131,7 +1131,7 @@ { CsrHandleHardError(CsrThread, (PHARDERROR_MSG)Request); } - + /* If the response was 0xFFFFFFFF, we'll ignore it */ if (HardErrorMsg->Response == 0xFFFFFFFF) { @@ -1172,7 +1172,7 @@ /* Keep going */ continue; } - + /* We have a valid thread, was this an LPC Request? */ if (MessageType != LPC_REQUEST) { @@ -1207,7 +1207,7 @@ ReplyPort = CsrApiPort; continue; } - + /* Reference the thread and release the lock */ CsrLockedReferenceThread(CsrThread); CsrReleaseProcessLock(); @@ -1253,14 +1253,14 @@ /* We got an API Request */ CsrLockedReferenceThread(CsrThread); CsrReleaseProcessLock(); - + /* Assume success */ Reply = Request; Request->Status = STATUS_SUCCESS; /* Now we reply to a particular client */ ReplyPort = CsrThread->Process->ClientPort; - + DPRINT("CSR: Got CSR API: %x [Message Origin: %x]\n", Request->Type, Request->Header.ClientId.UniqueThread); @@ -1270,19 +1270,19 @@ { /* Make sure we have enough threads */ CsrpCheckRequestThreads(); - + /* Set the client thread pointer */ NtCurrentTeb()->CsrClientThread = CsrThread; /* Call the Handler */ CsrApiCallHandler(CsrThread->Process, Request); - + /* Increase the static thread count */ _InterlockedIncrement(&CsrpStaticThreadCount); /* Restore the server thread */ NtCurrentTeb()->CsrClientThread = ServerThread; - + /* Check if this is a dead client now */ if (Request->Type == 0xBABE) {

1 0

[tkreuzer] 57306: [WPP] Fix WDK build.
by tkreuzer＠svn.reactos.org 15 Sep '12

15 Sep '12

Author: tkreuzer Date: Sat Sep 15 16:15:54 2012 New Revision: 57306 URL: http://svn.reactos.org/svn/reactos?rev=57306&view=rev Log: [WPP] Fix WDK build. 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 16:15:54 2012 @@ -5,8 +5,8 @@ -Dstrtoull=_strtoui64 -Dstrtoll=_strtoi64) - # VS 9 doesn't like this - if (NOT MSVC90) + # Add this definition for WDK only, VS 9 doesn't like that + if (DEFINED ENV{DDKBUILDENV}) add_definitions( -Dvsnprintf=_vsnprintf) endif()

1 0

[akhaldi] 57305: * Change newinflib to inflib. CORE-6662 #resolve
by akhaldi＠svn.reactos.org 15 Sep '12

15 Sep '12

Author: akhaldi Date: Sat Sep 15 16:04:32 2012 New Revision: 57305 URL: http://svn.reactos.org/svn/reactos?rev=57305&view=rev Log: * Change newinflib to inflib. CORE-6662 #resolve Added: trunk/reactos/lib/inflib/ - copied from r57303, trunk/reactos/lib/newinflib/ Removed: trunk/reactos/lib/newinflib/ Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt trunk/reactos/lib/CMakeLists.txt trunk/reactos/tools/mkhive/CMakeLists.txt Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/CMakeLis… ============================================================================== --- trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] Sat Sep 15 16:04:32 2012 @@ -2,7 +2,7 @@ add_definitions(${I18N_DEFS}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} - ${REACTOS_SOURCE_DIR}/lib/newinflib + ${REACTOS_SOURCE_DIR}/lib/inflib ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib ${REACTOS_SOURCE_DIR}/include/reactos/drivers) Modified: trunk/reactos/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/CMakeLists.txt?rev=573… ============================================================================== --- trunk/reactos/lib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/CMakeLists.txt [iso-8859-1] Sat Sep 15 16:04:32 2012 @@ -1,6 +1,6 @@ add_subdirectory(cmlib) -add_subdirectory(newinflib) +add_subdirectory(inflib) if(CMAKE_CROSSCOMPILING) Modified: trunk/reactos/tools/mkhive/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/CMakeLists.tx… ============================================================================== --- trunk/reactos/tools/mkhive/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/CMakeLists.txt [iso-8859-1] Sat Sep 15 16:04:32 2012 @@ -2,7 +2,7 @@ add_definitions(-DMKHIVE_HOST) include_directories( - ${REACTOS_SOURCE_DIR}/lib/newinflib + ${REACTOS_SOURCE_DIR}/lib/inflib ${REACTOS_SOURCE_DIR}/lib/cmlib ${REACTOS_SOURCE_DIR}/lib/rtl)

1 0

[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

← Newer
1
...
12
13
14
15
16
17
18
...
24
Older →

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 September 2012