Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[hbelusca] 64792: [NTVDM] - Use a helper function for copying little chunks of memory (1, 2, 4 and 8 bytes) because a profiling of ntvdm showed that especially 1 and 2 bytes of memory were read the...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Oct 17 22:08:51 2014 New Revision: 64792 URL: http://svn.reactos.org/svn/reactos?rev=64792&view=rev Log: [NTVDM] - Use a helper function for copying little chunks of memory (1, 2, 4 and 8 bytes) because a profiling of ntvdm showed that especially 1 and 2 bytes of memory were read the most, and calling RtlCopy/MoveMemory for intensively copying 1 or 2 bytes was shown to be inefficient. We also don't use directly intrinsics/builtins because the compiler cannot know in advance the size of the memory to be copied, it cannot perform the required optimizations. It was checked that using the builtin-memcpy or memmove of GCC when compiling the program in release+full optimization mode just embedded a call to _memcpy, and naively using the movsX intrinsics of MSVC does not do the job of "moving" memory taking into account for the possible overlaps. Therefore, for small sizes (<= 8 bytes), we use copy assignments, whereas for large sizes (and for 3, 5, 7, 9+ bytes) we use the regular method of calling RtlMoveMemory. We gain ~=10% speed with this optimization. - Also I use >> and & for dividing by 4 and 2 instead of the regular / and % operations because they are not optimized otherwise by default by MSVC (they are however, if you explicitely enable optimizations). Modified: trunk/reactos/subsystems/ntvdm/emulator.c trunk/reactos/subsystems/ntvdm/io.c Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Fri Oct 17 22:08:51 2014 @@ -60,6 +60,75 @@ /* PRIVATE FUNCTIONS **********************************************************/ +static inline VOID +EmulatorMoveMemory(OUT VOID UNALIGNED *Destination, + IN const VOID UNALIGNED *Source, + IN SIZE_T Length) +{ +#if 1 + /* + * We use a switch here to detect small moves of memory, as these + * constitute the bulk of our moves. + * Using RtlMoveMemory for all these small moves would be slow otherwise. + */ + switch (Length) + { + case 0: + return; + + case sizeof(UCHAR): + *(PUCHAR)Destination = *(PUCHAR)Source; + return; + + case sizeof(USHORT): + *(PUSHORT)Destination = *(PUSHORT)Source; + return; + + case sizeof(ULONG): + *(PULONG)Destination = *(PULONG)Source; + return; + + case sizeof(ULONGLONG): + *(PULONGLONG)Destination = *(PULONGLONG)Source; + return; + + default: +#if defined(__GNUC__) + __builtin_memmove(Destination, Source, Length); +#else + RtlMoveMemory(Destination, Source, Length); +#endif + } + +#else // defined(_MSC_VER) + + PUCHAR Dest = (PUCHAR)Destination; + PUCHAR Src = (PUCHAR)Source; + + SIZE_T Count, NewSize = Length; + + /* Move dword */ + Count = NewSize >> 2; // NewSize / sizeof(ULONG); + NewSize = NewSize & 3; // NewSize % sizeof(ULONG); + __movsd(Dest, Src, Count); + Dest += Count << 2; // Count * sizeof(ULONG); + Src += Count << 2; + + /* Move word */ + Count = NewSize >> 1; // NewSize / sizeof(USHORT); + NewSize = NewSize & 1; // NewSize % sizeof(USHORT); + __movsw(Dest, Src, Count); + Dest += Count << 1; // Count * sizeof(USHORT); + Src += Count << 1; + + /* Move byte */ + Count = NewSize; // NewSize / sizeof(UCHAR); + // NewSize = NewSize; // NewSize % sizeof(UCHAR); + __movsb(Dest, Src, Count); + +#endif +} + VOID WINAPI EmulatorReadMemory(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) { UNREFERENCED_PARAMETER(State); @@ -91,7 +160,7 @@ } /* Read the data from the virtual address space and store it in the buffer */ - RtlCopyMemory(Buffer, REAL_TO_PHYS(Address), Size); + EmulatorMoveMemory(Buffer, REAL_TO_PHYS(Address), Size); } VOID WINAPI EmulatorWriteMemory(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) @@ -112,7 +181,7 @@ if ((Address + Size) >= ROM_AREA_START && (Address < ROM_AREA_END)) return; /* Read the data from the buffer and store it in the virtual address space */ - RtlCopyMemory(REAL_TO_PHYS(Address), Buffer, Size); + EmulatorMoveMemory(REAL_TO_PHYS(Address), Buffer, Size); /* * Check if we modified the VGA memory. Modified: trunk/reactos/subsystems/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/io.c?rev=… ============================================================================== --- trunk/reactos/subsystems/ntvdm/io.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/io.c [iso-8859-1] Fri Oct 17 22:08:51 2014 @@ -100,8 +100,7 @@ } else { - while (Count--) - *Buffer++ = IOReadB(Port); + while (Count--) *Buffer++ = IOReadB(Port); } } @@ -196,8 +195,7 @@ } else { - while (Count--) - *Buffer++ = IOReadW(Port); + while (Count--) *Buffer++ = IOReadW(Port); } } @@ -278,8 +276,7 @@ } else { - while (Count--) - *Buffer++ = IOReadD(Port); + while (Count--) *Buffer++ = IOReadD(Port); } } @@ -379,7 +376,7 @@ } else { - PBYTE Address = (PBYTE)Buffer; + PUCHAR Address = (PUCHAR)Buffer; while (DataCount--) { @@ -388,8 +385,8 @@ UCHAR NewDataSize = DataSize; /* Read dword */ - Count = NewDataSize / sizeof(ULONG); - NewDataSize = NewDataSize % sizeof(ULONG); + Count = NewDataSize >> 2; // NewDataSize / sizeof(ULONG); + NewDataSize = NewDataSize & 3; // NewDataSize % sizeof(ULONG); while (Count--) { *(PULONG)Address = IOReadD(CurrentPort); @@ -398,8 +395,8 @@ } /* Read word */ - Count = NewDataSize / sizeof(USHORT); - NewDataSize = NewDataSize % sizeof(USHORT); + Count = NewDataSize >> 1; // NewDataSize / sizeof(USHORT); + NewDataSize = NewDataSize & 1; // NewDataSize % sizeof(USHORT); while (Count--) { *(PUSHORT)Address = IOReadW(CurrentPort); @@ -408,17 +405,14 @@ } /* Read byte */ - Count = NewDataSize / sizeof(UCHAR); - NewDataSize = NewDataSize % sizeof(UCHAR); + Count = NewDataSize; // NewDataSize / sizeof(UCHAR); + // NewDataSize = NewDataSize % sizeof(UCHAR); while (Count--) { *(PUCHAR)Address = IOReadB(CurrentPort); CurrentPort += sizeof(UCHAR); Address += sizeof(UCHAR); } - - ASSERT(Count == 0); - ASSERT(NewDataSize == 0); } } } @@ -457,7 +451,7 @@ } else { - PBYTE Address = (PBYTE)Buffer; + PUCHAR Address = (PUCHAR)Buffer; while (DataCount--) { @@ -466,8 +460,8 @@ UCHAR NewDataSize = DataSize; /* Write dword */ - Count = NewDataSize / sizeof(ULONG); - NewDataSize = NewDataSize % sizeof(ULONG); + Count = NewDataSize >> 2; // NewDataSize / sizeof(ULONG); + NewDataSize = NewDataSize & 3; // NewDataSize % sizeof(ULONG); while (Count--) { IOWriteD(CurrentPort, *(PULONG)Address); @@ -476,8 +470,8 @@ } /* Write word */ - Count = NewDataSize / sizeof(USHORT); - NewDataSize = NewDataSize % sizeof(USHORT); + Count = NewDataSize >> 1; // NewDataSize / sizeof(USHORT); + NewDataSize = NewDataSize & 1; // NewDataSize % sizeof(USHORT); while (Count--) { IOWriteW(CurrentPort, *(PUSHORT)Address); @@ -486,17 +480,14 @@ } /* Write byte */ - Count = NewDataSize / sizeof(UCHAR); - NewDataSize = NewDataSize % sizeof(UCHAR); + Count = NewDataSize; // NewDataSize / sizeof(UCHAR); + // NewDataSize = NewDataSize % sizeof(UCHAR); while (Count--) { IOWriteB(CurrentPort, *(PUCHAR)Address); CurrentPort += sizeof(UCHAR); Address += sizeof(UCHAR); } - - ASSERT(Count == 0); - ASSERT(NewDataSize == 0); } } }

9 years, 11 months

