Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 50192: [CMAKE/NCI] Handle different versions of asm include files
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 16:28:57 2010 New Revision: 50192 URL: http://svn.reactos.org/svn/reactos?rev=50192&view=rev Log: [CMAKE/NCI] Handle different versions of asm include files Modified: branches/cmake-bringup/tools/nci/ncitool.c Modified: branches/cmake-bringup/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/nci/ncitool… ============================================================================== --- branches/cmake-bringup/tools/nci/ncitool.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/nci/ncitool.c [iso-8859-1] Tue Dec 28 16:28:57 2010 @@ -418,7 +418,7 @@ SyscallId++; } } - + #if defined(_MSC_VER) for (i= 0; i < UserFiles; i++) fprintf(UserModeFiles[i], "END\n"); fprintf(KernelModeFile, "END\n"); @@ -688,16 +688,27 @@ WriteFileHeader(Files[NtosUserStubs], "System Call Stubs for Native API", argv[NtosUserStubs + ArgOffset]); - fputs("#include <asm.inc>\n" - "#include <ks386.inc>\n" - ".code\n\n", Files[NtosUserStubs]); + fputs("#include <asm.inc>\n", Files[NtosUserStubs]); + if (strcmp(ncitool_data[arch_sel].arch, "i386") == 0) + fputs("#include <ks386.inc>\n", Files[NtosUserStubs]); + else if (strcmp(ncitool_data[arch_sel].arch, "amd64") == 0) + fputs("#include <ksamd64.inc>\n", Files[NtosUserStubs]); + else if (strcmp(ncitool_data[arch_sel].arch, "arm") == 0) + fputs("#include <ksarm.inc>\n", Files[NtosUserStubs]); + fputs(".code\n\n", Files[NtosUserStubs]); WriteFileHeader(Files[NtosKernelStubs], "System Call Stubs for Native API", argv[NtosKernelStubs + ArgOffset]); - fputs("#include <asm.inc>\n" - "#include <ks386.inc>\n" - ".code\n" + + fputs("#include <asm.inc>\n", Files[NtosKernelStubs]); + if (strcmp(ncitool_data[arch_sel].arch, "i386") == 0) + fputs("#include <ks386.inc>\n", Files[NtosKernelStubs]); + else if (strcmp(ncitool_data[arch_sel].arch, "amd64") == 0) + fputs("#include <ksamd64.inc>\n", Files[NtosKernelStubs]); + else if (strcmp(ncitool_data[arch_sel].arch, "arm") == 0) + fputs("#include <ksarm.inc>\n", Files[NtosKernelStubs]); + fputs(".code\n" "EXTERN _KiSystemService:PROC\n\n", Files[NtosKernelStubs]); WriteFileHeader(Files[Win32kStubs],

1 0

[tkreuzer] 50191: [NTOSKRNL] - Use SLIST_ENTRY instead of SINGLE_LIST_ENTRY for interlocked operations - Remove unused variable
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 16:03:46 2010 New Revision: 50191 URL: http://svn.reactos.org/svn/reactos?rev=50191&view=rev Log: [NTOSKRNL] - Use SLIST_ENTRY instead of SINGLE_LIST_ENTRY for interlocked operations - Remove unused variable Modified: branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h branches/cmake-bringup/ntoskrnl/include/internal/ob_x.h Modified: branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Tue Dec 28 16:03:46 2010 @@ -157,8 +157,6 @@ MI_MAKE_PROTOTYPE_PTE(IN PMMPTE NewPte, IN PMMPTE PointerPte) { - ULONG_PTR Offset; - /* Store the Address */ NewPte->u.Long = (ULONG64)PointerPte; Modified: branches/cmake-bringup/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/include/internal/ob_x.h [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/include/internal/ob_x.h [iso-8859-1] Tue Dec 28 16:03:46 2010 @@ -358,14 +358,14 @@ { /* The free was within the Depth */ InterlockedPushEntrySList(&List->L.ListHead, - (PSINGLE_LIST_ENTRY)Buffer); + (PSLIST_ENTRY)Buffer); } } else { /* The free was within the Depth */ InterlockedPushEntrySList(&List->L.ListHead, - (PSINGLE_LIST_ENTRY)Buffer); + (PSLIST_ENTRY)Buffer); } }

1 0

