Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 53489: [CMAKE] * Fix the ar variable. Missed in r53488.
by akhaldi＠svn.reactos.org 29 Aug '11

29 Aug '11

Author: akhaldi Date: Mon Aug 29 13:43:15 2011 New Revision: 53489 URL: http://svn.reactos.org/svn/reactos?rev=53489&view=rev Log: [CMAKE] * Fix the ar variable. Missed in r53488. Modified: trunk/reactos/toolchain-gcc.cmake Modified: trunk/reactos/toolchain-gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-gcc.cmake?rev=53… ============================================================================== --- trunk/reactos/toolchain-gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-gcc.cmake [iso-8859-1] Mon Aug 29 13:43:15 2011 @@ -35,7 +35,7 @@ set(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows) - set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} crs <TARGET> <LINK_FLAGS> <OBJECTS>") + set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>") set(CMAKE_CXX_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) endif()

1 0

[spetreolle] 53488: [CMAKE] Let cmake find mingw32-ar by itself on *nix, otherwise cmake errors out. See http://www.mail-archive.com/cmake@cmake.org/msg27491.html for details.
by spetreolle＠svn.reactos.org 29 Aug '11

29 Aug '11

Author: spetreolle Date: Mon Aug 29 13:15:14 2011 New Revision: 53488 URL: http://svn.reactos.org/svn/reactos?rev=53488&view=rev Log: [CMAKE] Let cmake find mingw32-ar by itself on *nix, otherwise cmake errors out. See http://www.mail-archive.com/cmake@cmake.org/msg27491.html for details. Modified: trunk/reactos/toolchain-gcc.cmake Modified: trunk/reactos/toolchain-gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-gcc.cmake?rev=53… ============================================================================== --- trunk/reactos/toolchain-gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-gcc.cmake [iso-8859-1] Mon Aug 29 13:15:14 2011 @@ -35,7 +35,6 @@ set(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows) - set(CMAKE_AR ${MINGW_PREFIX}ar) set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} crs <TARGET> <LINK_FLAGS> <OBJECTS>") set(CMAKE_CXX_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})

1 0

[gadamopoulos] 53487: [win32k] -revert an unwanted change from r53355
by gadamopoulos＠svn.reactos.org 29 Aug '11

29 Aug '11

Author: gadamopoulos Date: Mon Aug 29 12:49:51 2011 New Revision: 53487 URL: http://svn.reactos.org/svn/reactos?rev=53487&view=rev Log: [win32k] -revert an unwanted change from r53355 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Mon Aug 29 12:49:51 2011 @@ -166,7 +166,7 @@ { TRACE("sending WM_KILLFOCUS to hwnd 0x%x\n", hWndPrev); IntNotifyWinEvent(EVENT_OBJECT_FOCUS, NULL, OBJID_CLIENT, CHILDID_SELF, 0); - co_IntSendMessage(hWndPrev, WM_KILLFOCUS, (WPARAM)hWnd, 0); + co_IntSendMessageNoWait(hWndPrev, WM_KILLFOCUS, (WPARAM)hWnd, 0); } }

1 0

[tkreuzer] 53486: [KDBG] Don't enable int3 first chance handling by default. Should fix ntdll exception winetest. Found by Arty.
by tkreuzer＠svn.reactos.org 29 Aug '11

29 Aug '11

Author: tkreuzer Date: Mon Aug 29 00:15:29 2011 New Revision: 53486 URL: http://svn.reactos.org/svn/reactos?rev=53486&view=rev Log: [KDBG] Don't enable int3 first chance handling by default. Should fix ntdll exception winetest. Found by Arty. Modified: trunk/reactos/media/drivers/etc/KDBinit Modified: trunk/reactos/media/drivers/etc/KDBinit URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/drivers/etc/KDBinit?… ============================================================================== --- trunk/reactos/media/drivers/etc/KDBinit [iso-8859-1] (original) +++ trunk/reactos/media/drivers/etc/KDBinit [iso-8859-1] Mon Aug 29 00:15:29 2011 @@ -6,7 +6,7 @@ set syntax intel # Change the condition to enter KDB on INT3 to "always" (default is "kmode") -set condition INT3 first always +# set condition INT3 first always # This is a special command available only in the KDBinit file - it breaks into # KDB when it is interpreting the init file at startup.

1 0

[jgardou] 53485: [SYSSETUP] - fix WCHAR/TCHAR confusion
by jgardou＠svn.reactos.org 28 Aug '11

28 Aug '11