[akhaldi] 64791: [CMAKE/KEYBOARD] * Improve the way we handle keyboard layouts.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 17 20:41:58 2014 New Revision: 64791 URL: http://svn.reactos.org/svn/reactos?rev=64791&view=rev Log: [CMAKE/KEYBOARD] * Improve the way we handle keyboard layouts. Removed: trunk/reactos/dll/keyboard/kbda1/CMakeLists.txt trunk/reactos/dll/keyboard/kbda2/CMakeLists.txt trunk/reactos/dll/keyboard/kbda3/CMakeLists.txt trunk/reactos/dll/keyboard/kbdal/CMakeLists.txt trunk/reactos/dll/keyboard/kbdarme/CMakeLists.txt trunk/reactos/dll/keyboard/kbdarmw/CMakeLists.txt trunk/reactos/dll/keyboard/kbdaze/CMakeLists.txt trunk/reactos/dll/keyboard/kbdazel/CMakeLists.txt trunk/reactos/dll/keyboard/kbdbe/CMakeLists.txt trunk/reactos/dll/keyboard/kbdbga/CMakeLists.txt trunk/reactos/dll/keyboard/kbdbgm/CMakeLists.txt trunk/reactos/dll/keyboard/kbdbgt/CMakeLists.txt trunk/reactos/dll/keyboard/kbdblr/CMakeLists.txt trunk/reactos/dll/keyboard/kbdbr/CMakeLists.txt trunk/reactos/dll/keyboard/kbdbur/CMakeLists.txt trunk/reactos/dll/keyboard/kbdcan/CMakeLists.txt trunk/reactos/dll/keyboard/kbdcr/CMakeLists.txt trunk/reactos/dll/keyboard/kbdcz/CMakeLists.txt trunk/reactos/dll/keyboard/kbdcz1/CMakeLists.txt trunk/reactos/dll/keyboard/kbdda/CMakeLists.txt trunk/reactos/dll/keyboard/kbddv/CMakeLists.txt trunk/reactos/dll/keyboard/kbdes/CMakeLists.txt trunk/reactos/dll/keyboard/kbdest/CMakeLists.txt trunk/reactos/dll/keyboard/kbdfc/CMakeLists.txt trunk/reactos/dll/keyboard/kbdfi/CMakeLists.txt trunk/reactos/dll/keyboard/kbdfr/CMakeLists.txt trunk/reactos/dll/keyboard/kbdgeo/CMakeLists.txt trunk/reactos/dll/keyboard/kbdgerg/CMakeLists.txt trunk/reactos/dll/keyboard/kbdgneo/CMakeLists.txt trunk/reactos/dll/keyboard/kbdgr/CMakeLists.txt trunk/reactos/dll/keyboard/kbdgrist/CMakeLists.txt trunk/reactos/dll/keyboard/kbdhe/CMakeLists.txt trunk/reactos/dll/keyboard/kbdheb/CMakeLists.txt trunk/reactos/dll/keyboard/kbdhu/CMakeLists.txt trunk/reactos/dll/keyboard/kbdic/CMakeLists.txt trunk/reactos/dll/keyboard/kbdinasa/CMakeLists.txt trunk/reactos/dll/keyboard/kbdinben/CMakeLists.txt trunk/reactos/dll/keyboard/kbdindev/CMakeLists.txt trunk/reactos/dll/keyboard/kbdinguj/CMakeLists.txt trunk/reactos/dll/keyboard/kbdinmal/CMakeLists.txt trunk/reactos/dll/keyboard/kbdir/CMakeLists.txt trunk/reactos/dll/keyboard/kbdit/CMakeLists.txt trunk/reactos/dll/keyboard/kbdja/CMakeLists.txt trunk/reactos/dll/keyboard/kbdkaz/CMakeLists.txt trunk/reactos/dll/keyboard/kbdko/CMakeLists.txt trunk/reactos/dll/keyboard/kbdla/CMakeLists.txt trunk/reactos/dll/keyboard/kbdlt1/CMakeLists.txt trunk/reactos/dll/keyboard/kbdlv/CMakeLists.txt trunk/reactos/dll/keyboard/kbdmac/CMakeLists.txt trunk/reactos/dll/keyboard/kbdne/CMakeLists.txt trunk/reactos/dll/keyboard/kbdno/CMakeLists.txt trunk/reactos/dll/keyboard/kbdpl/CMakeLists.txt trunk/reactos/dll/keyboard/kbdpl1/CMakeLists.txt trunk/reactos/dll/keyboard/kbdpo/CMakeLists.txt trunk/reactos/dll/keyboard/kbdro/CMakeLists.txt trunk/reactos/dll/keyboard/kbdru/CMakeLists.txt trunk/reactos/dll/keyboard/kbdru1/CMakeLists.txt trunk/reactos/dll/keyboard/kbdsg/CMakeLists.txt trunk/reactos/dll/keyboard/kbdsk/CMakeLists.txt trunk/reactos/dll/keyboard/kbdsk1/CMakeLists.txt trunk/reactos/dll/keyboard/kbdsw/CMakeLists.txt trunk/reactos/dll/keyboard/kbdtat/CMakeLists.txt trunk/reactos/dll/keyboard/kbdth0/CMakeLists.txt trunk/reactos/dll/keyboard/kbdth1/CMakeLists.txt trunk/reactos/dll/keyboard/kbdth2/CMakeLists.txt trunk/reactos/dll/keyboard/kbdth3/CMakeLists.txt trunk/reactos/dll/keyboard/kbdtuf/CMakeLists.txt trunk/reactos/dll/keyboard/kbdtuq/CMakeLists.txt trunk/reactos/dll/keyboard/kbduk/CMakeLists.txt trunk/reactos/dll/keyboard/kbdur/CMakeLists.txt trunk/reactos/dll/keyboard/kbdurs/CMakeLists.txt trunk/reactos/dll/keyboard/kbdus/CMakeLists.txt trunk/reactos/dll/keyboard/kbdusa/CMakeLists.txt trunk/reactos/dll/keyboard/kbdusl/CMakeLists.txt trunk/reactos/dll/keyboard/kbdusr/CMakeLists.txt trunk/reactos/dll/keyboard/kbdusx/CMakeLists.txt trunk/reactos/dll/keyboard/kbduzb/CMakeLists.txt trunk/reactos/dll/keyboard/kbdvntc/CMakeLists.txt trunk/reactos/dll/keyboard/kbdycc/CMakeLists.txt trunk/reactos/dll/keyboard/kbdycl/CMakeLists.txt Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/dll/keyboard/CMakeLists.txt Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Fri Oct 17 20:41:58 2014 @@ -533,17 +533,6 @@ set(__subsystem console) elseif(${TYPE} STREQUAL win32gui) set(__subsystem windows) - elseif(${TYPE} STREQUAL kbdlayout) - set_entrypoint(${MODULE} 0) - set_image_base(${MODULE} 0x5FFF0000) - set_subsystem(${MODULE} native) - if (MSVC) - # Merge the .text and .rdata section into the .data section - add_target_link_flags(${MODULE} "/ignore:4254 /SECTION:.data,ER /MERGE:.text=.data /MERGE:.rdata=.data /MERGE:.bss=.data /MERGE:.edata=.data") - else() - # Use a custom linker script - add_target_link_flags(${MODULE} "-Wl,-T,${CMAKE_SOURCE_DIR}/kbdlayout.lds") - endif() elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx) OR (${TYPE} STREQUAL cpl) OR (${TYPE} STREQUAL module))) message(FATAL_ERROR "Unknown type ${TYPE} for module ${MODULE}") Modified: trunk/reactos/dll/keyboard/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/keyboard/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/CMakeLists.txt [iso-8859-1] Fri Oct 17 20:41:58 2014 @@ -1,81 +1,107 @@ -add_subdirectory(kbda1) -add_subdirectory(kbda2) -add_subdirectory(kbda3) -add_subdirectory(kbdal) -add_subdirectory(kbdarme) -add_subdirectory(kbdarmw) -add_subdirectory(kbdaze) -add_subdirectory(kbdazel) -add_subdirectory(kbdbe) -add_subdirectory(kbdbga) -add_subdirectory(kbdbgm) -add_subdirectory(kbdbgt) -add_subdirectory(kbdblr) -add_subdirectory(kbdbr) -add_subdirectory(kbdbur) -add_subdirectory(kbdcan) -add_subdirectory(kbdcr) -add_subdirectory(kbdcz) -add_subdirectory(kbdcz1) -add_subdirectory(kbdda) -add_subdirectory(kbddv) -add_subdirectory(kbdes) -add_subdirectory(kbdest) -add_subdirectory(kbdfc) -add_subdirectory(kbdfi) -add_subdirectory(kbdfr) -add_subdirectory(kbdgeo) -add_subdirectory(kbdgerg) -add_subdirectory(kbdgneo) -add_subdirectory(kbdgr) -add_subdirectory(kbdgrist) -add_subdirectory(kbdhe) -add_subdirectory(kbdheb) -add_subdirectory(kbdhu) -add_subdirectory(kbdic) -add_subdirectory(kbdinasa) -add_subdirectory(kbdinben) -add_subdirectory(kbdindev) -add_subdirectory(kbdinguj) -add_subdirectory(kbdinmal) -add_subdirectory(kbdir) -add_subdirectory(kbdit) -add_subdirectory(kbdja) -add_subdirectory(kbdkaz) -add_subdirectory(kbdko) -add_subdirectory(kbdla) -add_subdirectory(kbdlt1) -add_subdirectory(kbdlv) -add_subdirectory(kbdmac) -add_subdirectory(kbdne) -add_subdirectory(kbdno) -add_subdirectory(kbdpl) -add_subdirectory(kbdpl1) -add_subdirectory(kbdpo) -add_subdirectory(kbdro) -add_subdirectory(kbdru) -add_subdirectory(kbdru1) -add_subdirectory(kbdsg) -add_subdirectory(kbdsk) -add_subdirectory(kbdsk1) -add_subdirectory(kbdsw) -add_subdirectory(kbdtat) -add_subdirectory(kbdth0) -add_subdirectory(kbdth1) -add_subdirectory(kbdth2) -add_subdirectory(kbdth3) -add_subdirectory(kbdtuf) -add_subdirectory(kbdtuq) -add_subdirectory(kbduk) -add_subdirectory(kbdur) -add_subdirectory(kbdurs) -add_subdirectory(kbdus) -add_subdirectory(kbdusa) -add_subdirectory(kbdusl) -add_subdirectory(kbdusr) -add_subdirectory(kbdusx) -add_subdirectory(kbduzb) -add_subdirectory(kbdvntc) -add_subdirectory(kbdycc) -add_subdirectory(kbdycl) +list(APPEND _keyboard_layouts + kbda1 + kbda2 + kbda3 + kbdal + kbdarme + kbdarmw + kbdaze + kbdazel + kbdbe + kbdbga + kbdbgm + kbdbgt + kbdblr + kbdbr + kbdbur + kbdcan + kbdcr + kbdcz + kbdcz1 + kbdda + kbddv + kbdes + kbdest + kbdfc + kbdfi + kbdfr + kbdgeo + kbdgerg + kbdgneo + kbdgr + kbdgrist + kbdhe + kbdheb + kbdhu + kbdic + kbdinasa + kbdinben + kbdindev + kbdinguj + kbdinmal + kbdir + kbdit + kbdja + kbdkaz + kbdko + kbdla + kbdlt1 + kbdlv + kbdmac + kbdne + kbdno + kbdpl + kbdpl1 + kbdpo + kbdro + kbdru + kbdru1 + kbdsg + kbdsk + kbdsk1 + kbdsw + kbdtat + kbdth0 + kbdth1 + kbdth2 + kbdth3 + kbdtuf + kbdtuq + kbduk + kbdur + kbdurs + kbdus + kbdusa + kbdusl + kbdusr + kbdusx + kbduzb + kbdvntc + kbdycc + kbdycl) + +foreach(_keyboard_layout ${_keyboard_layouts}) + spec2def(${_keyboard_layout}.dll ${_keyboard_layout}/${_keyboard_layout}.spec) + + add_library(${_keyboard_layout} SHARED + ${_keyboard_layout}/${_keyboard_layout}.c + ${_keyboard_layout}/${_keyboard_layout}.rc + ${CMAKE_CURRENT_BINARY_DIR}/${_keyboard_layout}.def) + + target_include_directories(${_keyboard_layout} PRIVATE ${REACTOS_SOURCE_DIR}/ntoskrnl/include) + set_entrypoint(${_keyboard_layout} 0) + set_image_base(${_keyboard_layout} 0x5FFF0000) + set_subsystem(${_keyboard_layout} native) + + if(MSVC) + # Merge the .text and .rdata section into the .data section + add_target_link_flags(${_keyboard_layout} "/ignore:4254 /SECTION:.data,ER /MERGE:.text=.data /MERGE:.rdata=.data /MERGE:.bss=.data /MERGE:.edata=.data") + else() + # Use a custom linker script + add_target_link_flags(${_keyboard_layout} "-Wl,-T,${CMAKE_SOURCE_DIR}/kbdlayout.lds") + endif() + + add_dependencies(${_keyboard_layout} psdk) + add_cd_file(TARGET ${_keyboard_layout} DESTINATION reactos/system32 FOR all) +endforeach() Removed: trunk/reactos/dll/keyboard/kbda1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda1/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbda1/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbda1/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbda1.dll kbda1.spec) - -add_library(kbda1 SHARED kbda1.c kbda1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbda1.def) - -set_module_type(kbda1 kbdlayout) - -add_dependencies(kbda1 psdk) - -add_cd_file(TARGET kbda1 DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbda2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda2/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbda2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbda2/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbda2.dll kbda2.spec) - -add_library(kbda2 SHARED kbda2.c kbda2.rc ${CMAKE_CURRENT_BINARY_DIR}/kbda2.def) - -set_module_type(kbda2 kbdlayout) - -add_dependencies(kbda2 psdk) - -add_cd_file(TARGET kbda2 DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbda3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda3/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbda3/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbda3/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbda3.dll kbda3.spec) - -add_library(kbda3 SHARED kbda3.c kbda3.rc ${CMAKE_CURRENT_BINARY_DIR}/kbda3.def) - -set_module_type(kbda3 kbdlayout) - -add_dependencies(kbda3 psdk) - -add_cd_file(TARGET kbda3 DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdal/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdal/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdal/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdal.dll kbdal.spec) - -add_library(kbdal SHARED kbdal.c kbdal.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdal.def) - -set_module_type(kbdal kbdlayout) - -add_dependencies(kbdal psdk) - -add_cd_file(TARGET kbdal DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdarme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdarme/CMake… ============================================================================== --- trunk/reactos/dll/keyboard/kbdarme/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdarme/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdarme.dll kbdarme.spec) - -add_library(kbdarme SHARED kbdarme.c kbdarme.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdarme.def) - -set_module_type(kbdarme kbdlayout) - -add_dependencies(kbdarme psdk) - -add_cd_file(TARGET kbdarme DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdarmw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdarmw/CMake… ============================================================================== --- trunk/reactos/dll/keyboard/kbdarmw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdarmw/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdarmw.dll kbdarmw.spec) - -add_library(kbdarmw SHARED kbdarmw.c kbdarmw.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdarmw.def) - -set_module_type(kbdarmw kbdlayout) - -add_dependencies(kbdarmw psdk) - -add_cd_file(TARGET kbdarmw DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdaze/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdaze/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdaze/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdaze/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdaze.dll kbdaze.spec) - -add_library(kbdaze SHARED kbdaze.c kbdaze.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdaze.def) - -set_module_type(kbdaze kbdlayout) - -add_dependencies(kbdaze psdk) - -add_cd_file(TARGET kbdaze DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdazel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdazel/CMake… ============================================================================== --- trunk/reactos/dll/keyboard/kbdazel/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdazel/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdazel.dll kbdazel.spec) - -add_library(kbdazel SHARED kbdazel.c kbdazel.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdazel.def) - -set_module_type(kbdazel kbdlayout) - -add_dependencies(kbdazel psdk) - -add_cd_file(TARGET kbdazel DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdbe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbe/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbe/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbe/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdbe.dll kbdbe.spec) - -add_library(kbdbe SHARED kbdbe.c kbdbe.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbe.def) - -set_module_type(kbdbe kbdlayout) - -add_dependencies(kbdbe psdk) - -add_cd_file(TARGET kbdbe DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdbga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbga/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbga/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbga/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdbga.dll kbdbga.spec) - -add_library(kbdbga SHARED kbdbga.c kbdbga.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbga.def) - -set_module_type(kbdbga kbdlayout) - -add_dependencies(kbdbga psdk) - -add_cd_file(TARGET kbdbga DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdbgm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgm/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbgm/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdbgm.dll kbdbgm.spec) - -add_library(kbdbgm SHARED kbdbgm.c kbdbgm.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbgm.def) - -set_module_type(kbdbgm kbdlayout) - -add_dependencies(kbdbgm psdk) - -add_cd_file(TARGET kbdbgm DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdbgt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgt/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbgt/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdbgt.dll kbdbgt.spec) - -add_library(kbdbgt SHARED kbdbgt.c kbdbgt.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbgt.def) - -set_module_type(kbdbgt kbdlayout) - -add_dependencies(kbdbgt psdk) - -add_cd_file(TARGET kbdbgt DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdblr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdblr/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdblr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdblr/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdblr.dll kbdblr.spec) - -add_library(kbdblr SHARED kbdblr.c kbdblr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdblr.def) - -set_module_type(kbdblr kbdlayout) - -add_dependencies(kbdblr psdk) - -add_cd_file(TARGET kbdblr DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdbr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbr/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbr/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdbr.dll kbdbr.spec) - -add_library(kbdbr SHARED kbdbr.c kbdbr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbr.def) - -set_module_type(kbdbr kbdlayout) - -add_dependencies(kbdbr psdk) - -add_cd_file(TARGET kbdbr DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdbur/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbur/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbur/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbur/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdbur.dll kbdbur.spec) - -add_library(kbdbur SHARED kbdbur.c kbdbur.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbur.def) - -set_module_type(kbdbur kbdlayout) - -add_dependencies(kbdbur psdk) - -add_cd_file(TARGET kbdbur DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdcan/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcan/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcan/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcan/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdcan.dll kbdcan.spec) - -add_library(kbdcan SHARED kbdcan.c kbdcan.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdcan.def) - -set_module_type(kbdcan kbdlayout) - -add_dependencies(kbdcan psdk) - -add_cd_file(TARGET kbdcan DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdcr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcr/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcr/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdcr.dll kbdcr.spec) - -add_library(kbdcr SHARED kbdcr.c kbdcr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdcr.def) - -set_module_type(kbdcr kbdlayout) - -add_dependencies(kbdcr psdk) - -add_cd_file(TARGET kbdcr DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdcz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcz/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdcz.dll kbdcz.spec) - -add_library(kbdcz SHARED kbdcz.c kbdcz.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdcz.def) - -set_module_type(kbdcz kbdlayout) - -add_dependencies(kbdcz psdk) - -add_cd_file(TARGET kbdcz DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdcz1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz1/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz1/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcz1/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdcz1.dll kbdcz1.spec) - -add_library(kbdcz1 SHARED kbdcz1.c kbdcz1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdcz1.def) - -set_module_type(kbdcz1 kbdlayout) - -add_dependencies(kbdcz1 psdk) - -add_cd_file(TARGET kbdcz1 DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdda/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdda/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdda/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdda.dll kbdda.spec) - -add_library(kbdda SHARED kbdda.c kbdda.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdda.def) - -set_module_type(kbdda kbdlayout) - -add_dependencies(kbdda psdk) - -add_cd_file(TARGET kbdda DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbddv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbddv/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbddv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbddv/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbddv.dll kbddv.spec) - -add_library(kbddv SHARED kbddv.c kbddv.rc ${CMAKE_CURRENT_BINARY_DIR}/kbddv.def) - -set_module_type(kbddv kbdlayout) - -add_dependencies(kbddv psdk) - -add_cd_file(TARGET kbddv DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdes/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdes/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdes/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdes/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdes.dll kbdes.spec) - -add_library(kbdes SHARED kbdes.c kbdes.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdes.def) - -set_module_type(kbdes kbdlayout) - -add_dependencies(kbdes psdk) - -add_cd_file(TARGET kbdes DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdest/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdest/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdest/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdest.dll kbdest.spec) - -add_library(kbdest SHARED kbdest.c kbdest.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdest.def) - -set_module_type(kbdest kbdlayout) - -add_dependencies(kbdest psdk) - -add_cd_file(TARGET kbdest DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdfc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfc/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdfc/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdfc.dll kbdfc.spec) - -add_library(kbdfc SHARED kbdfc.c kbdfc.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdfc.def) - -set_module_type(kbdfc kbdlayout) - -add_dependencies(kbdfc psdk) - -add_cd_file(TARGET kbdfc DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdfi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfi/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdfi/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdfi.dll kbdfi.spec) - -add_library(kbdfi SHARED kbdfi.c kbdfi.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdfi.def) - -set_module_type(kbdfi kbdlayout) - -add_dependencies(kbdfi psdk) - -add_cd_file(TARGET kbdfi DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdfr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfr/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdfr/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdfr.dll kbdfr.spec) - -add_library(kbdfr SHARED kbdfr.c kbdfr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdfr.def) - -set_module_type(kbdfr kbdlayout) - -add_dependencies(kbdfr psdk) - -add_cd_file(TARGET kbdfr DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdgeo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgeo/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgeo/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdgeo/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdgeo.dll kbdgeo.spec) - -add_library(kbdgeo SHARED kbdgeo.c kbdgeo.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgeo.def) - -set_module_type(kbdgeo kbdlayout) - -add_dependencies(kbdgeo psdk) - -add_cd_file(TARGET kbdgeo DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdgerg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgerg/CMake… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgerg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdgerg/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdgerg.dll kbdgerg.spec) - -add_library(kbdgerg SHARED kbdgerg.c kbdgerg.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgerg.def) - -set_module_type(kbdgerg kbdlayout) - -add_dependencies(kbdgerg psdk) - -add_cd_file(TARGET kbdgerg DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdgneo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgneo/CMake… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgneo/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdgneo/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdgneo.dll kbdgneo.spec) - -add_library(kbdgneo SHARED kbdgneo.c kbdgneo.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgneo.def) - -set_module_type(kbdgneo kbdlayout) - -add_dependencies(kbdgneo psdk) - -add_cd_file(TARGET kbdgneo DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgr/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdgr/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdgr.dll kbdgr.spec) - -add_library(kbdgr SHARED kbdgr.c kbdgr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgr.def) - -set_module_type(kbdgr kbdlayout) - -add_dependencies(kbdgr psdk) - -add_cd_file(TARGET kbdgr DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdgrist/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgrist/CMak… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgrist/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdgrist/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdgrist.dll kbdgrist.spec) - -add_library(kbdgrist SHARED kbdgrist.c kbdgrist.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgrist.def) - -set_module_type(kbdgrist kbdlayout) - -add_dependencies(kbdgrist psdk) - -add_cd_file(TARGET kbdgrist DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdhe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhe/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhe/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdhe/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdhe.dll kbdhe.spec) - -add_library(kbdhe SHARED kbdhe.c kbdhe.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdhe.def) - -set_module_type(kbdhe kbdlayout) - -add_dependencies(kbdhe psdk) - -add_cd_file(TARGET kbdhe DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdheb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdheb/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdheb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdheb/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdheb.dll kbdheb.spec) - -add_library(kbdheb SHARED kbdheb.c kbdheb.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdheb.def) - -set_module_type(kbdheb kbdlayout) - -add_dependencies(kbdheb psdk) - -add_cd_file(TARGET kbdheb DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdhu/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhu/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhu/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdhu/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdhu.dll kbdhu.spec) - -add_library(kbdhu SHARED kbdhu.c kbdhu.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdhu.def) - -set_module_type(kbdhu kbdlayout) - -add_dependencies(kbdhu psdk) - -add_cd_file(TARGET kbdhu DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdic/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdic/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdic/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdic.dll kbdic.spec) - -add_library(kbdic SHARED kbdic.c kbdic.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdic.def) - -set_module_type(kbdic kbdlayout) - -add_dependencies(kbdic psdk) - -add_cd_file(TARGET kbdic DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdinasa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinasa/CMak… ============================================================================== --- trunk/reactos/dll/keyboard/kbdinasa/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdinasa/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdinasa.dll kbdinasa.spec) - -add_library(kbdinasa SHARED kbdinasa.c kbdinasa.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdinasa.def) - -set_module_type(kbdinasa kbdlayout) - -add_dependencies(kbdinasa psdk) - -add_cd_file(TARGET kbdinasa DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdinben/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinben/CMak… ============================================================================== --- trunk/reactos/dll/keyboard/kbdinben/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdinben/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdinben.dll kbdinben.spec) - -add_library(kbdinben SHARED kbdinben.c kbdinben.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdinben.def) - -set_module_type(kbdinben kbdlayout) - -add_dependencies(kbdinben psdk) - -add_cd_file(TARGET kbdinben DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdindev/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdindev/CMak… ============================================================================== --- trunk/reactos/dll/keyboard/kbdindev/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdindev/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdindev.dll kbdindev.spec) - -add_library(kbdindev SHARED kbdindev.c kbdindev.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdindev.def) - -set_module_type(kbdindev kbdlayout) - -add_dependencies(kbdindev psdk) - -add_cd_file(TARGET kbdindev DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdinguj/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinguj/CMak… ============================================================================== --- trunk/reactos/dll/keyboard/kbdinguj/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdinguj/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdinguj.dll kbdinguj.spec) - -add_library(kbdinguj SHARED kbdinguj.c kbdinguj.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdinguj.def) - -set_module_type(kbdinguj kbdlayout) - -add_dependencies(kbdinguj psdk) - -add_cd_file(TARGET kbdinguj DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdinmal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinmal/CMak… ============================================================================== --- trunk/reactos/dll/keyboard/kbdinmal/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdinmal/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdinmal.dll kbdinmal.spec) - -add_library(kbdinmal SHARED kbdinmal.c kbdinmal.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdinmal.def) - -set_module_type(kbdinmal kbdlayout) - -add_dependencies(kbdinmal psdk) - -add_cd_file(TARGET kbdinmal DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdir/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdir/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdir/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdir/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdir.dll kbdir.spec) - -add_library(kbdir SHARED kbdir.c kbdir.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdir.def) - -set_module_type(kbdir kbdlayout) - -add_dependencies(kbdir psdk) - -add_cd_file(TARGET kbdir DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdit/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdit/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdit.dll kbdit.spec) - -add_library(kbdit SHARED kbdit.c kbdit.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdit.def) - -set_module_type(kbdit kbdlayout) - -add_dependencies(kbdit psdk) - -add_cd_file(TARGET kbdit DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdja/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdja/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdja/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdja/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdja.dll kbdja.spec) - -add_library(kbdja SHARED kbdja.c kbdja.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdja.def) - -set_module_type(kbdja kbdlayout) - -add_dependencies(kbdja psdk) - -add_cd_file(TARGET kbdja DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdkaz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdkaz/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdkaz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdkaz/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdkaz.dll kbdkaz.spec) - -add_library(kbdkaz SHARED kbdkaz.c kbdkaz.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdkaz.def) - -set_module_type(kbdkaz kbdlayout) - -add_dependencies(kbdkaz psdk) - -add_cd_file(TARGET kbdkaz DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdko/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdko/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdko/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdko/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdko.dll kbdko.spec) - -add_library(kbdko SHARED kbdko.c kbdko.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdko.def) - -set_module_type(kbdko kbdlayout) - -add_dependencies(kbdko psdk) - -add_cd_file(TARGET kbdko DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdla/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdla/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdla/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdla/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdla.dll kbdla.spec) - -add_library(kbdla SHARED kbdla.c kbdla.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdla.def) - -set_module_type(kbdla kbdlayout) - -add_dependencies(kbdla psdk) - -add_cd_file(TARGET kbdla DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdlt1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdlt1/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdlt1/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdlt1/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdlt1.dll kbdlt1.spec) - -add_library(kbdlt1 SHARED kbdlt1.c kbdlt1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdlt1.def) - -set_module_type(kbdlt1 kbdlayout) - -add_dependencies(kbdlt1 psdk) - -add_cd_file(TARGET kbdlt1 DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdlv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdlv/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdlv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdlv/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdlv.dll kbdlv.spec) - -add_library(kbdlv SHARED kbdlv.c kbdlv.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdlv.def) - -set_module_type(kbdlv kbdlayout) - -add_dependencies(kbdlv psdk) - -add_cd_file(TARGET kbdlv DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdmac/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdmac/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdmac/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdmac/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdmac.dll kbdmac.spec) - -add_library(kbdmac SHARED kbdmac.c kbdmac.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdmac.def) - -set_module_type(kbdmac kbdlayout) - -add_dependencies(kbdmac psdk) - -add_cd_file(TARGET kbdmac DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdne/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdne/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdne/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdne/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdne.dll kbdne.spec) - -add_library(kbdne SHARED kbdne.c kbdne.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdne.def) - -set_module_type(kbdne kbdlayout) - -add_dependencies(kbdne psdk) - -add_cd_file(TARGET kbdne DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdno/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdno/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdno/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdno/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdno.dll kbdno.spec) - -add_library(kbdno SHARED kbdno.c kbdno.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdno.def) - -set_module_type(kbdno kbdlayout) - -add_dependencies(kbdno psdk) - -add_cd_file(TARGET kbdno DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdpl/CMakeLists.txt (removed) @@ -1,10 +0,0 @@ - -spec2def(kbdpl.dll kbdpl.spec) - -add_library(kbdpl SHARED kbdpl.c kbdpl.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdpl.def) - -set_module_type(kbdpl kbdlayout) - -add_dependencies(kbdpl psdk) - -add_cd_file(TARGET kbdpl DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdpl1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl1/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl1/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdpl1/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdpl1.dll kbdpl1.spec) - -add_library(kbdpl1 SHARED kbdpl1.c kbdpl1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdpl1.def) - -set_module_type(kbdpl1 kbdlayout) - -add_dependencies(kbdpl1 psdk) - -add_cd_file(TARGET kbdpl1 DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdpo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpo/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpo/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdpo/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdpo.dll kbdpo.spec) - -add_library(kbdpo SHARED kbdpo.c kbdpo.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdpo.def) - -set_module_type(kbdpo kbdlayout) - -add_dependencies(kbdpo psdk) - -add_cd_file(TARGET kbdpo DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdro/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdro/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdro/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdro/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdro.dll kbdro.spec) - -add_library(kbdro SHARED kbdro.c kbdro.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdro.def) - -set_module_type(kbdro kbdlayout) - -add_dependencies(kbdro psdk) - -add_cd_file(TARGET kbdro DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdru/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdru/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdru/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdru.dll kbdru.spec) - -add_library(kbdru SHARED kbdru.c kbdru.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdru.def) - -set_module_type(kbdru kbdlayout) - -add_dependencies(kbdru psdk) - -add_cd_file(TARGET kbdru DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdru1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru1/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdru1/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdru1/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdru1.dll kbdru1.spec) - -add_library(kbdru1 SHARED kbdru1.c kbdru1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdru1.def) - -set_module_type(kbdru1 kbdlayout) - -add_dependencies(kbdru1 psdk) - -add_cd_file(TARGET kbdru1 DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdsg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsg/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsg/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdsg.dll kbdsg.spec) - -add_library(kbdsg SHARED kbdsg.c kbdsg.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdsg.def) - -set_module_type(kbdsg kbdlayout) - -add_dependencies(kbdsg psdk) - -add_cd_file(TARGET kbdsg DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdsk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdsk.dll kbdsk.spec) - -add_library(kbdsk SHARED kbdsk.c kbdsk.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdsk.def) - -set_module_type(kbdsk kbdlayout) - -add_dependencies(kbdsk psdk) - -add_cd_file(TARGET kbdsk DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdsk1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk1/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk1/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdsk1.dll kbdsk1.spec) - -add_library(kbdsk1 SHARED kbdsk1.c kbdsk1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdsk1.def) - -set_module_type(kbdsk1 kbdlayout) - -add_dependencies(kbdsk1 psdk) - -add_cd_file(TARGET kbdsk1 DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdsw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsw/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsw/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdsw.dll kbdsw.spec) - -add_library(kbdsw SHARED kbdsw.c kbdsw.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdsw.def) - -set_module_type(kbdsw kbdlayout) - -add_dependencies(kbdsw psdk) - -add_cd_file(TARGET kbdsw DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdtat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtat/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdtat/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdtat.dll kbdtat.spec) - -add_library(kbdtat SHARED kbdtat.c kbdtat.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdtat.def) - -set_module_type(kbdtat kbdlayout) - -add_dependencies(kbdtat psdk) - -add_cd_file(TARGET kbdtat DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdth0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth0/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth0/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth0/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdth0.dll kbdth0.spec) - -add_library(kbdth0 SHARED kbdth0.c kbdth0.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdth0.def) - -set_module_type(kbdth0 kbdlayout) - -add_dependencies(kbdth0 psdk) - -add_cd_file(TARGET kbdth0 DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdth1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth1/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth1/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth1/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdth1.dll kbdth1.spec) - -add_library(kbdth1 SHARED kbdth1.c kbdth1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdth1.def) - -set_module_type(kbdth1 kbdlayout) - -add_dependencies(kbdth1 psdk) - -add_cd_file(TARGET kbdth1 DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdth2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth2/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth2/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdth2.dll kbdth2.spec) - -add_library(kbdth2 SHARED kbdth2.c kbdth2.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdth2.def) - -set_module_type(kbdth2 kbdlayout) - -add_dependencies(kbdth2 psdk) - -add_cd_file(TARGET kbdth2 DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdth3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth3/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth3/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth3/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdth3.dll kbdth3.spec) - -add_library(kbdth3 SHARED kbdth3.c kbdth3.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdth3.def) - -set_module_type(kbdth3 kbdlayout) - -add_dependencies(kbdth3 psdk) - -add_cd_file(TARGET kbdth3 DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdtuf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuf/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdtuf/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdtuf.dll kbdtuf.spec) - -add_library(kbdtuf SHARED kbdtuf.c kbdtuf.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdtuf.def) - -set_module_type(kbdtuf kbdlayout) - -add_dependencies(kbdtuf psdk) - -add_cd_file(TARGET kbdtuf DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdtuq/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuq/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuq/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdtuq/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdtuq.dll kbdtuq.spec) - -add_library(kbdtuq SHARED kbdtuq.c kbdtuq.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdtuq.def) - -set_module_type(kbdtuq kbdlayout) - -add_dependencies(kbdtuq psdk) - -add_cd_file(TARGET kbdtuq DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbduk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduk/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbduk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbduk/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbduk.dll kbduk.spec) - -add_library(kbduk SHARED kbduk.c kbduk.rc ${CMAKE_CURRENT_BINARY_DIR}/kbduk.def) - -set_module_type(kbduk kbdlayout) - -add_dependencies(kbduk psdk) - -add_cd_file(TARGET kbduk DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdur/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdur/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdur/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdur/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdur.dll kbdur.spec) - -add_library(kbdur SHARED kbdur.c kbdur.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdur.def) - -set_module_type(kbdur kbdlayout) - -add_dependencies(kbdur psdk) - -add_cd_file(TARGET kbdur DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdurs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdurs/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdurs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdurs/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdurs.dll kbdurs.spec) - -add_library(kbdurs SHARED kbdurs.c kbdurs.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdurs.def) - -set_module_type(kbdurs kbdlayout) - -add_dependencies(kbdurs psdk) - -add_cd_file(TARGET kbdurs DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdus/CMakeLi… ============================================================================== --- trunk/reactos/dll/keyboard/kbdus/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdus/CMakeLists.txt (removed) @@ -1,11 +0,0 @@ -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdus.dll kbdus.spec) - -add_library(kbdus SHARED kbdus.c kbdus.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdus.def) - -set_module_type(kbdus kbdlayout) - -add_dependencies(kbdus psdk) - -add_cd_file(TARGET kbdus DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdusa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusa/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusa/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusa/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdusa.dll kbdusa.spec) - -add_library(kbdusa SHARED kbdusa.c kbdusa.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdusa.def) - -set_module_type(kbdusa kbdlayout) - -add_dependencies(kbdusa psdk) - -add_cd_file(TARGET kbdusa DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdusl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusl/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusl/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdusl.dll kbdusl.spec) - -add_library(kbdusl SHARED kbdusl.c kbdusl.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdusl.def) - -set_module_type(kbdusl kbdlayout) - -add_dependencies(kbdusl psdk) - -add_cd_file(TARGET kbdusl DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdusr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusr/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusr/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdusr.dll kbdusr.spec) - -add_library(kbdusr SHARED kbdusr.c kbdusr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdusr.def) - -set_module_type(kbdusr kbdlayout) - -add_dependencies(kbdusr psdk) - -add_cd_file(TARGET kbdusr DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdusx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusx/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdusx/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdusx.dll kbdusx.spec) - -add_library(kbdusx SHARED kbdusx.c kbdusx.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdusx.def) - -set_module_type(kbdusx kbdlayout) - -add_dependencies(kbdusx psdk) - -add_cd_file(TARGET kbdusx DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbduzb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduzb/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbduzb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbduzb/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbduzb.dll kbduzb.spec) - -add_library(kbduzb SHARED kbduzb.c kbduzb.rc ${CMAKE_CURRENT_BINARY_DIR}/kbduzb.def) - -set_module_type(kbduzb kbdlayout) - -add_dependencies(kbduzb psdk) - -add_cd_file(TARGET kbduzb DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdvntc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdvntc/CMake… ============================================================================== --- trunk/reactos/dll/keyboard/kbdvntc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdvntc/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdvntc.dll kbdvntc.spec) - -add_library(kbdvntc SHARED kbdvntc.c kbdvntc.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdvntc.def) - -set_module_type(kbdvntc kbdlayout) - -add_dependencies(kbdvntc psdk) - -add_cd_file(TARGET kbdvntc DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdycc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycc/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdycc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdycc/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdycc.dll kbdycc.spec) - -add_library(kbdycc SHARED kbdycc.c kbdycc.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdycc.def) - -set_module_type(kbdycc kbdlayout) - -add_dependencies(kbdycc psdk) - -add_cd_file(TARGET kbdycc DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/keyboard/kbdycl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycl/CMakeL… ============================================================================== --- trunk/reactos/dll/keyboard/kbdycl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdycl/CMakeLists.txt (removed) @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdycl.dll kbdycl.spec) - -add_library(kbdycl SHARED kbdycl.c kbdycl.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdycl.def) - -set_module_type(kbdycl kbdlayout) - -add_dependencies(kbdycl psdk) - -add_cd_file(TARGET kbdycl DESTINATION reactos/system32 FOR all)