[pschweitzer] 50190: [NTOSKRNL] Apply consistent formatting to CcMapData
by pschweitzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: pschweitzer Date: Tue Dec 28 14:49:53 2010 New Revision: 50190 URL: http://svn.reactos.org/svn/reactos?rev=50190&view=rev Log: [NTOSKRNL] Apply consistent formatting to CcMapData 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=5019… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Tue Dec 28 14:49:53 2010 @@ -22,84 +22,84 @@ /* * @implemented */ -BOOLEAN NTAPI -CcMapData (IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG Flags, - OUT PVOID *pBcb, - OUT PVOID *pBuffer) -{ - ULONG ReadOffset; - BOOLEAN Valid; - PBCB Bcb; - PCACHE_SEGMENT CacheSeg; - NTSTATUS Status; - PINTERNAL_BCB iBcb; - ULONG ROffset; - - DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %d, Flags %d," - " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, - Length, Flags, pBcb, pBuffer); - - ReadOffset = (ULONG)FileOffset->QuadPart; - - ASSERT(FileObject); - ASSERT(FileObject->SectionObjectPointer); - ASSERT(FileObject->SectionObjectPointer->SharedCacheMap); - - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - ASSERT(Bcb); - - DPRINT("AllocationSize %I64x, FileSize %I64x\n", - Bcb->AllocationSize.QuadPart, - Bcb->FileSize.QuadPart); - - if (ReadOffset % Bcb->CacheSegmentSize + Length > Bcb->CacheSegmentSize) - { - return(FALSE); - } - ROffset = ROUND_DOWN (ReadOffset, Bcb->CacheSegmentSize); - Status = CcRosRequestCacheSegment(Bcb, - ROffset, - pBuffer, - &Valid, - &CacheSeg); - if (!NT_SUCCESS(Status)) - { - return(FALSE); - } - if (!Valid) - { - if (!(Flags & MAP_WAIT)) - { - CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); - return(FALSE); - } - if (!NT_SUCCESS(ReadCacheSegment(CacheSeg))) - { - CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); - return(FALSE); - } - } - - *pBuffer = (PVOID)((ULONG_PTR)(*pBuffer) + (ReadOffset % Bcb->CacheSegmentSize)); - iBcb = ExAllocateFromNPagedLookasideList(&iBcbLookasideList); - if (iBcb == NULL) - { - CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); - return FALSE; - } - memset(iBcb, 0, sizeof(INTERNAL_BCB)); - iBcb->PFCB.NodeTypeCode = 0xDE45; /* Undocumented (CAPTIVE_PUBLIC_BCB_NODETYPECODE) */ - iBcb->PFCB.NodeByteSize = sizeof(PUBLIC_BCB); - iBcb->PFCB.MappedLength = Length; - iBcb->PFCB.MappedFileOffset = *FileOffset; - iBcb->CacheSegment = CacheSeg; - iBcb->Dirty = FALSE; - iBcb->RefCount = 1; - *pBcb = (PVOID)iBcb; - return(TRUE); +BOOLEAN +NTAPI +CcMapData( + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG Flags, + OUT PVOID *pBcb, + OUT PVOID *pBuffer) +{ + ULONG ReadOffset; + BOOLEAN Valid; + PBCB Bcb; + PCACHE_SEGMENT CacheSeg; + NTSTATUS Status; + PINTERNAL_BCB iBcb; + ULONG ROffset; + + DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %d, Flags %d," + " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, + Length, Flags, pBcb, pBuffer); + + ReadOffset = (ULONG)FileOffset->QuadPart; + + ASSERT(FileObject); + ASSERT(FileObject->SectionObjectPointer); + ASSERT(FileObject->SectionObjectPointer->SharedCacheMap); + + Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + ASSERT(Bcb); + + DPRINT("AllocationSize %I64x, FileSize %I64x\n", + Bcb->AllocationSize.QuadPart, + Bcb->FileSize.QuadPart); + + if (ReadOffset % Bcb->CacheSegmentSize + Length > Bcb->CacheSegmentSize) + { + return FALSE; + } + ROffset = ROUND_DOWN (ReadOffset, Bcb->CacheSegmentSize); + Status = CcRosRequestCacheSegment(Bcb, ROffset, + pBuffer, &Valid, + &CacheSeg); + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + if (!Valid) + { + if (!(Flags & MAP_WAIT)) + { + CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); + return FALSE; + } + if (!NT_SUCCESS(ReadCacheSegment(CacheSeg))) + { + CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); + return FALSE; + } + } + + *pBuffer = (PVOID)((ULONG_PTR)(*pBuffer) + (ReadOffset % Bcb->CacheSegmentSize)); + iBcb = ExAllocateFromNPagedLookasideList(&iBcbLookasideList); + if (iBcb == NULL) + { + CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); + return FALSE; + } + memset(iBcb, 0, sizeof(INTERNAL_BCB)); + iBcb->PFCB.NodeTypeCode = 0xDE45; /* Undocumented (CAPTIVE_PUBLIC_BCB_NODETYPECODE) */ + iBcb->PFCB.NodeByteSize = sizeof(PUBLIC_BCB); + iBcb->PFCB.MappedLength = Length; + iBcb->PFCB.MappedFileOffset = *FileOffset; + iBcb->CacheSegment = CacheSeg; + iBcb->Dirty = FALSE; + iBcb->RefCount = 1; + *pBcb = (PVOID)iBcb; + return TRUE; } /*