Author: jgardou Date: Sun Aug 28 22:39:50 2011 New Revision: 53485 URL: http://svn.reactos.org/svn/reactos?rev=53485&view=rev Log: [SYSSETUP] - fix WCHAR/TCHAR confusion Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sun Aug 28 22:39:50 2011 @@ -997,7 +997,7 @@ break; } - dwValueSize = 64 * sizeof(TCHAR); + dwValueSize = 64 * sizeof(WCHAR); if (RegQueryValueExW(hZoneKey, L"Display", NULL, @@ -1009,7 +1009,7 @@ break; } - dwValueSize = 32 * sizeof(TCHAR); + dwValueSize = 32 * sizeof(WCHAR); if (RegQueryValueExW(hZoneKey, L"Std", NULL, @@ -1147,7 +1147,7 @@ &hKey)) return FALSE; - dwValueSize = 9 * sizeof(TCHAR); + dwValueSize = 9 * sizeof(WCHAR); if (RegQueryValueExW(hKey, L"Default", NULL,

1 0

[akhaldi] 53484: [CMAKE] * Fix jom use with WDK builds.
by akhaldi＠svn.reactos.org 28 Aug '11

28 Aug '11

Author: akhaldi Date: Sun Aug 28 18:35:35 2011 New Revision: 53484 URL: http://svn.reactos.org/svn/reactos?rev=53484&view=rev Log: [CMAKE] * Fix jom use with WDK builds. Modified: trunk/reactos/cmake/Platform/Windows-cl.cmake Modified: trunk/reactos/cmake/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-cl.… ============================================================================== --- trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] Sun Aug 28 18:35:35 2011 @@ -213,8 +213,8 @@ #SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}") SET(CMAKE_BUILD_TYPE_INIT Debug) -SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/Zi /Ob0 /Od") -SET(CMAKE_C_FLAGS_DEBUG_INIT "/Zi /Ob0 /Od") +SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/Ob0 /Od") +SET(CMAKE_C_FLAGS_DEBUG_INIT "/Ob0 /Od") SET(CMAKE_CXX_FLAGS_INIT "") SET(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") SET(CMAKE_CXX_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") @@ -244,13 +244,13 @@ SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:YES") ENDIF() -IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) - SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept") - SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}") -ELSE (CMAKE_COMPILER_SUPPORTS_PDBTYPE) +#IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) +# SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept") +# SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}") +#ELSE (CMAKE_COMPILER_SUPPORTS_PDBTYPE) SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug") SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}") -ENDIF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) +#ENDIF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) # for release and minsize release default to no incremental linking SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT "/INCREMENTAL:NO") SET(CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT "/INCREMENTAL:NO")

1 0

[tfaber] 53483: [CMAKE] - Remove some hacks from ntdll and msvcrt build files - Bring msvcrt* files in better sync
by tfaber＠svn.reactos.org 28 Aug '11

28 Aug '11