9 years, 11 months

[spetreolle] 64790: [EXT2FS] Properly fix warnings on MSVC, introduced in r38302. "- 'allowwarnings=true' -- not anymore", they said. Advice by ThFabba.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Oct 17 19:27:29 2014 New Revision: 64790 URL: http://svn.reactos.org/svn/reactos?rev=64790&view=rev Log: [EXT2FS] Properly fix warnings on MSVC, introduced in r38302. "- 'allowwarnings=true' -- not anymore", they said. Advice by ThFabba. Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h [iso-8859-1] Fri Oct 17 19:27:29 2014 @@ -60,7 +60,7 @@ extern Ext2Data Ext2GlobalData; // try-finally simulation -#define try_return(S) { S; goto try_exit; } +#define try_return(...) { __VA_ARGS__; goto try_exit; } #define try_return1(S) { S; goto try_exit1; } #define try_return2(S) { S; goto try_exit2; } @@ -119,10 +119,10 @@ #ifdef EXT2_POOL_WITH_TAG #define Ext2AllocatePool(PoolType,NumberOfBytes) \ - ExAllocatePoolWithTag( PoolType, NumberOfBytes, '2txE' ) + ExAllocatePoolWithTag( PoolType, NumberOfBytes, '2txE' ) #else #define Ext2AllocatePool(PoolType,NumberOfBytes) \ - ExAllocatePool( PoolType, NumberOfBytes ) + ExAllocatePool( PoolType, NumberOfBytes ) #endif @@ -227,7 +227,7 @@ } #else - #define DebugTrace( TYPE, X, Y ) + #define DebugTrace( TYPE, X, Y ) #define DebugTraceState( STR, X1, X2, X3 ) #define AssertFCB( PtrFCB ) #define AssertVCB( PtrVCB )

9 years, 11 months

[jimtabor] 64789: [User32Test] - Turn off tracking pop up menu tests. See CORE-8299.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Oct 17 17:48:35 2014 New Revision: 64789 URL: http://svn.reactos.org/svn/reactos?rev=64789&view=rev Log: [User32Test] - Turn off tracking pop up menu tests. See CORE-8299. Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Fri Oct 17 17:48:35 2014 @@ -14598,8 +14598,13 @@ test_keyflags(); test_hotkey(); test_layered_window(); + if(!winetest_interactive) + skip("CORE-8299 : Skip Tracking popup menu tests.\n"); + else + { test_TrackPopupMenu(); test_TrackPopupMenuEmpty(); + } /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */

9 years, 11 months

[jimtabor] 64788: [User32] - Patch by Michael Müller : Also set cch member in GetMenuItemInfo when passing a null pointer. - Fix two menu tests.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Oct 17 16:43:46 2014 New Revision: 64788 URL: http://svn.reactos.org/svn/reactos?rev=64788&view=rev Log: [User32] - Patch by Michael Müller : Also set cch member in GetMenuItemInfo when passing a null pointer. - Fix two menu tests. Modified: trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Fri Oct 17 16:43:46 2014 @@ -295,12 +295,12 @@ { // Very strange this fixes a wine test with a crash. if(lpmii->dwTypeData && lpmii->cch && !(GdiValidateHandle((HGDIOBJ)lpmii->dwTypeData)) ) { - lpmii->cch = 0; if( unicode) *((WCHAR *)lpmii->dwTypeData) = 0; else *((CHAR *)lpmii->dwTypeData) = 0; } + lpmii->cch = 0; } else {

9 years, 11 months