1 0

[tkreuzer] 50189: [CMAKE] Fix stdcall entry points for x86
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 12:42:05 2010 New Revision: 50189 URL: http://svn.reactos.org/svn/reactos?rev=50189&view=rev Log: [CMAKE] Fix stdcall entry points for x86 Modified: branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=501… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Tue Dec 28 12:42:05 2010 @@ -105,10 +105,11 @@ if(${ENTRYPOINT} STREQUAL "0") add_linkerflag(${MODULE} "-Wl,-entry,0") elseif(ARCH MATCHES i386) + set(_entrysymbol _${ENTRYPOINT}) if (${ARGC} GREATER 2) - set(ENTRYPOINT ${ENTRYPOINT}@${ARGV2}) - endif() - add_linkerflag(${MODULE} "-Wl,-entry,_${ENTRYPOINT}") + set(_entrysymbol ${_entrysymbol}@${ARGV2}) + endif() + add_linkerflag(${MODULE} "-Wl,-entry,${_entrysymbol}") else() add_linkerflag(${MODULE} "-Wl,-entry,${ENTRYPOINT}") endif()

1 0

[tkreuzer] 50188: [CMAKE] - Fix set_entrypoint for other architectures than x86, add an optional 3rd parameter for stdcall stackbytes - don't add stdcall decoration to def files for other architect...
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 12:14:13 2010 New Revision: 50188 URL: http://svn.reactos.org/svn/reactos?rev=50188&view=rev Log: [CMAKE] - Fix set_entrypoint for other architectures than x86, add an optional 3rd parameter for stdcall stackbytes - don't add stdcall decoration to def files for other architectures then x86 Modified: branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=501… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Tue Dec 28 12:14:13 2010 @@ -45,6 +45,13 @@ add_definitions(-U_X86_ -UWIN32) endif() +# alternative arch name +if(ARCH MATCHES amd64) + set(ARCH2 x86_64) +else() + set(ARCH2 ${ARCH}) +endif() + # Macros macro(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename) # Add the precompiled header to the build @@ -56,7 +63,7 @@ get_directory_property(DIRINC INCLUDE_DIRECTORIES) foreach(item ${DIRINC}) list(APPEND ${_out_compile_flags} -I${item}) - endforeach() + endforeach() # This is a particular bit of undocumented/hacky magic I'm quite proud of get_directory_property(_compiler_flags DEFINITIONS) @@ -70,7 +77,7 @@ list(APPEND ${_out_compile_flags} -D${item}) endforeach() endif() -endmacro() +endmacro() macro(add_pch _target_name _header_filename _src_list) get_filename_component(FILE ${_header_filename} NAME) @@ -93,11 +100,17 @@ set_target_properties(${MODULE} PROPERTIES LINK_FLAGS ${NEW_LINKER_FLAGS}) endmacro() +# Optional 3rd parameter: stdcall stack bytes macro(set_entrypoint MODULE ENTRYPOINT) if(${ENTRYPOINT} STREQUAL "0") add_linkerflag(${MODULE} "-Wl,-entry,0") - else() + elseif(ARCH MATCHES i386) + if (${ARGC} GREATER 2) + set(ENTRYPOINT ${ENTRYPOINT}@${ARGV2}) + endif() add_linkerflag(${MODULE} "-Wl,-entry,_${ENTRYPOINT}") + else() + add_linkerflag(${MODULE} "-Wl,-entry,${ENTRYPOINT}") endif() endmacro() @@ -118,7 +131,7 @@ if(${TYPE} MATCHES nativecui) set_subsystem(${MODULE} native) - set_entrypoint(${MODULE} NtProcessStartup@4) + set_entrypoint(${MODULE} NtProcessStartup 4) elseif(${TYPE} MATCHES win32gui) set_subsystem(${MODULE} windows) set_entrypoint(${MODULE} WinMainCRTStartup) @@ -138,7 +151,7 @@ endif(NOT IS_UNICODE) target_link_libraries(${MODULE} mingw_common) elseif(${TYPE} MATCHES win32dll) - set_entrypoint(${MODULE} DllMainCRTStartup@12) + set_entrypoint(${MODULE} DllMainCRTStartup 12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) if(DEFINED baseaddress_${MODULE}) set_image_base(${MODULE} ${baseaddress_${MODULE}}) @@ -146,16 +159,16 @@ message(STATUS "${MODULE} has no base address") endif() elseif(${TYPE} MATCHES win32ocx) - set_entrypoint(${MODULE} DllMainCRTStartup@12) + set_entrypoint(${MODULE} DllMainCRTStartup 12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") elseif(${TYPE} MATCHES cpl) - set_entrypoint(${MODULE} DllMainCRTStartup@12) + set_entrypoint(${MODULE} DllMainCRTStartup 12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") elseif(${TYPE} MATCHES kernelmodedriver) set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000" SUFFIX ".sys") - set_entrypoint(${MODULE} DriverEntry@8) + set_entrypoint(${MODULE} DriverEntry 8) set_subsystem(${MODULE} native) set_image_base(${MODULE} 0x00010000) add_dependencies(${MODULE} bugcodes) @@ -221,13 +234,17 @@ else() set(DLLNAME_OPTION "") endif() - + + if(NOT ARCH MATCHES i386) + set(DECO_OPTION "-@") + endif() + add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a - COMMAND native-spec2def ${DLLNAME_OPTION} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} + COMMAND native-spec2def ${DLLNAME_OPTION} ${DECO_OPTION} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) - + elseif(${_extension} STREQUAL ".def") add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a @@ -236,7 +253,7 @@ else() message(FATAL_ERROR "Unsupported exports file extension: ${_extension}") endif() - + add_custom_target( lib${_name} DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a) @@ -247,7 +264,7 @@ get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c - COMMAND native-spec2def -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def -n=${_dllname} ${DECO_OPTION} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)