Author: tfaber Date: Sun Aug 28 18:28:18 2011 New Revision: 53483 URL: http://svn.reactos.org/svn/reactos?rev=53483&view=rev Log: [CMAKE] - Remove some hacks from ntdll and msvcrt build files - Bring msvcrt* files in better sync Modified: trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/win32/msvcrt/CMakeLists.txt trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Sun Aug 28 18:28:18 2011 @@ -15,23 +15,23 @@ csr/capture.c csr/connect.c dbg/dbgui.c - ldr/ldrapi.c - ldr/ldrinit.c - ldr/ldrpe.c - ldr/ldrutils.c + ldr/ldrapi.c + ldr/ldrinit.c + ldr/ldrpe.c + ldr/ldrutils.c rtl/libsupp.c rtl/version.c def/ntdll.rc ${CMAKE_CURRENT_BINARY_DIR}/ntdll.def) - + if(ARCH MATCHES i386) -list(APPEND SOURCE dispatch/i386/dispatch.S) + list(APPEND SOURCE dispatch/i386/dispatch.S) elseif(ARCH MATCHES amd64) -list(APPEND SOURCE dispatch/amd64/stubs.c) + list(APPEND SOURCE dispatch/amd64/stubs.c) elseif(ARCH MATCHES arm) -list(APPEND SOURCE dispatch/arm/stubs_asm.s) + list(APPEND SOURCE dispatch/arm/stubs_asm.s) else() -list(APPEND SOURCE dispatch/dispatch.c) + list(APPEND SOURCE dispatch/dispatch.c) endif(ARCH MATCHES i386) add_library(ntdll SHARED ${SOURCE}) @@ -39,13 +39,11 @@ set_entrypoint(ntdll 0) if(MSVC) -target_link_libraries(ntdll rtl) -add_linkerflag(ntdll /RELEASE) -else() -target_link_libraries(ntdll -Wl,--whole-archive rtl -Wl,--no-whole-archive) + add_linkerflag(ntdll /RELEASE) endif() target_link_libraries(ntdll + rtl ntdllsys libcntpr ${PSEH_LIB}) Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Sun Aug 28 18:28:18 2011 @@ -23,20 +23,15 @@ add_library(msvcrt SHARED ${SOURCE}) -if(NOT MSVC) - set_target_properties(msvcrt PROPERTIES LINK_FLAGS "-u __seh_longjmp_unwind@4") -endif() - add_dependencies(msvcrt psdk) set_entrypoint(msvcrt DllMain 12) set_image_base(msvcrt ${baseaddress_msvcrt}) -target_link_libraries(msvcrt crt wine) +target_link_libraries(msvcrt crt wine ${PSEH_LIB}) if(MSVC) + # export of deleting destructor "name" add_linkerflag(msvcrt "/ignore:4102") -else() - target_link_libraries(msvcrt pseh) endif() add_importlibs(msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt [iso-8859-1] Sun Aug 28 18:28:18 2011 @@ -1,3 +1,5 @@ + +spec2def(msvcrt20.dll msvcrt20.spec) add_definitions( -DUSE_MSVCRT_PREFIX @@ -11,8 +13,6 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) -spec2def(msvcrt20.dll msvcrt20.spec) - list(APPEND SOURCE msvcrt20.c stubs.c @@ -20,17 +20,18 @@ ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def) add_library(msvcrt20 SHARED ${SOURCE}) + +add_dependencies(msvcrt20 psdk) set_entrypoint(msvcrt20 DllMain 12) set_image_base(msvcrt20 ${baseaddress_msvcrt20}) -target_link_libraries(msvcrt20 crt wine) +target_link_libraries(msvcrt20 crt wine ${PSEH_LIB}) if(MSVC) + # export of deleting destructor "name" add_linkerflag(msvcrt20 "/ignore:4102") -else() - target_link_libraries(msvcrt20 pseh) endif() add_importlibs(msvcrt20 kernel32 ntdll) -add_dependencies(msvcrt20 psdk) + add_cd_file(TARGET msvcrt20 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] Sun Aug 28 18:28:18 2011 @@ -1,3 +1,5 @@ + +spec2def(msvcrt40.dll msvcrt40.spec) add_definitions( -DUSE_MSVCRT_PREFIX @@ -11,8 +13,6 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) -spec2def(msvcrt40.dll msvcrt40.spec) - list(APPEND SOURCE msvcrt40.c stubs.c @@ -20,15 +20,16 @@ ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def) add_library(msvcrt40 SHARED ${SOURCE}) + +add_dependencies(msvcrt40 psdk) +set_entrypoint(msvcrt40 DllMain 12) set_image_base(msvcrt40 ${baseaddress_msvcrt40}) -set_entrypoint(msvcrt40 DllMain 12) -target_link_libraries(msvcrt40 crt wine) +target_link_libraries(msvcrt40 crt wine ${PSEH_LIB}) if(MSVC) + # export of deleting destructor "name" add_linkerflag(msvcrt40 "/ignore:4102") -else() - target_link_libraries(msvcrt40 pseh) endif() add_importlibs(msvcrt40 kernel32 ntdll)

1 0

[jgardou] 53482: [KERNEL32] - do not access memory that might have been freed
by jgardou＠svn.reactos.org 28 Aug '11

28 Aug '11

Author: jgardou Date: Sun Aug 28 17:30:25 2011 New Revision: 53482 URL: http://svn.reactos.org/svn/reactos?rev=53482&view=rev Log: [KERNEL32] - do not access memory that might have been freed Modified: trunk/reactos/dll/win32/kernel32/client/debugger.c Modified: trunk/reactos/dll/win32/kernel32/client/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/debugger.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/debugger.c [iso-8859-1] Sun Aug 28 17:30:25 2011 @@ -305,7 +305,8 @@ /* Loop all thread data events */ ThreadData = (PDBGSS_THREAD_DATA*)NtCurrentTeb()->DbgSsReserved; - for (ThisData = *ThreadData; ThisData; ThisData = ThisData->Next) + ThisData = *ThreadData; + while(ThisData) { /* Check if this one matches */ if ((ThisData->HandleMarked) && @@ -326,6 +327,7 @@ /* Move to the next one */ ThreadData = &ThisData->Next; } + ThisData = *ThreadData; } } @@ -338,7 +340,8 @@ /* Loop all thread data events */ ThreadData = (PDBGSS_THREAD_DATA*)NtCurrentTeb()->DbgSsReserved; - for (ThisData = *ThreadData; ThisData; ThisData = ThisData->Next) + ThisData = *ThreadData; + while(ThisData) { /* Check if this one matches */ if (ThisData->ProcessId == dwProcessId) @@ -358,6 +361,7 @@ /* Move to the next one */ ThreadData = &ThisData->Next; } + ThisData = *ThreadData; } }