[khornicek] 64787: [CMD] - prevent a buffer underrun (fixes stray quotes being appended on autocomplete in some cases) - check if the input string is not empty (fixes first file in directory gettin...

by khornicek＠svn.reactos.org

Author: khornicek Date: Fri Oct 17 16:39:54 2014 New Revision: 64787 URL: http://svn.reactos.org/svn/reactos?rev=64787&view=rev Log: [CMD] - prevent a buffer underrun (fixes stray quotes being appended on autocomplete in some cases) - check if the input string is not empty (fixes first file in directory getting skipped on autocomplete) - fix some typos CORE-8623 Modified: trunk/reactos/base/shell/cmd/filecomp.c Modified: trunk/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/filecomp.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] Fri Oct 17 16:39:54 2014 @@ -556,7 +556,7 @@ /* Used to find and assemble the string that is returned */ TCHAR szBaseWord[MAX_PATH]; TCHAR szPrefix[MAX_PATH]; - TCHAR szOrginal[MAX_PATH]; + TCHAR szOriginal[MAX_PATH]; TCHAR szSearchPath[MAX_PATH]; /* Save the strings used last time, so if they hit tab again */ static TCHAR LastReturned[MAX_PATH]; @@ -586,9 +586,9 @@ if (!_tcsnicmp (line, _T("rd "), 3) || !_tcsnicmp (line, _T("cd "), 3)) ShowAll = FALSE; - /* Copy the string, str can be edited and orginal should not be */ + /* Copy the string, str can be edited and original should not be */ _tcscpy(str,strIN); - _tcscpy(szOrginal,strIN); + _tcscpy(szOriginal,strIN); /* Look to see if the cusor is not at the end of the string */ if ((cusor + 1) < _tcslen(str)) @@ -656,8 +656,8 @@ hFile = FindFirstFile (szSearchPath, &file); if (hFile == INVALID_HANDLE_VALUE) { - /* Assemble the orginal string and return */ - _tcscpy(strOut,szOrginal); + /* Assemble the original string and return */ + _tcscpy(strOut,szOriginal); return; } @@ -685,8 +685,8 @@ { /* Don't leak old buffer */ cmd_free(oldFileList); - /* Assemble the orginal string and return */ - _tcscpy(strOut,szOrginal); + /* Assemble the original string and return */ + _tcscpy(strOut,szOriginal); FindClose(hFile); ConOutFormatMessage (GetLastError()); return; @@ -698,11 +698,10 @@ FindClose(hFile); - /* Check the size of the list to see if we - found any matches */ + /* Check the size of the list to see if we found any matches */ if (FileListSize == 0) { - _tcscpy(strOut,szOrginal); + _tcscpy(strOut,szOriginal); if (FileList != NULL) cmd_free(FileList); return; @@ -712,7 +711,7 @@ qsort(FileList,FileListSize,sizeof(FileName), compare); /* Find the next/previous */ - if (!_tcscmp(szOrginal,LastReturned)) + if (_tcslen(szOriginal) && !_tcscmp(szOriginal,LastReturned)) { if (bNext) { @@ -734,8 +733,7 @@ Sel = 0; } - /* nothing found that matched last time - so return the first thing in the list */ + /* nothing found that matched last time so return the first thing in the list */ strOut[0] = _T('\0'); /* Special character in the name */ @@ -792,7 +790,7 @@ } } - if (szPrefix[_tcslen(szPrefix) - 1] == _T('\"') || NeededQuote) + if (NeededQuote || (_tcslen(szPrefix) && szPrefix[_tcslen(szPrefix) - 1] == _T('\"'))) _tcscat(strOut,_T("\"")); _tcscpy(LastReturned,strOut);

9 years, 11 months

[aandrejevic] 64786: [NTVDM] Add an 8x14 font to the video BIOS. Font data provided by Roy Tam.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Oct 17 14:15:43 2014 New Revision: 64786 URL: http://svn.reactos.org/svn/reactos?rev=64786&view=rev Log: [NTVDM] Add an 8x14 font to the video BIOS. Font data provided by Roy Tam. Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c trunk/reactos/subsystems/ntvdm/bios/vidbios.h Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Fri Oct 17 14:15:43 2014 @@ -911,6 +911,522 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +static CONST UCHAR Font8x14[VGA_FONT_CHARACTERS * 14] = +{ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7E, 0x81, 0xA5, 0x81, + 0x81, 0xBD, 0x99, 0x81, 0x7E, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7E, 0xFF, 0xDB, 0xFF, + 0xFF, 0xC3, 0xE7, 0xFF, 0x7E, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x6C, 0xFE, 0xFE, + 0xFE, 0xFE, 0x7C, 0x38, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x7C, + 0xFE, 0x7C, 0x38, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x3C, 0x3C, 0xE7, + 0xE7, 0xE7, 0x18, 0x18, 0x3C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x3C, 0x7E, 0xFF, + 0xFF, 0x7E, 0x18, 0x18, 0x3C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, + 0x3C, 0x3C, 0x18, 0x00, 0x00, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, + 0xC3, 0xC3, 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x66, + 0x42, 0x42, 0x66, 0x3C, 0x00, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x99, + 0xBD, 0xBD, 0x99, 0xC3, 0xFF, 0xFF, 0xFF, + 0x00, 0x00, 0x00, 0x1E, 0x0E, 0x1A, 0x32, + 0x78, 0xCC, 0xCC, 0xCC, 0x78, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3C, 0x66, 0x66, 0x66, + 0x3C, 0x18, 0x7E, 0x18, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3F, 0x33, 0x3F, 0x30, + 0x30, 0x30, 0x70, 0xF0, 0xE0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7F, 0x63, 0x7F, 0x63, + 0x63, 0x63, 0x67, 0xE7, 0xE6, 0xC0, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x18, 0xDB, 0x3C, + 0xE7, 0x3C, 0xDB, 0x18, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x80, 0xC0, 0xE0, 0xF8, + 0xFE, 0xF8, 0xE0, 0xC0, 0x80, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x02, 0x06, 0x0E, 0x3E, + 0xFE, 0x3E, 0x0E, 0x06, 0x02, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x3C, 0x7E, 0x18, + 0x18, 0x18, 0x7E, 0x3C, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, + 0x66, 0x66, 0x00, 0x66, 0x66, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7F, 0xDB, 0xDB, 0xDB, + 0x7B, 0x1B, 0x1B, 0x1B, 0x1B, 0x00, 0x00, + 0x00, 0x7C, 0xC6, 0x60, 0x38, 0x6C, 0xC6, + 0x6C, 0x38, 0x0C, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFE, 0xFE, + 0x00, 0x00, 0x00, 0x18, 0x3C, 0x7E, 0x18, + 0x18, 0x18, 0x7E, 0x3C, 0x18, 0x7E, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x3C, 0x7E, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x7E, 0x3C, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x0C, + 0xFE, 0x0C, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x60, + 0xFE, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, + 0xC0, 0xC0, 0xFE, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x6C, + 0xFE, 0x6C, 0x28, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x38, + 0x7C, 0x7C, 0xFE, 0xFE, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFE, 0x7C, + 0x7C, 0x38, 0x38, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x3C, 0x3C, 0x3C, + 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, + 0x00, 0x66, 0x66, 0x66, 0x24, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x6C, 0x6C, 0xFE, 0x6C, + 0x6C, 0x6C, 0xFE, 0x6C, 0x6C, 0x00, 0x00, + 0x00, 0x18, 0x18, 0x7C, 0xC6, 0xC2, 0xC0, + 0x7C, 0x06, 0x86, 0xC6, 0x7C, 0x18, 0x18, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0xC6, + 0x0C, 0x18, 0x30, 0x66, 0xC6, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x38, 0x6C, 0x6C, 0x38, + 0x76, 0xDC, 0xCC, 0xCC, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x30, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x0C, 0x18, 0x30, 0x30, + 0x30, 0x30, 0x30, 0x18, 0x0C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x30, 0x18, 0x0C, 0x0C, + 0x0C, 0x0C, 0x0C, 0x18, 0x30, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x3C, + 0xFF, 0x3C, 0x66, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, + 0x7E, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x02, 0x06, 0x0C, 0x18, + 0x30, 0x60, 0xC0, 0x80, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x38, 0x6C, 0xC6, 0xC6, + 0xD6, 0xC6, 0xC6, 0x6C, 0x38, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x38, 0x78, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x7E, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7C, 0xC6, 0x06, 0x0C, + 0x18, 0x30, 0x60, 0xC6, 0xFE, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7C, 0xC6, 0x06, 0x06, + 0x3C, 0x06, 0x06, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x0C, 0x1C, 0x3C, 0x6C, + 0xCC, 0xFE, 0x0C, 0x0C, 0x1E, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFE, 0xC0, 0xC0, 0xC0, + 0xFC, 0x06, 0x06, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x38, 0x60, 0xC0, 0xC0, + 0xFC, 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFE, 0xC6, 0x06, 0x0C, + 0x18, 0x30, 0x30, 0x30, 0x30, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0xC6, + 0x7C, 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0xC6, + 0x7E, 0x06, 0x06, 0x0C, 0x78, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, + 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, + 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 0x00, + 0x00, 0x00, 0x00, 0x0C, 0x18, 0x30, 0x60, + 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, + 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x0C, + 0x06, 0x0C, 0x18, 0x30, 0x60, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0x0C, + 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0xDE, + 0xDE, 0xDE, 0xDC, 0xC0, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x10, 0x38, 0x6C, 0xC6, + 0xC6, 0xFE, 0xC6, 0xC6, 0xC6, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFC, 0x66, 0x66, 0x66, + 0x7C, 0x66, 0x66, 0x66, 0xFC, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3C, 0x66, 0xC2, 0xC0, + 0xC0, 0xC0, 0xC2, 0x66, 0x3C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xF8, 0x6C, 0x66, 0x66, + 0x66, 0x66, 0x66, 0x6C, 0xF8, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFE, 0x66, 0x62, 0x68, + 0x78, 0x68, 0x62, 0x66, 0xFE, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFE, 0x66, 0x62, 0x68, + 0x78, 0x68, 0x60, 0x60, 0xF0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3C, 0x66, 0xC2, 0xC0, + 0xC0, 0xDE, 0xC6, 0x66, 0x3A, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xC6, 0xC6, 0xC6, 0xC6, + 0xFE, 0xC6, 0xC6, 0xC6, 0xC6, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3C, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x1E, 0x0C, 0x0C, 0x0C, + 0x0C, 0x0C, 0xCC, 0xCC, 0x78, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xE6, 0x66, 0x6C, 0x6C, + 0x78, 0x6C, 0x6C, 0x66, 0xE6, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xF0, 0x60, 0x60, 0x60, + 0x60, 0x60, 0x62, 0x66, 0xFE, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xC6, 0xEE, 0xFE, 0xD6, + 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xC6, 0xE6, 0xF6, 0xFE, + 0xDE, 0xCE, 0xC6, 0xC6, 0xC6, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0xC6, + 0xC6, 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFC, 0x66, 0x66, 0x66, + 0x7C, 0x60, 0x60, 0x60, 0xF0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0xC6, + 0xC6, 0xC6, 0xD6, 0xDE, 0x7C, 0x0E, 0x00, + 0x00, 0x00, 0x00, 0xFC, 0x66, 0x66, 0x66, + 0x7C, 0x6C, 0x66, 0x66, 0xE6, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0x60, + 0x38, 0x0C, 0xC6, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7E, 0x7E, 0x5A, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xC6, 0xC6, 0xC6, 0xC6, + 0xC6, 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xC6, 0xC6, 0xC6, 0xC6, + 0xC6, 0xC6, 0x6C, 0x38, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xC6, 0xC6, 0xC6, 0xC6, + 0xD6, 0xD6, 0xFE, 0x6C, 0x6C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xC6, 0xC6, 0xC6, 0x7C, + 0x38, 0x7C, 0xC6, 0xC6, 0xC6, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, + 0x3C, 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFE, 0xC6, 0x8C, 0x18, + 0x30, 0x60, 0xC2, 0xC6, 0xFE, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3C, 0x30, 0x30, 0x30, + 0x30, 0x30, 0x30, 0x30, 0x3C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x80, 0xC0, 0xE0, 0x70, + 0x38, 0x1C, 0x0E, 0x06, 0x02, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3C, 0x0C, 0x0C, 0x0C, + 0x0C, 0x0C, 0x0C, 0x0C, 0x3C, 0x00, 0x00, + 0x38, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, + 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, + 0x0C, 0x7C, 0xCC, 0xCC, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xE0, 0x60, 0x60, 0x78, + 0x6C, 0x66, 0x66, 0x66, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, + 0xC6, 0xC0, 0xC0, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x1C, 0x0C, 0x0C, 0x3C, + 0x6C, 0xCC, 0xCC, 0xCC, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, + 0xC6, 0xFE, 0xC0, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x1C, 0x36, 0x32, 0x30, + 0x7C, 0x30, 0x30, 0x30, 0x78, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, + 0xCC, 0xCC, 0xCC, 0xCC, 0x7C, 0x0C, 0x78, + 0x00, 0x00, 0x00, 0xE0, 0x60, 0x60, 0x6C, + 0x76, 0x66, 0x66, 0x66, 0xE6, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x38, + 0x18, 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x06, 0x06, 0x00, 0x0E, + 0x06, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3C, + 0x00, 0x00, 0x00, 0xE0, 0x60, 0x60, 0x66, + 0x6C, 0x78, 0x6C, 0x66, 0xE6, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x38, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEC, + 0xFE, 0xD6, 0xD6, 0xD6, 0xD6, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDC, + 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, + 0xC6, 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDC, + 0x66, 0x66, 0x66, 0x66, 0x7C, 0x60, 0xF0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, + 0xCC, 0xCC, 0xCC, 0xCC, 0x7C, 0x0C, 0x1E, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDC, + 0x76, 0x66, 0x60, 0x60, 0xF0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, + 0xC6, 0x70, 0x1C, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x10, 0x30, 0x30, 0xFC, + 0x30, 0x30, 0x30, 0x36, 0x1C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCC, + 0xCC, 0xCC, 0xCC, 0xCC, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC6, + 0xC6, 0xC6, 0x6C, 0x38, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC6, + 0xC6, 0xD6, 0xD6, 0xFE, 0x6C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC6, + 0x6C, 0x38, 0x38, 0x6C, 0xC6, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC6, + 0xC6, 0xC6, 0xC6, 0xC6, 0x7E, 0x06, 0x7C, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, + 0xCC, 0x18, 0x30, 0x66, 0xFE, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x0E, 0x18, 0x18, 0x18, + 0x70, 0x18, 0x18, 0x18, 0x0E, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x70, 0x18, 0x18, 0x18, + 0x0E, 0x18, 0x18, 0x18, 0x70, 0x00, 0x00, + 0x76, 0xDC, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, + 0x38, 0x6C, 0xC6, 0xC6, 0xFE, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3C, 0x66, 0xC2, 0xC0, + 0xC0, 0xC0, 0xC2, 0x66, 0x3C, 0x18, 0x70, + 0x00, 0x00, 0x00, 0x00, 0xCC, 0x00, 0xCC, + 0xCC, 0xCC, 0xCC, 0xCC, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x06, 0x0C, 0x18, 0x00, 0x7C, + 0xC6, 0xFE, 0xC0, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x10, 0x38, 0x6C, 0x00, 0x78, + 0x0C, 0x7C, 0xCC, 0xCC, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xCC, 0x00, 0x78, + 0x0C, 0x7C, 0xCC, 0xCC, 0x76, 0x00, 0x00, + 0x00, 0x00, 0xC0, 0x60, 0x30, 0x00, 0x78, + 0x0C, 0x7C, 0xCC, 0xCC, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x38, 0x6C, 0x38, 0x00, 0x78, + 0x0C, 0x7C, 0xCC, 0xCC, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, + 0xC6, 0xC0, 0xC0, 0xC6, 0x7C, 0x18, 0x70, + 0x00, 0x00, 0x10, 0x38, 0x6C, 0x00, 0x7C, + 0xC6, 0xFE, 0xC0, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xC6, 0x00, 0x7C, + 0xC6, 0xFE, 0xC0, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x60, 0x30, 0x18, 0x00, 0x7C, + 0xC6, 0xFE, 0xC0, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x66, 0x00, 0x38, + 0x18, 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, + 0x00, 0x00, 0x18, 0x3C, 0x66, 0x00, 0x38, + 0x18, 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, + 0x00, 0x00, 0x60, 0x30, 0x18, 0x00, 0x38, + 0x18, 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, + 0x00, 0xC6, 0x00, 0x10, 0x38, 0x6C, 0xC6, + 0xC6, 0xFE, 0xC6, 0xC6, 0xC6, 0x00, 0x00, + 0x38, 0x6C, 0x38, 0x10, 0x38, 0x6C, 0xC6, + 0xC6, 0xFE, 0xC6, 0xC6, 0xC6, 0x00, 0x00, + 0x0C, 0x18, 0x00, 0xFE, 0x66, 0x62, 0x68, + 0x78, 0x68, 0x62, 0x66, 0xFE, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEC, + 0x36, 0x76, 0xDC, 0xD8, 0x6E, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3E, 0x6C, 0xCC, 0xCC, + 0xFE, 0xCC, 0xCC, 0xCC, 0xCE, 0x00, 0x00, + 0x00, 0x00, 0x10, 0x38, 0x6C, 0x00, 0x7C, + 0xC6, 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xC6, 0x00, 0x7C, + 0xC6, 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x60, 0x30, 0x18, 0x00, 0x7C, + 0xC6, 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x30, 0x78, 0xCC, 0x00, 0xCC, + 0xCC, 0xCC, 0xCC, 0xCC, 0x76, 0x00, 0x00, + 0x00, 0x00, 0xC0, 0x60, 0x30, 0x00, 0xCC, + 0xCC, 0xCC, 0xCC, 0xCC, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xC6, 0x00, 0xC6, + 0xC6, 0xC6, 0xC6, 0xC6, 0x7E, 0x06, 0x7C, + 0x00, 0xC6, 0x00, 0x7C, 0xC6, 0xC6, 0xC6, + 0xC6, 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0xC6, 0x00, 0xC6, 0xC6, 0xC6, 0xC6, + 0xC6, 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x18, 0x7C, 0xC6, + 0xC0, 0xC6, 0x7C, 0x18, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x38, 0x6C, 0x64, 0x60, + 0xF0, 0x60, 0x60, 0x66, 0xFC, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x66, 0x66, 0x3C, 0x18, + 0x7E, 0x18, 0x7E, 0x18, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFC, 0x66, 0x66, 0x7C, + 0x62, 0x66, 0x6F, 0x66, 0xF3, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x0E, 0x1B, 0x18, 0x18, + 0x7E, 0x18, 0x18, 0xD8, 0x70, 0x00, 0x00, + 0x00, 0x00, 0x0C, 0x18, 0x30, 0x00, 0x78, + 0x0C, 0x7C, 0xCC, 0xCC, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x06, 0x0C, 0x18, 0x00, 0x38, + 0x18, 0x18, 0x18, 0x18, 0x3C, 0x00, 0x00, + 0x00, 0x00, 0x06, 0x0C, 0x18, 0x00, 0x7C, + 0xC6, 0xC6, 0xC6, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x0C, 0x18, 0x30, 0x00, 0xCC, + 0xCC, 0xCC, 0xCC, 0xCC, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x76, 0xDC, 0x00, 0xDC, + 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, + 0x76, 0xDC, 0x00, 0xC6, 0xE6, 0xF6, 0xFE, + 0xDE, 0xCE, 0xC6, 0xC6, 0xC6, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3C, 0x6C, 0x6C, 0x36, + 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x38, 0x6C, 0x6C, 0x38, + 0x00, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0x30, + 0x30, 0x60, 0xC6, 0xC6, 0x7C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, + 0xC0, 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, + 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x60, 0xE0, 0x63, 0x66, 0x6C, 0x18, + 0x30, 0x6E, 0xC3, 0x06, 0x0C, 0x1F, 0x00, + 0x00, 0x60, 0xE0, 0x63, 0x66, 0x6C, 0x18, + 0x36, 0x6E, 0xDA, 0x3F, 0x06, 0x06, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x18, + 0x18, 0x3C, 0x3C, 0x3C, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x36, 0x6C, 0xD8, 0x6C, 0x36, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xD8, 0x6C, 0x36, 0x6C, 0xD8, 0x00, 0x00, + 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, + 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, + 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, + 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, + 0xDD, 0x77, 0xDD, 0x77, 0xDD, 0x77, 0xDD, + 0x77, 0xDD, 0x77, 0xDD, 0x77, 0xDD, 0x77, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0xF8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0xF8, 0x18, + 0xF8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0xF6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFE, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x18, + 0xF8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x36, 0x36, 0x36, 0x36, 0x36, 0xF6, 0x06, + 0xF6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x06, + 0xF6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0xF6, 0x06, + 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x18, 0x18, 0x18, 0x18, 0xF8, 0x18, + 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xF8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFF, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x1F, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0xFF, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x1F, 0x18, + 0x1F, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x37, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x30, + 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x30, + 0x37, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0xF7, 0x00, + 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, + 0xF7, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x30, + 0x37, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, + 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x36, 0x36, 0x36, 0x36, 0x36, 0xF7, 0x00, + 0xF7, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x18, 0x18, 0x18, 0x18, 0x18, 0xFF, 0x00, + 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, + 0xFF, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFF, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x1F, 0x18, + 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x18, + 0x1F, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3F, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0xFF, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x18, 0x18, 0x18, 0x18, 0x18, 0xFF, 0x18, + 0xFF, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x1F, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, + 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, + 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, + 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, + 0xDC, 0xD8, 0xD8, 0xDC, 0x76, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x78, 0xCC, 0xCC, 0xD8, + 0xCC, 0xC6, 0xC6, 0xC6, 0xCC, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFE, 0xC6, 0xC6, 0xC0, + 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, + 0x6C, 0x6C, 0x6C, 0x6C, 0x6C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFE, 0xC6, 0x60, 0x30, + 0x18, 0x30, 0x60, 0xC6, 0xFE, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, + 0xD8, 0xD8, 0xD8, 0xD8, 0x70, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, + 0x66, 0x66, 0x66, 0x66, 0x7C, 0x60, 0xC0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, + 0xDC, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7E, 0x18, 0x3C, 0x66, + 0x66, 0x66, 0x3C, 0x18, 0x7E, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x38, 0x6C, 0xC6, 0xC6, + 0xFE, 0xC6, 0xC6, 0x6C, 0x38, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x38, 0x6C, 0xC6, 0xC6, + 0xC6, 0x6C, 0x6C, 0x6C, 0xEE, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x1E, 0x30, 0x18, 0x0C, + 0x3E, 0x66, 0x66, 0x66, 0x3C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0xDB, + 0xDB, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x03, 0x06, 0x7E, 0xDB, + 0xDB, 0xF3, 0x7E, 0x60, 0xC0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x1E, 0x30, 0x60, 0x60, + 0x7E, 0x60, 0x60, 0x30, 0x1E, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x7C, 0xC6, 0xC6, 0xC6, + 0xC6, 0xC6, 0xC6, 0xC6, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, + 0xFE, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x18, 0x18, 0x7E, 0x18, + 0x18, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x30, 0x18, 0x0C, 0x06, + 0x0C, 0x18, 0x30, 0x00, 0x7E, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x0C, 0x18, 0x30, 0x60, + 0x30, 0x18, 0x0C, 0x00, 0x7E, 0x00, 0x00, + 0x00, 0x00, 0x0E, 0x1B, 0x1B, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, + 0x18, 0xD8, 0xD8, 0x70, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, + 0x7E, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDC, + 0x00, 0x76, 0xDC, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x38, 0x6C, 0x6C, 0x38, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x0F, 0x0C, 0x0C, 0x0C, 0x0C, + 0x0C, 0xEC, 0x6C, 0x3C, 0x1C, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x6C, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x3C, 0x66, 0x0C, 0x18, + 0x32, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x7E, + 0x7E, 0x7E, 0x7E, 0x7E, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + static CONST UCHAR Font8x16[VGA_FONT_CHARACTERS * 16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -2418,7 +2934,7 @@ { FONT_8x8_HIGH_OFFSET, /* 00h - INT 0x1F pointer */ 0, /* 01h - NOT IMPLEMENTED - INT 0x43 pointer */ - 0, /* 02h - NOT IMPLEMENTED - 8x14 font */ + FONT_8x14_OFFSET, /* 02h - NOT IMPLEMENTED - 8x14 font */ FONT_8x8_OFFSET, /* 03h - 8x8 font */ FONT_8x8_HIGH_OFFSET, /* 04h - 8x8 font, upper half */ 0, /* 05h - NOT IMPLEMENTED - 9x14 font */ @@ -2530,6 +3046,9 @@ RtlMoveMemory(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, FONT_8x16_OFFSET), Font8x16, sizeof(Font8x16)); + RtlMoveMemory(SEG_OFF_TO_PTR(VIDEO_BIOS_DATA_SEG, FONT_8x14_OFFSET), + Font8x14, + sizeof(Font8x14)); /* Write the default font to the VGA font plane */ VgaWriteFont(0, Font8x16, 16); Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/vidbios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/vidbios.h [iso-8859-1] Fri Oct 17 14:15:43 2014 @@ -31,6 +31,7 @@ #define FONT_8x8_OFFSET 0x0000 #define FONT_8x8_HIGH_OFFSET 0x0400 #define FONT_8x16_OFFSET 0x0800 +#define FONT_8x14_OFFSET 0x1800 enum {

9 years, 11 months

[akhaldi] 64785: [USER32_WINETEST] * Sync with Wine 1.7.27. * Jim! help! CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 17 13:49:22 2014 New Revision: 64785 URL: http://svn.reactos.org/svn/reactos?rev=64785&view=rev Log: [USER32_WINETEST] * Sync with Wine 1.7.27. * Jim! help! CORE-8540 Modified: trunk/rostests/winetests/user32/cursoricon.c trunk/rostests/winetests/user32/menu.c trunk/rostests/winetests/user32/monitor.c trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/resource.c trunk/rostests/winetests/user32/win.c trunk/rostests/winetests/user32/winstation.c Modified: trunk/rostests/winetests/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/cursoric… ============================================================================== --- trunk/rostests/winetests/user32/cursoricon.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/cursoricon.c [iso-8859-1] Fri Oct 17 13:49:22 2014 @@ -955,14 +955,14 @@ /* Shamelessly ripped from dlls/oleaut32/tests/olepicture.c */ /* 1x1 pixel gif */ -static unsigned char gifimage[35] = { +static const unsigned char gifimage[35] = { 0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x00,0xff,0xff,0xff, 0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, 0x01,0x00,0x3b }; /* 1x1 pixel jpg */ -static unsigned char jpgimage[285] = { +static const unsigned char jpgimage[285] = { 0xff,0xd8,0xff,0xe0,0x00,0x10,0x4a,0x46,0x49,0x46,0x00,0x01,0x01,0x01,0x01,0x2c, 0x01,0x2c,0x00,0x00,0xff,0xdb,0x00,0x43,0x00,0x05,0x03,0x04,0x04,0x04,0x03,0x05, 0x04,0x04,0x04,0x05,0x05,0x05,0x06,0x07,0x0c,0x08,0x07,0x07,0x07,0x07,0x0f,0x0b, @@ -984,7 +984,7 @@ }; /* 1x1 pixel png */ -static unsigned char pngimage[285] = { +static const unsigned char pngimage[285] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53, 0xde,0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b, @@ -1005,14 +1005,14 @@ }; /* 1x1 pixel bmp using BITMAPCOREHEADER */ -static unsigned char bmpcoreimage[38] = { +static const unsigned char bmpcoreimage[38] = { 0x42,0x4d,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x22,0x00,0x00,0x00,0x0c,0x00, 0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xff,0xff,0xff,0x00,0x55,0x55, 0x55,0x00,0x00,0x00,0x00,0x00 }; /* 2x2 pixel gif */ -static unsigned char gif4pixel[42] = { +static const unsigned char gif4pixel[42] = { 0x47,0x49,0x46,0x38,0x37,0x61,0x02,0x00,0x02,0x00,0xa1,0x00,0x00,0x00,0x00,0x00, 0x39,0x62,0xfc,0xff,0x1a,0xe5,0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x02,0x00, 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b @@ -1059,7 +1059,7 @@ ok(color_match(pixel, 0x00ffffff), "%s: Pixel is 0x%08x\n", test_desc, pixel); } -static void test_LoadImageFile(const char * test_desc, unsigned char * image_data, +static void test_LoadImageFile(const char * test_desc, const unsigned char * image_data, unsigned int image_size, const char * ext, BOOL expect_success) { HANDLE handle; @@ -1699,6 +1699,7 @@ ret = DestroyCursor(h1); ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, hotspot); cleanup: if(bmpOld) SelectObject(hdc, bmpOld); if(bmp) DeleteObject(bmp); Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Fri Oct 17 13:49:22 2014 @@ -172,7 +172,7 @@ case WM_MEASUREITEM: { MEASUREITEMSTRUCT* pmis = (MEASUREITEMSTRUCT*)lparam; - if( winetest_debug) + if (winetest_debug > 1) trace("WM_MEASUREITEM received data %lx size %dx%d\n", pmis->itemData, pmis->itemWidth, pmis->itemHeight); ok( !wparam, "wrong wparam %lx\n", wparam ); @@ -191,7 +191,7 @@ SIZE sz; int i; pdis = (DRAWITEMSTRUCT *) lparam; - if( winetest_debug) { + if (winetest_debug > 1) { RECT rc; GetMenuItemRect( hwnd, (HMENU)pdis->hwndItem, pdis->itemData ,&rc); trace("WM_DRAWITEM received hwnd %p hmenu %p itemdata %ld item %d rc %d,%d-%d,%d itemrc: %d,%d-%d,%d\n", @@ -1369,6 +1369,11 @@ MFT_SEPARATOR, 0, 0, 0, 0, 0, 0, string, 0, 0, empty, OK, ER ); TMII_DONE + TMII_INSMI( MIIM_STRING|MIIM_FTYPE, MFT_STRING, -1, -1, 0, 0, 0, -1, NULL, 0, 0, OK ); + TMII_GMII ( MIIM_STRING|MIIM_FTYPE, 80, + MFT_SEPARATOR, 0, 0, 0, 0, 0, 0, NULL, 0, 0, + NULL, OK, ER ); + TMII_DONE /* How is that with bitmaps? */ TMII_INSMI( MIIM_BITMAP, -1, -1, -1, 0, 0, 0, -1, 0, -1, hbm, OK ); @@ -2510,6 +2515,11 @@ if (mii.hSubMenu) { ok(mii.wID == (UINT_PTR)mii.hSubMenu, "id %u: wID should be equal to hSubMenu\n", checked_cmd); + if (!GetMenuItemCount(mii.hSubMenu)) + { + ok(mii.fType == checked_type, "id %u: expected fType %04x, got %04x\n", checked_cmd, checked_type, mii.fType); + ok(mii.fState == checked_state, "id %u: expected fState %04x, got %04x\n", checked_cmd, checked_state, mii.fState); + } check_menu_items(mii.hSubMenu, checked_cmd, checked_type, checked_state); } else @@ -3618,6 +3628,123 @@ ok(ret, "DestroyMenu failed with error %d\n", GetLastError()); } +static void test_AppendMenu(void) +{ + MENUITEMINFOA mii; + HMENU hmenu, hsubmenu; + BOOL ret; + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW, 201, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, 201, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_POPUP, 202, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, 202, MF_STRING, 0); + DestroyMenu(hmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, 203, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, 203, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreateMenu(); + ok(hsubmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreateMenu(); + ok(hsubmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_POPUP, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_STRING, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreateMenu(); + ok(hsubmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreatePopupMenu(); + ok(hsubmenu != 0, "CreatePopupMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreatePopupMenu(); + ok(hsubmenu != 0, "CreatePopupMenu failed\n"); + ret = AppendMenuA(hmenu, MF_POPUP, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_STRING, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + hsubmenu = CreatePopupMenu(); + ok(hsubmenu != 0, "CreatePopupMenu failed\n"); + ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, (UINT_PTR)hsubmenu, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0); + DestroyMenu(hmenu); + DestroyMenu(hsubmenu); + + hmenu = CreateMenu(); + ok(hmenu != 0, "CreateMenu failed\n"); + ret = AppendMenuA(hmenu, MF_STRING, 204, "item 1"); + ok(ret, "AppendMenu failed\n"); + check_menu_items(hmenu, 204, MF_STRING, 0); + ret = ModifyMenuA(hmenu, 0, MF_POPUP | MF_BYPOSITION, 205, "item 2"); + ok(ret, "ModifyMenu failed\n"); + check_menu_items(hmenu, 205, MF_STRING, 0); + memset(&mii, 0, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_SUBMENU; + mii.hSubMenu = (HMENU)204; + ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); + ok(!ret, "InsertMenuItem should fail\n"); + ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii); + ok(!ret, "SetMenuItemInfo should fail\n"); + mii.fMask = MIIM_ID; + mii.wID = 206; + ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); + ok(ret, "InsertMenuItem failed\n"); +if (0) /* FIXME: uncomment once Wine is fixed */ + check_menu_items(hmenu, 206, MF_SEPARATOR, MFS_GRAYED); + mii.wID = 207; + ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii); + ok(ret, "SetMenuItemInfo failed\n"); +if (0) /* FIXME: uncomment once Wine is fixed */ + check_menu_items(hmenu, 207, MF_SEPARATOR, MFS_GRAYED); + DestroyMenu(hmenu); +} + START_TEST(menu) { init_function_pointers(); @@ -3655,4 +3782,5 @@ test_menu_maxdepth(); test_menu_circref(); test_emptypopup(); -} + test_AppendMenu(); +} Modified: trunk/rostests/winetests/user32/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/monitor.… ============================================================================== --- trunk/rostests/winetests/user32/monitor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/monitor.c [iso-8859-1] Fri Oct 17 13:49:22 2014 @@ -30,6 +30,7 @@ static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,LPDISPLAY_DEVICEA,DWORD); static BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); +static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static HMONITOR (WINAPI *pMonitorFromRect)(LPCRECT,DWORD); static HMONITOR (WINAPI *pMonitorFromWindow)(HWND,DWORD); @@ -48,6 +49,7 @@ GET_PROC(EnumDisplayDevicesA) GET_PROC(EnumDisplayMonitors) GET_PROC(GetMonitorInfoA) + GET_PROC(GetMonitorInfoW) GET_PROC(MonitorFromPoint) GET_PROC(MonitorFromRect) GET_PROC(MonitorFromWindow) @@ -296,6 +298,40 @@ HMONITOR monitor, primary, nearest; POINT pt; RECT rc; + MONITORINFO mi; + MONITORINFOEXA miexa; + MONITORINFOEXW miexw; + BOOL ret; + DWORD i; + + static const struct + { + DWORD cbSize; + BOOL ret; + } testdatami[] = { + {0, FALSE}, + {sizeof(MONITORINFO)+1, FALSE}, + {sizeof(MONITORINFO)-1, FALSE}, + {sizeof(MONITORINFO), TRUE}, + {-1, FALSE}, + {0xdeadbeef, FALSE}, + }, + testdatamiexa[] = { + {0, FALSE}, + {sizeof(MONITORINFOEXA)+1, FALSE}, + {sizeof(MONITORINFOEXA)-1, FALSE}, + {sizeof(MONITORINFOEXA), TRUE}, + {-1, FALSE}, + {0xdeadbeef, FALSE}, + }, + testdatamiexw[] = { + {0, FALSE}, + {sizeof(MONITORINFOEXW)+1, FALSE}, + {sizeof(MONITORINFOEXW)-1, FALSE}, + {sizeof(MONITORINFOEXW), TRUE}, + {-1, FALSE}, + {0xdeadbeef, FALSE}, + }; if (!pMonitorFromPoint || !pMonitorFromWindow || !pMonitorFromRect) { @@ -351,8 +387,6 @@ nearest = primary; while (monitor != NULL) { - MONITORINFO mi; - BOOL ret; ok( monitor != primary, "got primary %p\n", monitor ); nearest = monitor; mi.cbSize = sizeof(mi); @@ -360,6 +394,55 @@ ok( ret, "GetMonitorInfo failed\n" ); SetRect( &rc, mi.rcMonitor.left-1, mi.rcMonitor.top-2, mi.rcMonitor.left+2, mi.rcMonitor.top ); monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); + } + + /* tests for cbSize in MONITORINFO */ + monitor = pMonitorFromWindow( 0, MONITOR_DEFAULTTOPRIMARY ); + for (i = 0; i < (sizeof(testdatami) / sizeof(testdatami[0])); i++) + { + memset( &mi, 0, sizeof(mi) ); + mi.cbSize = testdatami[i].cbSize; + ret = pGetMonitorInfoA( monitor, &mi ); + ok( ret == testdatami[i].ret, "GetMonitorInfo returned wrong value\n" ); + if (ret) + ok( (mi.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); + else + ok( !(mi.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag is set\n" ); + + memset( &miexw, 0, sizeof(miexw) ); + miexw.cbSize = testdatamiexw[i].cbSize; + ret = pGetMonitorInfoW( monitor, (LPMONITORINFO)&miexw ); + ok( ret == testdatamiexw[i].ret, "GetMonitorInfo returned wrong value\n" ); + if (ret) + ok( (miexw.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); + else + ok( !(miexw.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag is set\n" ); + } + + /* tests for cbSize in MONITORINFOEXA */ + for (i = 0; i < (sizeof(testdatamiexa) / sizeof(testdatamiexa[0])); i++) + { + memset( &miexa, 0, sizeof(miexa) ); + miexa.cbSize = testdatamiexa[i].cbSize; + ret = pGetMonitorInfoA( monitor, (LPMONITORINFO)&miexa ); + ok( ret == testdatamiexa[i].ret, "GetMonitorInfo returned wrong value\n" ); + if (ret) + ok( (miexa.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); + else + ok( !(miexa.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag is set\n" ); + } + + /* tests for cbSize in MONITORINFOEXW */ + for (i = 0; i < (sizeof(testdatamiexw) / sizeof(testdatamiexw[0])); i++) + { + memset( &miexw, 0, sizeof(miexw) ); + miexw.cbSize = testdatamiexw[i].cbSize; + ret = pGetMonitorInfoW( monitor, (LPMONITORINFO)&miexw ); + ok( ret == testdatamiexw[i].ret, "GetMonitorInfo returned wrong value\n" ); + if (ret) + ok( (miexw.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); + else + ok( !(miexw.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag is set\n" ); } SetRect( &rc, rc.left+1, rc.top+1, rc.left+2, rc.top+2 ); Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Fri Oct 17 13:49:22 2014 @@ -1747,6 +1747,24 @@ { 0 } }; +static const struct message WmTrackPopupMenuCapture[] = { + { HCBT_CREATEWND, hook }, + { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, + { WM_CAPTURECHANGED, sent }, + { WM_INITMENU, sent|lparam, 0, 0 }, + { WM_INITMENUPOPUP, sent|lparam, 0, 0 }, + { 0x0093, sent|optional }, + { 0x0094, sent|optional }, + { 0x0094, sent|optional }, + { WM_ENTERIDLE, sent|wparam, 2 }, + { WM_CAPTURECHANGED, sent }, + { HCBT_DESTROYWND, hook }, + { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, + { WM_MENUSELECT, sent|wparam|lparam, 0xffff0000, 0 }, + { WM_EXITMENULOOP, sent|wparam|lparam, 1, 0 }, + { 0 } +}; + static const struct message WmTrackPopupMenuEmpty[] = { { HCBT_CREATEWND, hook }, { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, @@ -1759,6 +1777,22 @@ { WM_EXITMENULOOP, sent|wparam|lparam, 1, 0 }, { HCBT_DESTROYWND, hook }, { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, + { 0 } +}; + +static const struct message WmTrackPopupMenuAbort[] = { + { HCBT_CREATEWND, hook }, + { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, + { WM_INITMENU, sent|lparam, 0, 0 }, + { WM_INITMENUPOPUP, sent|lparam, 0, 0 }, + { 0x0093, sent|optional }, + { 0x0094, sent|optional }, + { 0x0094, sent|optional }, + { WM_CAPTURECHANGED, sent }, + { HCBT_DESTROYWND, hook }, + { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, + { WM_MENUSELECT, sent|wparam|lparam, 0xffff0000, 0 }, + { WM_EXITMENULOOP, sent|wparam|lparam, 1, 0 }, { 0 } }; @@ -6990,6 +7024,7 @@ ret = pGetCurrentActCtx(&handle); ok(ret, "GetCurentActCtx failed: %u\n", GetLastError()); ok(handle != 0, "active context %p\n", handle); + pReleaseActCtx(handle); /* destination window will test for active context */ ret = SendMessageA(wnd_event.hwnd, WM_USER+10, 0, 0); @@ -8356,8 +8391,8 @@ } #define TIMER_ID 0x19 -#define TIMER_COUNT_EXPECTED 64 -#define TIMER_COUNT_TOLERANCE 9 +#define TIMER_COUNT_EXPECTED 100 +#define TIMER_COUNT_TOLERANCE 10 static int count = 0; static void CALLBACK callback_count(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) @@ -8408,8 +8443,9 @@ ok( KillTimer(info.hWnd, TIMER_ID), "KillTimer failed\n"); /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, - * but testing indicates that the minimum timeout is actually about 15.6 ms. Since there is - * some measurement error between test runs we're allowing for Â±8 counts (~2 ms). + * which occurs sometimes, but most testing on the VMs indicates a minimum timeout closer to + * 15.6 ms. Since there is some measurement error between test runs we are allowing for + * Â±9 counts (~4 ms) around the expected value. */ count = 0; id = SetTimer(info.hWnd, TIMER_ID, 0, callback_count); @@ -8418,8 +8454,9 @@ start = GetTickCount(); while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0)) DispatchMessageA(&msg); - ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE - || broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3 */, + ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ + || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */ + || broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3, win8 */, "did not get expected count for minimum timeout (%d != ~%d).\n", count, TIMER_COUNT_EXPECTED); ok(KillTimer(info.hWnd, id), "KillTimer failed\n"); @@ -8439,7 +8476,9 @@ syscount++; DispatchMessageA(&msg); } - ok(abs(syscount-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE, + ok(abs(syscount-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE + || broken(abs(syscount-64) < TIMER_COUNT_TOLERANCE) /* most common */ + || broken(syscount > 4000 && syscount < 12000) /* win2k3sp0 */, "did not get expected count for minimum timeout (%d != ~%d).\n", syscount, TIMER_COUNT_EXPECTED); todo_wine ok(count == 0, "did not get expected count for callback timeout (%d != 0).\n", @@ -8473,8 +8512,9 @@ ok(count == 1, "killing replaced timer did not work (%i).\n", count); /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, - * but testing indicates that the minimum timeout is actually about 15.6 ms. Since there is - * some measurement error between test runs we're allowing for Â±8 counts (~2 ms). + * which occurs sometimes, but most testing on the VMs indicates a minimum timeout closer to + * 15.6 ms. Since there is some measurement error between test runs we are allowing for + * Â±9 counts (~4 ms) around the expected value. */ count = 0; id = SetTimer(NULL, 0, 0, callback_count); @@ -8482,7 +8522,8 @@ start = GetTickCount(); while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0)) DispatchMessageA(&msg); - ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE, + ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ + || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */, "did not get expected count for minimum timeout (%d != ~%d).\n", count, TIMER_COUNT_EXPECTED); KillTimer(NULL, id); @@ -14337,6 +14378,22 @@ case WM_UNINITMENUPOPUP: ok((HMENU)wParam == hpopupmenu, "expected %p, got %lx\n", hpopupmenu, wParam); break; + case WM_CAPTURECHANGED: + todo_wine ok(!lParam || (HWND)lParam == hwnd, "lost capture to %lx\n", lParam); + break; + } + + return MsgCheckProc (FALSE, hwnd, message, wParam, lParam); +} + +static LRESULT WINAPI cancel_init_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + if (ignore_message( message )) return 0; + + switch (message) { + case WM_ENTERMENULOOP: + ok(EndMenu() == TRUE, "EndMenu() failed\n"); + break; } return MsgCheckProc (FALSE, hwnd, message, wParam, lParam); @@ -14365,6 +14422,24 @@ ret = TrackPopupMenu(hpopupmenu, 0, 100,100, 0, hwnd, NULL); ok_sequence(WmTrackPopupMenu, "TrackPopupMenu", TRUE); ok(ret == 1, "TrackPopupMenu failed with error %i\n", GetLastError()); + + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)cancel_init_proc); + + flush_events(); + flush_sequence(); + ret = TrackPopupMenu(hpopupmenu, 0, 100,100, 0, hwnd, NULL); + ok_sequence(WmTrackPopupMenuAbort, "WmTrackPopupMenuAbort", TRUE); + ok(ret == TRUE, "TrackPopupMenu failed\n"); + + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)cancel_popup_proc); + + SetCapture(hwnd); + + flush_events(); + flush_sequence(); + ret = TrackPopupMenu(hpopupmenu, 0, 100,100, 0, hwnd, NULL); + ok_sequence(WmTrackPopupMenuCapture, "TrackPopupMenuCapture", TRUE); + ok(ret == 1, "TrackPopupMenuCapture failed with error %i\n", GetLastError()); DestroyMenu(hpopupmenu); DestroyWindow(hwnd); Modified: trunk/rostests/winetests/user32/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/resource… ============================================================================== --- trunk/rostests/winetests/user32/resource.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/resource.c [iso-8859-1] Fri Oct 17 13:49:22 2014 @@ -126,6 +126,13 @@ ok( ret == -1 || broken(ret == 0), "LoadStringA did not return -1 when called with buflen = 0, got %d, err %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + buf[0] = 'a'; + ret = LoadStringA(hInst, 1, buf, 1); + ok( !ret, "LoadString returned %d\n", ret); + ok( buf[0] == 0, "buf[0] = %c (%x)\n", buf[0], buf[0]); + ok( GetLastError() == 0xdeadbeef, "GetLastError() = %d\n", GetLastError()); } static void test_accel1(void) Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Fri Oct 17 13:49:22 2014 @@ -705,19 +705,12 @@ { case WM_GETMINMAXINFO: { - MINMAXINFO* minmax = (MINMAXINFO *)lparam; - - trace("WM_GETMINMAXINFO: hwnd %p, %08lx, %08lx\n", hwnd, wparam, lparam); - dump_minmax_info( minmax ); SetWindowLongPtrA(hwnd, GWLP_USERDATA, 0x20031021); break; } case WM_WINDOWPOSCHANGING: { WINDOWPOS *winpos = (WINDOWPOS *)lparam; - trace("main: WM_WINDOWPOSCHANGING %p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", - winpos->hwnd, winpos->hwndInsertAfter, - winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); if (!(winpos->flags & SWP_NOMOVE)) { ok(winpos->x >= -32768 && winpos->x <= 32767, "bad winpos->x %d\n", winpos->x); @@ -739,9 +732,6 @@ { RECT rc1, rc2; WINDOWPOS *winpos = (WINDOWPOS *)lparam; - trace("main: WM_WINDOWPOSCHANGED %p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", - winpos->hwnd, winpos->hwndInsertAfter, - winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); ok(winpos->x >= -32768 && winpos->x <= 32767, "bad winpos->x %d\n", winpos->x); ok(winpos->y >= -32768 && winpos->y <= 32767, "bad winpos->y %d\n", winpos->y); @@ -774,10 +764,6 @@ { BOOL got_getminmaxinfo = GetWindowLongPtrA(hwnd, GWLP_USERDATA) == 0x20031021; CREATESTRUCTA *cs = (CREATESTRUCTA *)lparam; - - trace("WM_NCCREATE: hwnd %p, parent %p, style %08x\n", hwnd, cs->hwndParent, cs->style); - if (got_getminmaxinfo) - trace("%p got WM_GETMINMAXINFO\n", hwnd); if ((cs->style & WS_THICKFRAME) || !(cs->style & (WS_POPUP | WS_CHILD))) ok(got_getminmaxinfo, "main: WM_GETMINMAXINFO should have been received before WM_NCCREATE\n"); @@ -803,10 +789,6 @@ { case WM_GETMINMAXINFO: { - MINMAXINFO* minmax = (MINMAXINFO *)lparam; - - trace("hwnd %p, WM_GETMINMAXINFO, %08lx, %08lx\n", hwnd, wparam, lparam); - dump_minmax_info( minmax ); SetWindowLongPtrA(hwnd, GWLP_USERDATA, 0x20031021); break; } @@ -814,10 +796,6 @@ { BOOL got_getminmaxinfo = GetWindowLongPtrA(hwnd, GWLP_USERDATA) == 0x20031021; CREATESTRUCTA *cs = (CREATESTRUCTA *)lparam; - - trace("WM_NCCREATE: hwnd %p, parent %p, style %08x\n", hwnd, cs->hwndParent, cs->style); - if (got_getminmaxinfo) - trace("%p got WM_GETMINMAXINFO\n", hwnd); if ((cs->style & WS_THICKFRAME) || !(cs->style & (WS_POPUP | WS_CHILD))) ok(got_getminmaxinfo, "tool: WM_GETMINMAXINFO should have been received before WM_NCCREATE\n"); @@ -1665,12 +1643,7 @@ style = GetWindowLongA(hwnd, GWL_STYLE); exstyle = GetWindowLongA(hwnd, GWL_EXSTYLE); - GetWindowRect(client, &rc); - trace("MDI client %p window size = (%d x %d)\n", client, rc.right-rc.left, rc.bottom-rc.top); GetClientRect(client, &rc); - trace("MDI client %p client size = (%d x %d)\n", client, rc.right, rc.bottom); - trace("screen size: %d x %d\n", GetSystemMetrics(SM_CXSCREEN), - GetSystemMetrics(SM_CYSCREEN)); GetClientRect(client, &rc); if ((style & WS_CAPTION) == WS_CAPTION) @@ -3098,6 +3071,9 @@ } cap_wnd = GetCapture(); + ok(cap_wnd == (HWND)lParam, "capture window %p does not match lparam %lx\n", cap_wnd, lParam); + todo_wine ok(cap_wnd == hWnd, "capture window %p does not match hwnd %p\n", cap_wnd, hWnd); + /* check that re-setting the capture for the menu fails */ set_cap_wnd = SetCapture(cap_wnd); ok(!set_cap_wnd || broken(set_cap_wnd == cap_wnd), /* nt4 */ @@ -3762,6 +3738,11 @@ bret = SetForegroundWindow(popup); ok(bret, "SetForegroundWindow() failed\n"); check_active_state(popup, popup, popup); + + ShowWindow(parent, SW_SHOW); + SetActiveWindow(popup); + ok(DestroyWindow(popup), "DestroyWindow() failed\n"); + check_active_state(parent, parent, parent); ok(DestroyWindow(parent), "DestroyWindow() failed\n"); @@ -6290,7 +6271,6 @@ case WM_NCCREATE: { CREATESTRUCTA *cs = (CREATESTRUCTA *)lp; - trace("WM_NCCREATE: rect %d,%d-%d,%d\n", cs->x, cs->y, cs->cx, cs->cy); ok(cs->x == mi.rcMonitor.left && cs->y == mi.rcMonitor.top && cs->cx == mi.rcMonitor.right && cs->cy == mi.rcMonitor.bottom, "expected %d,%d-%d,%d, got %d,%d-%d,%d\n", @@ -6301,7 +6281,6 @@ case WM_GETMINMAXINFO: { MINMAXINFO *minmax = (MINMAXINFO *)lp; - dump_minmax_info(minmax); ok(minmax->ptMaxPosition.x <= mi.rcMonitor.left, "%d <= %d\n", minmax->ptMaxPosition.x, mi.rcMonitor.left); ok(minmax->ptMaxPosition.y <= mi.rcMonitor.top, "%d <= %d\n", minmax->ptMaxPosition.y, mi.rcMonitor.top); ok(minmax->ptMaxSize.x >= mi.rcMonitor.right, "%d >= %d\n", minmax->ptMaxSize.x, mi.rcMonitor.right); @@ -7530,6 +7509,170 @@ DestroyWindow(hwnd); } + +struct smresult_thread_data +{ + HWND main_hwnd; + HWND thread_hwnd; + HANDLE thread_started; + HANDLE thread_got_wm_app; + HANDLE main_in_wm_app_1; + HANDLE thread_replied; +}; + + +static LRESULT WINAPI smresult_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_APP: + { + struct smresult_thread_data *data = (struct smresult_thread_data*)lparam; + + ok(hwnd == data->thread_hwnd, "unexpected hwnd %p\n", hwnd); + + SendNotifyMessageA(data->main_hwnd, WM_APP+1, 0, lparam); + + /* Don't return until the main thread is processing our sent message. */ + ok(WaitForSingleObject(data->main_in_wm_app_1, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + + /* Break the PeekMessage loop so we can notify the main thread after we return. */ + SetEvent(data->thread_got_wm_app); + + return 0x240408ea; + } + case WM_APP+1: + { + struct smresult_thread_data *data = (struct smresult_thread_data*)lparam; + LRESULT res; + + ok(hwnd == data->main_hwnd, "unexpected hwnd %p\n", hwnd); + + /* Ask the thread to reply to our WM_APP message. */ + SetEvent(data->main_in_wm_app_1); + + /* Wait until the thread has sent a reply. */ + ok(WaitForSingleObject(data->thread_replied, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + + /* Send another message while we have a reply queued for the current one. */ + res = SendMessageA(data->thread_hwnd, WM_APP+2, 0, lparam); + ok(res == 0x449b0190, "unexpected result %lx\n", res); + + return 0; + } + case WM_APP+2: + { + struct smresult_thread_data *data = (struct smresult_thread_data*)lparam; + + ok(hwnd == data->thread_hwnd, "unexpected hwnd %p\n", hwnd); + + /* Don't return until we know the main thread is processing sent messages. */ + SendMessageA(data->main_hwnd, WM_NULL, 0, 0); + + return 0x449b0190; + } + case WM_CLOSE: + PostQuitMessage(0); + break; + } + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static DWORD WINAPI smresult_thread_proc(void *param) +{ + MSG msg; + struct smresult_thread_data *data = param; + + data->thread_hwnd = CreateWindowExA(0, "SmresultClass", "window caption text", WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(data->thread_hwnd != 0, "Failed to create overlapped window\n"); + + SetEvent(data->thread_started); + + /* Loop until we've processed WM_APP. */ + while (WaitForSingleObject(data->thread_got_wm_app, 0) != WAIT_OBJECT_0) + { + if (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + else + { + MsgWaitForMultipleObjects(1, &data->thread_got_wm_app, FALSE, INFINITE, QS_SENDMESSAGE); + } + } + + /* Notify the main thread that we replied to its WM_APP message. */ + SetEvent(data->thread_replied); + + while (GetMessageA(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + return 0; +} + +static void test_smresult(void) +{ + WNDCLASSA cls; + HANDLE hThread; + DWORD tid; + struct smresult_thread_data data; + BOOL ret; + LRESULT res; + + cls.style = CS_DBLCLKS; + cls.lpfnWndProc = smresult_wndproc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "SmresultClass"; + + ret = RegisterClassA(&cls); + ok(ret, "RegisterClassA failed\n"); + + data.thread_started = CreateEventA(NULL, TRUE, FALSE, NULL); + ok(data.thread_started != NULL, "CreateEventA failed\n"); + + data.thread_got_wm_app = CreateEventA(NULL, TRUE, FALSE, NULL); + ok(data.thread_got_wm_app != NULL, "CreateEventA failed\n"); + + data.main_in_wm_app_1 = CreateEventA(NULL, TRUE, FALSE, NULL); + ok(data.main_in_wm_app_1 != NULL, "CreateEventA failed\n"); + + data.thread_replied = CreateEventA(NULL, TRUE, FALSE, NULL); + ok(data.thread_replied != NULL, "CreateEventA failed\n"); + + data.main_hwnd = CreateWindowExA(0, "SmresultClass", "window caption text", WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + + hThread = CreateThread(NULL, 0, smresult_thread_proc, &data, 0, &tid); + ok(hThread != NULL, "CreateThread failed, error %d\n", GetLastError()); + + ok(WaitForSingleObject(data.thread_started, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + + res = SendMessageA(data.thread_hwnd, WM_APP, 0, (LPARAM)&data); + ok(res == 0x240408ea, "unexpected result %lx\n", res); + + SendMessageA(data.thread_hwnd, WM_CLOSE, 0, 0); + + DestroyWindow(data.main_hwnd); + + ok(WaitForSingleObject(hThread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + + CloseHandle(data.thread_started); + CloseHandle(data.thread_got_wm_app); + CloseHandle(data.main_in_wm_app_1); + CloseHandle(data.thread_replied); +} + START_TEST(win) { HMODULE user32 = GetModuleHandleA( "user32.dll" ); @@ -7664,6 +7807,7 @@ test_map_points(); test_update_region(); test_window_without_child_style(); + test_smresult(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); Modified: trunk/rostests/winetests/user32/winstation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/winstati… ============================================================================== --- trunk/rostests/winetests/user32/winstation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/winstation.c [iso-8859-1] Fri Oct 17 13:49:22 2014 @@ -519,7 +519,7 @@ ret = CloseDesktop(input_desk); ok(ret, "CloseDesktop failed!\n"); - /* by default, GetThreadDesktop is the input desktop, SendInput should success. */ + /* by default, GetThreadDesktop is the input desktop, SendInput should succeed. */ old_thread_desk = GetThreadDesktop(GetCurrentThreadId()); ok(old_thread_desk != NULL, "GetThreadDesktop faile!\n"); memset(name, 0, sizeof(name));

9 years, 11 months

[akhaldi] 64784: [ADVAPI32_WINETEST] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 17 13:36:13 2014 New Revision: 64784 URL: http://svn.reactos.org/svn/reactos?rev=64784&view=rev Log: [ADVAPI32_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/advapi32/eventlog.c trunk/rostests/winetests/advapi32/registry.c trunk/rostests/winetests/advapi32/security.c trunk/rostests/winetests/advapi32/service.c Modified: trunk/rostests/winetests/advapi32/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/eventl… ============================================================================== --- trunk/rostests/winetests/advapi32/eventlog.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/eventlog.c [iso-8859-1] Fri Oct 17 13:36:13 2014 @@ -130,7 +130,8 @@ HANDLE handle; BOOL ret; DWORD needed; - EVENTLOG_FULL_INFORMATION efi; + BYTE buffer[2 * sizeof(EVENTLOG_FULL_INFORMATION)]; + EVENTLOG_FULL_INFORMATION *efi = (void *)buffer; if (!pGetEventLogInformation) { @@ -161,26 +162,26 @@ ok(GetLastError() == RPC_X_NULL_REF_POINTER, "Expected RPC_X_NULL_REF_POINTER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, (LPVOID)&efi, 0, NULL); + ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, efi, 0, NULL); ok(!ret, "Expected failure\n"); ok(GetLastError() == RPC_X_NULL_REF_POINTER, "Expected RPC_X_NULL_REF_POINTER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); needed = 0xdeadbeef; - efi.dwFull = 0xdeadbeef; - ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, (LPVOID)&efi, 0, &needed); + efi->dwFull = 0xdeadbeef; + ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, efi, 0, &needed); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); ok(needed == sizeof(EVENTLOG_FULL_INFORMATION), "Expected sizeof(EVENTLOG_FULL_INFORMATION), got %d\n", needed); - ok(efi.dwFull == 0xdeadbeef, "Expected no change to the dwFull member\n"); + ok(efi->dwFull == 0xdeadbeef, "Expected no change to the dwFull member\n"); /* Not that we care, but on success last error is set to ERROR_IO_PENDING */ - efi.dwFull = 0xdeadbeef; - needed *= 2; - ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, (LPVOID)&efi, needed, &needed); + efi->dwFull = 0xdeadbeef; + needed = sizeof(buffer); + ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, efi, needed, &needed); ok(ret, "Expected success\n"); ok(needed == sizeof(EVENTLOG_FULL_INFORMATION), "Expected sizeof(EVENTLOG_FULL_INFORMATION), got %d\n", needed); - ok(efi.dwFull == 0 || efi.dwFull == 1, "Expected 0 (not full) or 1 (full), got %d\n", efi.dwFull); + ok(efi->dwFull == 0 || efi->dwFull == 1, "Expected 0 (not full) or 1 (full), got %d\n", efi->dwFull); CloseEventLog(handle); } Modified: trunk/rostests/winetests/advapi32/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/regist… ============================================================================== --- trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] Fri Oct 17 13:36:13 2014 @@ -50,6 +50,10 @@ static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(UNICODE_STRING*); static NTSTATUS (WINAPI * pRtlFreeUnicodeString)(PUNICODE_STRING); +static LONG (WINAPI *pRegDeleteKeyValueA)(HKEY,LPCSTR,LPCSTR); +static LONG (WINAPI *pRegSetKeyValueW)(HKEY,LPCWSTR,LPCWSTR,DWORD,const void*,DWORD); + +static BOOL limited_user; /* Debugging functions from wine/libs/wine/debug.c */ @@ -136,6 +140,8 @@ ADVAPI32_GET_PROC(RegGetValueA); ADVAPI32_GET_PROC(RegDeleteTreeA); ADVAPI32_GET_PROC(RegDeleteKeyExA); + ADVAPI32_GET_PROC(RegDeleteKeyValueA); + ADVAPI32_GET_PROC(RegSetKeyValueW); pIsWow64Process = (void *)GetProcAddress( hkernel32, "IsWow64Process" ); pRtlFormatCurrentUserKeyPath = (void *)GetProcAddress( hntdll, "RtlFormatCurrentUserKeyPath" ); @@ -171,6 +177,26 @@ if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey_main )) delete_key( hkey_main ); assert (!RegCreateKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey_main )); +} + +static void check_user_privs(void) +{ + DWORD ret; + HKEY hkey = (HKEY)0xdeadbeef; + + ret = RegOpenKeyExA( HKEY_LOCAL_MACHINE, "Software", 0, KEY_READ|KEY_WRITE, &hkey); + ok(ret == ERROR_SUCCESS || ret == ERROR_ACCESS_DENIED, "expected success or access denied, got %i\n", ret); + if (ret == ERROR_SUCCESS) + { + ok(hkey != NULL, "RegOpenKeyExA succeeded but returned NULL hkey\n"); + RegCloseKey(hkey); + } + else + { + ok(hkey == NULL, "RegOpenKeyExA failed but returned hkey %p\n", hkey); + limited_user = TRUE; + trace("running as limited user\n"); + } } #define lok ok_(__FILE__, line) @@ -412,6 +438,37 @@ ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); ret = RegSetValueExW(hkey_main, name2W, 0, REG_DWORD, (const BYTE *)1, 1); ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + + /* RegSetKeyValue */ + if (!pRegSetKeyValueW) + win_skip("RegSetKeyValue() is not supported.\n"); + else + { + static const WCHAR subkeyW[] = {'s','u','b','k','e','y',0}; + DWORD len, type; + HKEY subkey; + + ret = pRegSetKeyValueW(hkey_main, NULL, name1W, REG_SZ, (const BYTE*)string2W, sizeof(string2W)); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + test_hkey_main_Value_A(name1A, string2A, sizeof(string2A)); + test_hkey_main_Value_W(name1W, string2W, sizeof(string2W)); + + ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_SZ, string1W, sizeof(string1W)); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = RegOpenKeyExW(hkey_main, subkeyW, 0, KEY_QUERY_VALUE, &subkey); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + type = len = 0; + ret = RegQueryValueExW(subkey, name1W, 0, &type, NULL, &len); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(len == sizeof(string1W), "got %d\n", len); + ok(type == REG_SZ, "got type %d\n", type); + + ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_SZ, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + RegCloseKey(subkey); + } } static void create_test_entries(void) @@ -1000,13 +1057,21 @@ ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, NULL, 0, KEY_WOW64_32KEY | KEY_ALL_ACCESS, NULL, &hkRoot32, NULL); - ok(ret == ERROR_SUCCESS && hkRoot32 != NULL, - "RegCreateKeyEx with KEY_WOW64_32KEY failed (err=%u)\n", ret); + if (limited_user) + ok(ret == ERROR_ACCESS_DENIED && hkRoot32 == NULL, + "RegCreateKeyEx with KEY_WOW64_32KEY failed (err=%u)\n", ret); + else + ok(ret == ERROR_SUCCESS && hkRoot32 != NULL, + "RegCreateKeyEx with KEY_WOW64_32KEY failed (err=%u)\n", ret); ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, NULL, 0, KEY_WOW64_64KEY | KEY_ALL_ACCESS, NULL, &hkRoot64, NULL); - ok(ret == ERROR_SUCCESS && hkRoot64 != NULL, - "RegCreateKeyEx with KEY_WOW64_64KEY failed (err=%u)\n", ret); + if (limited_user) + ok(ret == ERROR_ACCESS_DENIED && hkRoot64 == NULL, + "RegCreateKeyEx with KEY_WOW64_64KEY failed (err=%u)\n", ret); + else + ok(ret == ERROR_SUCCESS && hkRoot64 != NULL, + "RegCreateKeyEx with KEY_WOW64_64KEY failed (err=%u)\n", ret); bRet = AllocateAndInitializeSid(&sid_authority, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &world_sid); @@ -1035,26 +1100,34 @@ ok(bRet == TRUE, "Expected SetSecurityDescriptorDacl to return TRUE, got %d, last error %u\n", bRet, GetLastError()); - /* The "sanctioned" methods of setting a registry ACL aren't implemented in Wine. */ - bRet = SetKernelObjectSecurity(hkRoot64, DACL_SECURITY_INFORMATION, sd); - ok(bRet == TRUE, - "Expected SetKernelObjectSecurity to return TRUE, got %d, last error %u\n", bRet, GetLastError()); - - bRet = SetKernelObjectSecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); - ok(bRet == TRUE, - "Expected SetKernelObjectSecurity to return TRUE, got %d, last error %u\n", bRet, GetLastError()); - - hkResult = NULL; - ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, KEY_WOW64_64KEY | KEY_READ, &hkResult); - ok(ret == ERROR_SUCCESS && hkResult != NULL, - "RegOpenKeyEx with KEY_WOW64_64KEY failed (err=%u)\n", ret); - RegCloseKey(hkResult); - - hkResult = NULL; - ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, KEY_WOW64_32KEY | KEY_READ, &hkResult); - ok(ret == ERROR_SUCCESS && hkResult != NULL, - "RegOpenKeyEx with KEY_WOW64_32KEY failed (err=%u)\n", ret); - RegCloseKey(hkResult); + if (limited_user) + { + skip("not enough privileges to modify HKLM\n"); + } + else + { + LONG error; + + error = RegSetKeySecurity(hkRoot64, DACL_SECURITY_INFORMATION, sd); + ok(error == ERROR_SUCCESS, + "Expected RegSetKeySecurity to return success, got error %u\n", error); + + bRet = RegSetKeySecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); + ok(error == ERROR_SUCCESS, + "Expected RegSetKeySecurity to return success, got error %u\n", error); + + hkResult = NULL; + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, KEY_WOW64_64KEY | KEY_READ, &hkResult); + ok(ret == ERROR_SUCCESS && hkResult != NULL, + "RegOpenKeyEx with KEY_WOW64_64KEY failed (err=%u)\n", ret); + RegCloseKey(hkResult); + + hkResult = NULL; + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, KEY_WOW64_32KEY | KEY_READ, &hkResult); + ok(ret == ERROR_SUCCESS && hkResult != NULL, + "RegOpenKeyEx with KEY_WOW64_32KEY failed (err=%u)\n", ret); + RegCloseKey(hkResult); + } HeapFree(GetProcessHeap(), 0, sd); LocalFree(key_acl); @@ -1146,13 +1219,21 @@ ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, NULL, 0, KEY_WOW64_32KEY | KEY_ALL_ACCESS, NULL, &hkRoot32, NULL); - ok(ret == ERROR_SUCCESS && hkRoot32 != NULL, - "RegCreateKeyEx with KEY_WOW64_32KEY failed (err=%d)\n", ret); + if (limited_user) + ok(ret == ERROR_ACCESS_DENIED && hkRoot32 == NULL, + "RegCreateKeyEx with KEY_WOW64_32KEY failed (err=%d)\n", ret); + else + ok(ret == ERROR_SUCCESS && hkRoot32 != NULL, + "RegCreateKeyEx with KEY_WOW64_32KEY failed (err=%d)\n", ret); ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, NULL, 0, KEY_WOW64_64KEY | KEY_ALL_ACCESS, NULL, &hkRoot64, NULL); - ok(ret == ERROR_SUCCESS && hkRoot64 != NULL, - "RegCreateKeyEx with KEY_WOW64_64KEY failed (err=%d)\n", ret); + if (limited_user) + ok(ret == ERROR_ACCESS_DENIED && hkRoot64 == NULL, + "RegCreateKeyEx with KEY_WOW64_64KEY failed (err=%d)\n", ret); + else + ok(ret == ERROR_SUCCESS && hkRoot64 != NULL, + "RegCreateKeyEx with KEY_WOW64_64KEY failed (err=%d)\n", ret); bRet = AllocateAndInitializeSid(&sid_authority, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &world_sid); @@ -1169,7 +1250,7 @@ access.Trustee.ptstrName = (char *)world_sid; dwRet = SetEntriesInAclA(1, &access, NULL, &key_acl); - ok(ret == ERROR_SUCCESS, + ok(dwRet == ERROR_SUCCESS, "Expected SetEntriesInAclA to return ERROR_SUCCESS, got %u, last error %u\n", dwRet, GetLastError()); sd = HeapAlloc(GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH); @@ -1181,28 +1262,34 @@ ok(bRet == TRUE, "Expected SetSecurityDescriptorDacl to return TRUE, got %d, last error %u\n", bRet, GetLastError()); - /* The "sanctioned" methods of setting a registry ACL aren't implemented in Wine. */ - bRet = SetKernelObjectSecurity(hkRoot64, DACL_SECURITY_INFORMATION, sd); - ok(bRet == TRUE, - "Expected SetKernelObjectSecurity to return TRUE, got %d, last error %u\n", bRet, GetLastError()); - - bRet = SetKernelObjectSecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); - ok(bRet == TRUE, - "Expected SetKernelObjectSecurity to return TRUE, got %d, last error %u\n", bRet, GetLastError()); - - hkey1 = NULL; - ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, NULL, 0, - KEY_WOW64_64KEY | KEY_READ, NULL, &hkey1, NULL); - ok(ret == ERROR_SUCCESS && hkey1 != NULL, - "RegOpenKeyEx with KEY_WOW64_64KEY failed (err=%u)\n", ret); - RegCloseKey(hkey1); - - hkey1 = NULL; - ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, NULL, 0, - KEY_WOW64_32KEY | KEY_READ, NULL, &hkey1, NULL); - ok(ret == ERROR_SUCCESS && hkey1 != NULL, - "RegOpenKeyEx with KEY_WOW64_32KEY failed (err=%u)\n", ret); - RegCloseKey(hkey1); + if (limited_user) + { + skip("not enough privileges to modify HKLM\n"); + } + else + { + ret = RegSetKeySecurity(hkRoot64, DACL_SECURITY_INFORMATION, sd); + ok(ret == ERROR_SUCCESS, + "Expected RegSetKeySecurity to return success, got error %u\n", ret); + + ret = RegSetKeySecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); + ok(ret == ERROR_SUCCESS, + "Expected RegSetKeySecurity to return success, got error %u\n", ret); + + hkey1 = NULL; + ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, NULL, 0, + KEY_WOW64_64KEY | KEY_READ, NULL, &hkey1, NULL); + ok(ret == ERROR_SUCCESS && hkey1 != NULL, + "RegOpenKeyEx with KEY_WOW64_64KEY failed (err=%u)\n", ret); + RegCloseKey(hkey1); + + hkey1 = NULL; + ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, NULL, 0, + KEY_WOW64_32KEY | KEY_READ, NULL, &hkey1, NULL); + ok(ret == ERROR_SUCCESS && hkey1 != NULL, + "RegOpenKeyEx with KEY_WOW64_32KEY failed (err=%u)\n", ret); + RegCloseKey(hkey1); + } HeapFree(GetProcessHeap(), 0, sd); LocalFree(key_acl); @@ -2719,12 +2806,63 @@ "expect ERROR_FILE_NOT_FOUND, got %i\n", res); } +static void test_delete_key_value(void) +{ + HKEY subkey; + LONG ret; + + if (!pRegDeleteKeyValueA) + { + win_skip("RegDeleteKeyValue is not available.\n"); + return; + } + + ret = pRegDeleteKeyValueA(NULL, NULL, NULL); + ok(ret == ERROR_INVALID_HANDLE, "got %d\n", ret); + + ret = pRegDeleteKeyValueA(hkey_main, NULL, NULL); + ok(ret == ERROR_FILE_NOT_FOUND, "got %d\n", ret); + + ret = RegSetValueExA(hkey_main, "test", 0, REG_SZ, (const BYTE*)"value", 6); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = RegQueryValueExA(hkey_main, "test", NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + /* NULL subkey name means delete from open key */ + ret = pRegDeleteKeyValueA(hkey_main, NULL, "test"); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = RegQueryValueExA(hkey_main, "test", NULL, NULL, NULL, NULL); + ok(ret == ERROR_FILE_NOT_FOUND, "got %d\n", ret); + + /* now with real subkey */ + ret = RegCreateKeyExA(hkey_main, "Subkey1", 0, NULL, 0, KEY_WRITE|KEY_READ, NULL, &subkey, NULL); + ok(!ret, "failed with error %d\n", ret); + + ret = RegSetValueExA(subkey, "test", 0, REG_SZ, (const BYTE*)"value", 6); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = RegQueryValueExA(subkey, "test", NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = pRegDeleteKeyValueA(hkey_main, "Subkey1", "test"); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = RegQueryValueExA(subkey, "test", NULL, NULL, NULL, NULL); + ok(ret == ERROR_FILE_NOT_FOUND, "got %d\n", ret); + + RegDeleteKeyA(subkey, ""); + RegCloseKey(subkey); +} + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ InitFunctionPtrs(); setup_main_key(); + check_user_privs(); test_set_value(); create_test_entries(); test_enum_value(); @@ -2758,6 +2896,7 @@ test_rw_order(); test_deleted_key(); test_delete_value(); + test_delete_key_value(); /* cleanup */ delete_key( hkey_main ); Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… ============================================================================== --- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Fri Oct 17 13:36:13 2014 @@ -211,6 +211,68 @@ myARGC = winetest_get_mainargs( &myARGV ); } +static SECURITY_DESCRIPTOR* test_get_security_descriptor(HANDLE handle, int line) +{ + /* use HeapFree(GetProcessHeap(), 0, sd); when done */ + DWORD ret, length, needed; + SECURITY_DESCRIPTOR *sd; + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + NULL, 0, &needed); + ok_(__FILE__, line)(!ret, "GetKernelObjectSecurity should fail\n"); + ok_(__FILE__, line)(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok_(__FILE__, line)(needed != 0xdeadbeef, "GetKernelObjectSecurity should return required buffer length\n"); + + length = needed; + sd = HeapAlloc(GetProcessHeap(), 0, length); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + sd, length, &needed); + ok_(__FILE__, line)(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); + ok_(__FILE__, line)(needed == length || needed == 0 /* file, pipe */, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); + return sd; +} + +static void test_owner_equal(HANDLE Handle, PSID expected, int line) +{ + BOOL res; + SECURITY_DESCRIPTOR *queriedSD = NULL; + PSID owner; + BOOL owner_defaulted; + + queriedSD = test_get_security_descriptor( Handle, line ); + + res = GetSecurityDescriptorOwner(queriedSD, &owner, &owner_defaulted); + ok_(__FILE__, line)(res, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + + ok_(__FILE__, line)(EqualSid(owner, expected), "Owner SIDs are not equal\n"); + ok_(__FILE__, line)(!owner_defaulted, "Defaulted is true\n"); + + HeapFree(GetProcessHeap(), 0, queriedSD); +} + +static void test_group_equal(HANDLE Handle, PSID expected, int line) +{ + BOOL res; + SECURITY_DESCRIPTOR *queriedSD = NULL; + PSID group; + BOOL group_defaulted; + + queriedSD = test_get_security_descriptor( Handle, line ); + + res = GetSecurityDescriptorGroup(queriedSD, &group, &group_defaulted); + ok_(__FILE__, line)(res, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + + ok_(__FILE__, line)(EqualSid(group, expected), "Group SIDs are not equal\n"); + ok_(__FILE__, line)(!group_defaulted, "Defaulted is true\n"); + + HeapFree(GetProcessHeap(), 0, queriedSD); +} + static void test_sid(void) { struct sidRef refs[] = { @@ -2481,6 +2543,8 @@ SECURITY_ATTRIBUTES psa; HANDLE token, event; DWORD size; + SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY }; + PSID EveryoneSid = NULL; Acl = HeapAlloc(GetProcessHeap(), 0, 256); res = InitializeAcl(Acl, 256, ACL_REVISION); @@ -2491,6 +2555,9 @@ return; } ok(res, "InitializeAcl failed with error %d\n", GetLastError()); + + res = AllocateAndInitializeSid( &SIDAuthWorld, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &EveryoneSid); + ok(res, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); /* get owner from the token we might be running as a user not admin */ res = OpenProcessToken( GetCurrentProcess(), MAXIMUM_ALLOWED, &token ); @@ -2550,7 +2617,7 @@ CHECK_SET_SECURITY( event, GROUP_SECURITY_INFORMATION, ERROR_INVALID_SECURITY_DESCR ); CHECK_SET_SECURITY( event, SACL_SECURITY_INFORMATION, ERROR_ACCESS_DENIED ); CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS ); - /* NULL DACL is valid and means default DACL from token */ + /* NULL DACL is valid and means that everyone has access */ SecurityDescriptor->Control |= SE_DACL_PRESENT; CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS ); @@ -2558,12 +2625,31 @@ res = SetSecurityDescriptorOwner(SecurityDescriptor, AdminSid, FALSE); ok(res, "SetSecurityDescriptorOwner failed with error %d\n", GetLastError()); CHECK_SET_SECURITY( event, OWNER_SECURITY_INFORMATION, ERROR_SUCCESS ); + test_owner_equal( event, AdminSid, __LINE__ ); + + res = SetSecurityDescriptorGroup(SecurityDescriptor, EveryoneSid, FALSE); + ok(res, "SetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + CHECK_SET_SECURITY( event, GROUP_SECURITY_INFORMATION, ERROR_SUCCESS ); + test_group_equal( event, EveryoneSid, __LINE__ ); + + res = SetSecurityDescriptorDacl(SecurityDescriptor, TRUE, Acl, FALSE); + ok(res, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS ); + /* setting a dacl should not change the owner or group */ + test_owner_equal( event, AdminSid, __LINE__ ); + test_group_equal( event, EveryoneSid, __LINE__ ); + + /* Test again with a different SID in case the previous SID also happens to + * be the one that is incorrectly replacing the group. */ res = SetSecurityDescriptorGroup(SecurityDescriptor, UsersSid, FALSE); ok(res, "SetSecurityDescriptorGroup failed with error %d\n", GetLastError()); CHECK_SET_SECURITY( event, GROUP_SECURITY_INFORMATION, ERROR_SUCCESS ); + test_group_equal( event, UsersSid, __LINE__ ); + res = SetSecurityDescriptorDacl(SecurityDescriptor, TRUE, Acl, FALSE); ok(res, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError()); CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS ); + test_group_equal( event, UsersSid, __LINE__ ); sprintf(buffer, "%s tests/security.c test", myARGV[0]); memset(&startup, 0, sizeof(startup)); @@ -2582,6 +2668,7 @@ STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); winetest_wait_child_process( info.hProcess ); + FreeSid(EveryoneSid); CloseHandle( info.hProcess ); CloseHandle( info.hThread ); CloseHandle( event ); @@ -3127,6 +3214,7 @@ ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); } + LocalFree(pSD); done: HeapFree(GetProcessHeap(), 0, user); @@ -3234,10 +3322,12 @@ NULL, NULL, NULL, NULL, NULL); ok(error==ERROR_INVALID_PARAMETER, "GetNamedSecurityInfo failed with error %d\n", error); + pDacl = NULL; error = pGetNamedSecurityInfoA(windows_dir, SE_FILE_OBJECT,DACL_SECURITY_INFORMATION, - NULL, NULL, &pDacl, NULL, NULL); + NULL, NULL, &pDacl, NULL, &pSD); ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); ok(pDacl != NULL, "DACL should not be NULL\n"); + LocalFree(pSD); error = pGetNamedSecurityInfoA(windows_dir, SE_FILE_OBJECT,OWNER_SECURITY_INFORMATION, NULL, NULL, &pDacl, NULL, NULL); @@ -3953,7 +4043,7 @@ NULL, NULL, pDacl, NULL); ok(ret == ERROR_SUCCESS, "SetSecurityInfo returned %d\n", ret); ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, - NULL, NULL, &pDacl, NULL, NULL); + NULL, NULL, &pDacl, NULL, &pSD); ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); ok(pDacl && IsValidAcl(pDacl), "GetSecurityInfo returned invalid DACL.\n"); bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); @@ -3980,6 +4070,7 @@ ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); } + LocalFree(pSD); CloseHandle(obj); } @@ -4431,29 +4522,12 @@ static void test_default_handle_security(HANDLE token, HANDLE handle, GENERIC_MAPPING *mapping) { - DWORD ret, length, needed, granted, priv_set_len; + DWORD ret, granted, priv_set_len; BOOL status; PRIVILEGE_SET priv_set; SECURITY_DESCRIPTOR *sd; - needed = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - NULL, 0, &needed); - ok(!ret, "GetKernelObjectSecurity should fail\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - ok(needed != 0xdeadbeef, "GetKernelObjectSecurity should return required buffer length\n"); - - length = needed; - sd = HeapAlloc(GetProcessHeap(), 0, length); - - needed = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - sd, length, &needed); - ok(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); - ok(needed == length || needed == 0 /* file, pipe */, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); - + sd = test_get_security_descriptor(handle, __LINE__); validate_default_security_descriptor(sd); priv_set_len = sizeof(priv_set); @@ -5072,12 +5146,16 @@ { case GENERIC_READ: case GENERIC_EXECUTE: - ok(access == map[i].mapped || access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */, + ok(access == map[i].mapped || + access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */ || + access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION | THREAD_RESUME) /* win8 */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_WRITE: todo_wine - ok(access == map[i].mapped || access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION) /* Vista+ */, + ok(access == map[i].mapped || + access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION) /* Vista+ */ || + access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION | THREAD_RESUME) /* win8 */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_ALL: @@ -5143,7 +5221,9 @@ "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_WRITE: - ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */, + ok(access == map[i].mapped || + access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */ || + access == (map[i].mapped | PROCESS_SET_LIMITED_INFORMATION) /* win8 */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_EXECUTE: @@ -5334,7 +5414,7 @@ ret = GetSecurityDescriptorOwner( sd, &owner, &defaulted ); ok( ret, "error %u\n", GetLastError() ); ok( owner != (void *)0xdeadbeef, "owner not set\n" ); - todo_wine ok( !defaulted, "owner defaulted\n" ); + ok( !defaulted, "owner defaulted\n" ); dacl = (void *)0xdeadbeef; present = FALSE; @@ -5343,7 +5423,7 @@ ok( ret, "error %u\n", GetLastError() ); ok( present, "dacl not present\n" ); ok( dacl != (void *)0xdeadbeef, "dacl not set\n" ); - todo_wine ok( !defaulted, "dacl defaulted\n" ); + ok( !defaulted, "dacl defaulted\n" ); index = 0; found = FALSE; Modified: trunk/rostests/winetests/advapi32/service.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/servic… ============================================================================== --- trunk/rostests/winetests/advapi32/service.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/service.c [iso-8859-1] Fri Oct 17 13:36:13 2014 @@ -139,6 +139,7 @@ ok(GetLastError() == ERROR_INVALID_ADDRESS /* W2K, XP, W2K3, Vista */ || GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */, "Expected ERROR_INVALID_ADDRESS or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + CloseServiceHandle(scm_handle); /* Nonexistent service */ scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); @@ -189,7 +190,7 @@ static void test_create_delete_svc(void) { - SC_HANDLE scm_handle, svc_handle1; + SC_HANDLE scm_handle, svc_handle1, svc_handle2; CHAR username[UNLEN + 1], domain[MAX_PATH]; DWORD user_size = UNLEN + 1; CHAR account[UNLEN + 3]; @@ -413,6 +414,11 @@ SetLastError(0xdeadbeef); ret = DeleteService(svc_handle1); ok(ret, "Expected success, got error %u\n", GetLastError()); + + /* Service is marked for delete, but handle is still open. Try to open service again. */ + svc_handle2 = OpenServiceA(scm_handle, servicename, GENERIC_READ); + ok(svc_handle2 != NULL, "got %p, error %u\n", svc_handle2, GetLastError()); + CloseServiceHandle(svc_handle2); CloseServiceHandle(svc_handle1); CloseServiceHandle(scm_handle); @@ -1843,8 +1849,9 @@ if (!is_nt4) { retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, NULL, - NULL, &dacl, NULL, NULL); + NULL, &dacl, NULL, &pSD); ok(retval == ERROR_SUCCESS, "Expected GetSecurityInfo to succeed: result %d\n", retval); + LocalFree(pSD); SetLastError(0xdeadbeef); retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, NULL); @@ -2348,19 +2355,9 @@ svc_handle5 = CreateServiceA(scm_handle, servicename, NULL, GENERIC_ALL, SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS, SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); - todo_wine - { ok(!svc_handle5, "Expected failure\n"); ok(GetLastError() == ERROR_SERVICE_MARKED_FOR_DELETE, "Expected ERROR_SERVICE_MARKED_FOR_DELETE, got %d\n", GetLastError()); - } - - /* FIXME: Remove this when Wine is fixed */ - if (svc_handle5) - { - DeleteService(svc_handle5); - CloseServiceHandle(svc_handle5); - } /* Close all the handles to the service and try again */ ret = CloseServiceHandle(svc_handle4);

9 years, 11 months

[akhaldi] 64783: [PSDK] * Add missing PROCESS_SET_LIMITED_INFORMATION and THREAD_RESUME.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Oct 17 13:35:59 2014 New Revision: 64783 URL: http://svn.reactos.org/svn/reactos?rev=64783&view=rev Log: [PSDK] * Add missing PROCESS_SET_LIMITED_INFORMATION and THREAD_RESUME. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Fri Oct 17 13:35:59 2014 @@ -1709,6 +1709,10 @@ #define THREAD_BASE_PRIORITY_MAX 2 #define THREAD_BASE_PRIORITY_MIN (-2) #define THREAD_BASE_PRIORITY_IDLE (-15) + +#define PROCESS_SET_LIMITED_INFORMATION 0x2000 +#define THREAD_RESUME 0x1000 + /* * To prevent gcc compiler warnings, bracket these defines when initialising * a SID_IDENTIFIER_AUTHORITY, eg.

9 years, 11 months

← Newer
1
...
35
36
37
38
39
40
41
...
73
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 October 2014