1 0

[akhaldi] 50187: [CMAKE] - Actually the ARCH initialization is needed in both places.
by akhaldi＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: akhaldi Date: Tue Dec 28 12:00:49 2010 New Revision: 50187 URL: http://svn.reactos.org/svn/reactos?rev=50187&view=rev Log: [CMAKE] - Actually the ARCH initialization is needed in both places. Modified: branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Tue Dec 28 12:00:49 2010 @@ -1,3 +1,7 @@ + +if(NOT ARCH) + set(ARCH i386) +endif() # Choose the right MinGW prefix if(ARCH MATCHES i386)

1 0

[akhaldi] 50186: [CMAKE] - Move the ARCH initialization to the main cmake file instead of the toolchain file.
by akhaldi＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: akhaldi Date: Tue Dec 28 11:50:56 2010 New Revision: 50186 URL: http://svn.reactos.org/svn/reactos?rev=50186&view=rev Log: [CMAKE] - Move the ARCH initialization to the main cmake file instead of the toolchain file. Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Tue Dec 28 11:50:56 2010 @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 2.8) project(REACTOS) + +if(NOT ARCH) + set(ARCH i386) +endif() # Compile options if(ARCH MATCHES i386) Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Tue Dec 28 11:50:56 2010 @@ -1,7 +1,3 @@ - -if(NOT ARCH) - set(ARCH i386) -endif() # Choose the right MinGW prefix if(ARCH MATCHES i386)

1 0

[jimtabor] 50185: [Win32k] - Fix all the user32 wine win test_CreateWindow tests.
by jimtabor＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: jimtabor Date: Tue Dec 28 10:38:38 2010 New Revision: 50185 URL: http://svn.reactos.org/svn/reactos?rev=50185&view=rev Log: [Win32k] - Fix all the user32 wine win test_CreateWindow tests. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Dec 28 10:38:38 2010 @@ -437,8 +437,9 @@ TIMER_RemoveWindowTimers(Window->head.h); #endif - if (!(Window->style & WS_CHILD) && Window->IDMenu - && (Menu = UserGetMenuObject((HMENU)Window->IDMenu))) + if ( ((Window->style & (WS_CHILD|WS_POPUP)) != WS_CHILD) && + Window->IDMenu && + (Menu = UserGetMenuObject((HMENU)Window->IDMenu))) { IntDestroyMenuObject(Menu, TRUE, TRUE); Window->IDMenu = 0;

1 0

[tkreuzer] 50184: [SPEC2DEF] Fix architecture option
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 10:09:07 2010 New Revision: 50184 URL: http://svn.reactos.org/svn/reactos?rev=50184&view=rev Log: [SPEC2DEF] Fix architecture option Modified: branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Tue Dec 28 10:09:07 2010 @@ -680,7 +680,7 @@ { no_redirections = 1; } - else if (argv[i][1] == 'a' && argv[i][1] == '=') + else if (argv[i][1] == 'a' && argv[i][2] == '=') { pszArchString = argv[i] + 3; }

1 0

[jimtabor] 50183: [User32] - Fix all the user32 wine win test_parent_owner tests.
by jimtabor＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: jimtabor Date: Tue Dec 28 10:03:07 2010 New Revision: 50183 URL: http://svn.reactos.org/svn/reactos?rev=50183&view=rev Log: [User32] - Fix all the user32 wine win test_parent_owner tests. Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Tue Dec 28 10:03:07 2010 @@ -651,6 +651,14 @@ if (pHwnd) HeapFree(hHeap, 0, pHwnd); return FALSE; + } + + if (!dwCount) + { + if (!dwThreadId) + return FALSE; + else + return TRUE; } /* call the user's callback function until we're done or

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