1 0

[jgardou] 53481: [WIDL] - reenable -Oif flag, it's too good to be disabled With this commit, advapi32:service winetest suffers only 2 failures.
by jgardou＠svn.reactos.org 28 Aug '11

28 Aug '11

Author: jgardou Date: Sun Aug 28 15:37:01 2011 New Revision: 53481 URL: http://svn.reactos.org/svn/reactos?rev=53481&view=rev Log: [WIDL] - reenable -Oif flag, it's too good to be disabled With this commit, advapi32:service winetest suffers only 2 failures. Modified: trunk/reactos/cmake/idl-support.cmake trunk/reactos/tools/rbuild/backend/mingw/rules.mak Modified: trunk/reactos/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/idl-support.cmake?re… ============================================================================== --- trunk/reactos/cmake/idl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/idl-support.cmake [iso-8859-1] Sun Aug 28 15:37:01 2011 @@ -22,8 +22,8 @@ set(IDL_HEADER_ARG -h -o) #.h set(IDL_HEADER_ARG2 -h -H) #.h set(IDL_TYPELIB_ARG -t -o) #.tlb - set(IDL_SERVER_ARG -s -o) #.c for server library - set(IDL_CLIENT_ARG -c -o) #.c for stub client library + set(IDL_SERVER_ARG -Oif -s -o) #.c for server library + set(IDL_CLIENT_ARG -Oif -c -o) #.c for stub client library set(IDL_PROXY_ARG -p -o) set(IDL_INTERFACE_ARG -u -o) if(ARCH MATCHES i386) @@ -169,6 +169,6 @@ list(APPEND IID_SOURCES ${NAME}_i.c) endforeach() add_library(${TARGET} ${IID_SOURCES}) - add_dependencies(${TARGET} psdk) + add_dependencies(${TARGET} psdk) set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL TRUE) endfunction() Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Sun Aug 28 15:37:01 2011 @@ -264,7 +264,7 @@ ${call RBUILD_intermediate_path_noext,$(2)}_c: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} $$(ECHO_WIDL) - $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_c.h -c -C ${call RBUILD_intermediate_path_noext,$(2)}_c.c $(2) + $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -Oif -h -H ${call RBUILD_intermediate_path_noext,$(2)}_c.h -c -C ${call RBUILD_intermediate_path_noext,$(2)}_c.c $(2) $${checkpoint} $$@>$(NUL) ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,,${call RBUILD_intermediate_path_noext,$(2)}_c.o} @@ -280,7 +280,7 @@ ${call RBUILD_intermediate_path_noext,$(2)}_s: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} $$(ECHO_WIDL) - $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_s.h -s -S ${call RBUILD_intermediate_path_noext,$(2)}_s.c $(2) + $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -Oif -h -H ${call RBUILD_intermediate_path_noext,$(2)}_s.h -s -S ${call RBUILD_intermediate_path_noext,$(2)}_s.c $(2) $${checkpoint} $$@>$(NUL) ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_s.c,,,${call RBUILD_intermediate_path_noext,$(2)}_s.o}

1 0

[jgardou] 53480: [WIDL] - duplicate type entry for parameters with the range attribute. This fixes the problem that Eric Kohl detected. This has already been sent to wine.
by jgardou＠svn.reactos.org 28 Aug '11

28 Aug '11

Author: jgardou Date: Sun Aug 28 15:32:08 2011 New Revision: 53480 URL: http://svn.reactos.org/svn/reactos?rev=53480&view=rev Log: [WIDL] - duplicate type entry for parameters with the range attribute. This fixes the problem that Eric Kohl detected. This has already been sent to wine. Modified: trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.y Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… ============================================================================== --- trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] Sun Aug 28 15:32:08 2011 @@ -5965,6 +5965,10 @@ array_dims_t *arr = decl ? decl->array : NULL; type_t *func_type = decl ? decl->func_type : NULL; type_t *type = decl_spec->type; + + /* In case of a ranged type, duplicate it */ + if(is_attr(attrs, ATTR_RANGE)) + type = duptype(type, 1); if (is_attr(type->attrs, ATTR_INLINE)) { Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=53… ============================================================================== --- trunk/reactos/tools/widl/parser.y [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.y [iso-8859-1] Sun Aug 28 15:32:08 2011 @@ -1417,6 +1417,11 @@ array_dims_t *arr = decl ? decl->array : NULL; type_t *func_type = decl ? decl->func_type : NULL; type_t *type = decl_spec->type; + + /* In case of a range attribute, duplicate the type to keep track of + * the min/max values in the type format string */ + if(is_attr(attrs, ATTR_RANGE)) + type = duptype(type, 1); if (is_attr(type->attrs, ATTR_INLINE)) {

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