Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[hbelusca] 66963: [NTVDM]: Introduce the possibility to compile multiple x86-16bit ASM files by using the trick of concatenating them in correct order so that the resulting file is a compilable ASM...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 29 14:51:14 2015 New Revision: 66963 URL: http://svn.reactos.org/svn/reactos?rev=66963&view=rev Log: [NTVDM]: Introduce the possibility to compile multiple x86-16bit ASM files by using the trick of concatenating them in correct order so that the resulting file is a compilable ASM file. (We cannot do linking or 16-bit objects, so we need to take a middle approach). CORE-9442 #resolve Added: trunk/reactos/subsystems/mvdm/asm16.cmake (with props) Modified: trunk/reactos/subsystems/mvdm/CMakeLists.txt Modified: trunk/reactos/subsystems/mvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/CMakeLists… ============================================================================== --- trunk/reactos/subsystems/mvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/CMakeLists.txt [iso-8859-1] Sun Mar 29 14:51:14 2015 @@ -1,3 +1,6 @@ + +## Experimental 16-bit ASM compilation support +include(asm16.cmake) add_subdirectory(config) #add_subdirectory(dos) Added: trunk/reactos/subsystems/mvdm/asm16.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/asm16.cmak… ============================================================================== --- trunk/reactos/subsystems/mvdm/asm16.cmake (added) +++ trunk/reactos/subsystems/mvdm/asm16.cmake [iso-8859-1] Sun Mar 29 14:51:14 2015 @@ -0,0 +1,121 @@ +## EXPERIMENTAL!! + +# We need to use almost the same tricks as the ones used for MSVC 'add_asm_files' +# support because we are going to compile ASM files for a fixed target (16-bit x86) +# that is different from the main target. + +if(NOT MSVC) +### +### For GCC +### +function(add_asm16_bin _target _binary_file _base_address) + set(_concatenated_asm_file ${CMAKE_CURRENT_BINARY_DIR}/${_target}.asm) + set(_object_file ${CMAKE_CURRENT_BINARY_DIR}/${_target}.o) + + # unset(_source_file_list) + + get_defines(_directory_defines) + get_includes(_directory_includes) + get_directory_property(_defines COMPILE_DEFINITIONS) + + # Build a list of all the defines needed. + foreach(_source_file ${ARGN}) + get_filename_component(_source_file_full_path ${_source_file} ABSOLUTE) + get_source_file_property(_defines_semicolon_list ${_source_file_full_path} COMPILE_DEFINITIONS) + + # unset(_source_file_defines) + + foreach(_define ${_defines_semicolon_list}) + if(NOT ${_define} STREQUAL "NOTFOUND") + list(APPEND _source_file_defines -D${_define}) + endif() + endforeach() + + list(APPEND _source_file_list ${_source_file_full_path}) + endforeach() + + # We do not support 16-bit ASM linking so the only way to compile + # many ASM files is by concatenating them into a single one and + # compile the resulting file. + concatenate_files(${_concatenated_asm_file} ${_source_file_list}) + + ## + ## All this part is the same as CreateBootSectorTarget + ## + add_custom_command( + OUTPUT ${_object_file} + COMMAND ${CMAKE_ASM_COMPILER} -x assembler-with-cpp -o ${_object_file} -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} -D__ASM__ -c ${_concatenated_asm_file} + DEPENDS ${_concatenated_asm_file}) + + add_custom_command( + OUTPUT ${_binary_file} + COMMAND native-obj2bin ${_object_file} ${_binary_file} ${_base_address} + # COMMAND objcopy --output-target binary --image-base 0x${_base_address} ${_object_file} ${_binary_file} + DEPENDS ${_object_file} native-obj2bin) + + set_source_files_properties(${_object_file} ${_binary_file} PROPERTIES GENERATED TRUE) + + add_custom_target(${_target} ALL DEPENDS ${_binary_file}) +endfunction() + +else() +### +### For MSVC +### +function(add_asm16_bin _target _binary_file _base_address) + set(_concatenated_asm_file ${CMAKE_CURRENT_BINARY_DIR}/${_target}.asm) + set(_preprocessed_asm_file ${CMAKE_CURRENT_BINARY_DIR}/${_target}.tmp) + set(_object_file ${CMAKE_CURRENT_BINARY_DIR}/${_target}.obj) + + # unset(_source_file_list) + + get_defines(_directory_defines) + get_includes(_directory_includes) + get_directory_property(_defines COMPILE_DEFINITIONS) + + # Build a list of all the defines needed. + foreach(_source_file ${ARGN}) + get_filename_component(_source_file_full_path ${_source_file} ABSOLUTE) + get_source_file_property(_defines_semicolon_list ${_source_file_full_path} COMPILE_DEFINITIONS) + + # unset(_source_file_defines) + + foreach(_define ${_defines_semicolon_list}) + if(NOT ${_define} STREQUAL "NOTFOUND") + list(APPEND _source_file_defines -D${_define}) + endif() + endforeach() + + list(APPEND _source_file_list ${_source_file_full_path}) + endforeach() + + # We do not support 16-bit ASM linking so the only way to compile + # many ASM files is by concatenating them into a single one and + # compile the resulting file. + concatenate_files(${_concatenated_asm_file} ${_source_file_list}) + + ## + ## All this part is the same as CreateBootSectorTarget + ## + if(ARCH STREQUAL "arm") + set(_pp_asm16_compile_command ${CMAKE_ASM16_COMPILER} -nologo -o ${_object_file} ${_preprocessed_asm_file}) + else() + set(_pp_asm16_compile_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_preprocessed_asm_file}) + endif() + + add_custom_command( + OUTPUT ${_preprocessed_asm_file} ${_object_file} + COMMAND ${CMAKE_C_COMPILER} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_concatenated_asm_file} > ${_preprocessed_asm_file} && ${_pp_asm16_compile_command} + DEPENDS ${_concatenated_asm_file}) + + add_custom_command( + OUTPUT ${_binary_file} + COMMAND native-obj2bin ${_object_file} ${_binary_file} ${_base_address} + DEPENDS ${_object_file} native-obj2bin) + + set_source_files_properties(${_object_file} ${_preprocessed_asm_file} ${_binary_file} PROPERTIES GENERATED TRUE) + + add_custom_target(${_target} ALL DEPENDS ${_binary_file}) +endfunction() + +endif() Propchange: trunk/reactos/subsystems/mvdm/asm16.cmake ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 5 months

[gadamopoulos] 66962: [TEST.H] - Add an additional new line before showing the test results. Some log commands print their lines in multiple print commands. As a result the results line can end up ...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Mar 29 14:51:02 2015 New Revision: 66962 URL: http://svn.reactos.org/svn/reactos?rev=66962&view=rev Log: [TEST.H] - Add an additional new line before showing the test results. Some log commands print their lines in multiple print commands. As a result the results line can end up in the middle of a previous log that was not a complete line. This confuses testman and causes it to report this test as a crashed test as it can't find the line with the results. This is not the best fix possible but makes sure that the results in testman fluctuate a bit less. Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Sun Mar 29 14:51:02 2015 @@ -617,7 +617,7 @@ /* show test results even if traces are disabled */ /*if (winetest_debug)*/ { - fprintf( stdout, "%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + fprintf( stdout, "\n%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", test->name, successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure",

9 years, 5 months

[akhaldi] 66961: [SAMSRV] Add Italian translation. By Carlo Bramini. CORE-9438

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 29 14:47:40 2015 New Revision: 66961 URL: http://svn.reactos.org/svn/reactos?rev=66961&view=rev Log: [SAMSRV] Add Italian translation. By Carlo Bramini. CORE-9438 Added: trunk/reactos/dll/win32/samsrv/lang/it-IT.rc (with props) Modified: trunk/reactos/dll/win32/samsrv/samsrv.rc Added: trunk/reactos/dll/win32/samsrv/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/samsrv/lang/it-IT.rc (added) +++ trunk/reactos/dll/win32/samsrv/lang/it-IT.rc [iso-8859-1] Sun Mar 29 14:47:40 2015 @@ -0,0 +1,25 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_DOMAIN_BUILTIN_NAME "Builtin" + IDS_GROUP_NONE_NAME "Nessuno" + IDS_GROUP_NONE_COMMENT "Utente normale" + IDS_ALIAS_ADMINISTRATORS_NAME "Amministratori" + IDS_ALIAS_ADMINISTRATORS_COMMENT "Gli amministratori hanno accesso illimitato al computer o al dominio." + IDS_ALIAS_GUESTS_NAME "Ospiti" + IDS_ALIAS_GUESTS_COMMENT "Gli ospiti hanno gli stessi diritti dei membri del gruppo Users per impostazione predefinita." + IDS_ALIAS_POWER_USERS_NAME "Utenti avanzati" + IDS_ALIAS_POWER_USERS_COMMENT "Gli utenti avanzati hanno la maggior parte dei diritti amministrativi con alcune restrizioni." + IDS_ALIAS_USERS_NAME "Utente" + IDS_ALIAS_USERS_COMMENT "Gli utenti non possono apportare modifiche a livello di sistema." + /* + * ATTENTION: + * If you translate the administator account name, keep IDS_USER_ADMINISTRATOR_NAME and + * syssetup.dll:IDS_ADMINISTRATOR_NAME synchronized. + */ + IDS_USER_ADMINISTRATOR_NAME "Administrator" + IDS_USER_ADMINISTRATOR_COMMENT "Account utilizzato per amministrare il computer o il dominio." + IDS_USER_GUEST_NAME "Guest" + IDS_USER_GUEST_COMMENT "Account utilizzato dagli ospiti per l'accesso al computer o al dominio." +END Propchange: trunk/reactos/dll/win32/samsrv/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/samsrv/samsrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.rc… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.rc [iso-8859-1] Sun Mar 29 14:47:40 2015 @@ -31,6 +31,9 @@ #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

9 years, 5 months

[tfaber] 66960: [NTDLL_APITEST] - Also test decreasing the size in RtlReAllocateHeap. Patch by Mark Jansen. CORE-9441

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Mar 29 14:47:21 2015 New Revision: 66960 URL: http://svn.reactos.org/svn/reactos?rev=66960&view=rev Log: [NTDLL_APITEST] - Also test decreasing the size in RtlReAllocateHeap. Patch by Mark Jansen. CORE-9441 Modified: trunk/rostests/apitests/ntdll/RtlReAllocateHeap.c Modified: trunk/rostests/apitests/ntdll/RtlReAllocateHeap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlReAlloc… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlReAllocateHeap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlReAllocateHeap.c [iso-8859-1] Sun Mar 29 14:47:21 2015 @@ -6,8 +6,6 @@ */ #include <apitest.h> - -#define WIN32_NO_STATUS #include <ndk/rtlfuncs.h> static @@ -29,12 +27,48 @@ return TRUE; } +static +BOOLEAN +ReAllocBuffer( + PUCHAR *Buffer, + SIZE_T Size, + SIZE_T *OldSizePtr, + PCSTR Action) +{ + PUCHAR NewBuffer; + SIZE_T OldSize = *OldSizePtr; + + RtlFillMemory(*Buffer, OldSize, 0x7a); + NewBuffer = RtlReAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + *Buffer, + Size); + if (!NewBuffer) + { + skip("RtlReAllocateHeap failed for size %lu (%s)\n", Size, Action); + return FALSE; + } + *Buffer = NewBuffer; + ok_hex(RtlSizeHeap(RtlGetProcessHeap(), 0, NewBuffer), Size); + if (OldSize < Size) + { + ok(CheckBuffer(NewBuffer, OldSize, 0x7a), "CheckBuffer failed at size 0x%lx -> 0x%lx\n", OldSize, Size); + ok(CheckBuffer(NewBuffer + OldSize, Size - OldSize, 0), "HEAP_ZERO_MEMORY not respected for 0x%lx -> 0x%lx\n", OldSize, Size); + } + else + { + ok(CheckBuffer(NewBuffer, Size, 0x7a), "CheckBuffer failed at size 0x%lx -> 0x%lx\n", OldSize, Size); + } + *OldSizePtr = Size; + return TRUE; +} + START_TEST(RtlReAllocateHeap) { PUCHAR Buffer = NULL; - PUCHAR NewBuffer; SIZE_T OldSize = 0; SIZE_T Size; + BOOLEAN Continue = TRUE; OldSize = 0x100; Buffer = RtlReAllocateHeap(RtlGetProcessHeap(), @@ -55,24 +89,15 @@ } ok(CheckBuffer(Buffer, OldSize, 0), "HEAP_ZERO_MEMORY not respected for 0x%lx\n", OldSize); - for (Size = 0x78000; Size < 0x90000; Size += 0x100) + for (Size = 0x78000; Size < 0x90000 && Continue; Size += 0x100) { - RtlFillMemory(Buffer, OldSize, 0x7a); - NewBuffer = RtlReAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - Buffer, - Size); - if (!NewBuffer) - { - skip("RtlReAllocateHeap failed for size %lu\n", Size); - break; - } - Buffer = NewBuffer; - ok_hex(RtlSizeHeap(RtlGetProcessHeap(), 0, Buffer), Size); - ok(CheckBuffer(Buffer, OldSize, 0x7a), "CheckBuffer failed at size 0x%lx -> 0x%lx\n", OldSize, Size); - ok(CheckBuffer(Buffer + OldSize, Size - OldSize, 0), "HEAP_ZERO_MEMORY not respected for 0x%lx -> 0x%lx\n", OldSize, Size); - OldSize = Size; + Continue = ReAllocBuffer(&Buffer, Size, &OldSize, "growing"); + } + + /* and back again */ + for (Size -= 0x100; Size >= 0x78000 && Continue; Size -= 0x100) + { + Continue = ReAllocBuffer(&Buffer, Size, &OldSize, "shrinking"); } RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); } -

9 years, 5 months

[tfaber] 66959: [RTL] - HEAP_ENTRY::Size is in bytes for HEAP_ENTRY_VIRTUAL_ALLOC allocations. Save it accordingly CORE-9441

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Mar 29 14:10:20 2015 New Revision: 66959 URL: http://svn.reactos.org/svn/reactos?rev=66959&view=rev Log: [RTL] - HEAP_ENTRY::Size is in bytes for HEAP_ENTRY_VIRTUAL_ALLOC allocations. Save it accordingly CORE-9441 Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=66959&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sun Mar 29 14:10:20 2015 @@ -427,6 +427,7 @@ /* Get pointer to the containing record */ VirtualEntry = CONTAINING_RECORD(HeapEntry, HEAP_VIRTUAL_ALLOC_ENTRY, BusyBlock); + ASSERT(VirtualEntry->BusyBlock.Size >= sizeof(HEAP_VIRTUAL_ALLOC_ENTRY)); /* Restore the real size */ return VirtualEntry->CommitSize - HeapEntry->Size; @@ -2096,6 +2097,7 @@ /* Initialize the newly allocated block */ VirtualBlock->BusyBlock.Size = (USHORT)(AllocationSize - Size); + ASSERT(VirtualBlock->BusyBlock.Size >= sizeof(HEAP_VIRTUAL_ALLOC_ENTRY)); VirtualBlock->BusyBlock.Flags = EntryFlags | HEAP_ENTRY_VIRTUAL_ALLOC | HEAP_ENTRY_EXTRA_PRESENT; VirtualBlock->CommitSize = AllocationSize; VirtualBlock->ReserveSize = AllocationSize; @@ -2648,7 +2650,8 @@ if (InUseEntry->Flags & HEAP_ENTRY_VIRTUAL_ALLOC) { /* Simple in case of a virtual alloc - just an unused size */ - InUseEntry->Size = (USHORT)((AllocationSize - Size) >> HEAP_ENTRY_SHIFT); + InUseEntry->Size = (USHORT)(AllocationSize - Size); + ASSERT(InUseEntry->Size >= sizeof(HEAP_VIRTUAL_ALLOC_ENTRY)); } else if (InUseEntry->Flags & HEAP_ENTRY_EXTRA_PRESENT) {

9 years, 5 months

[tfaber] 66958: [NTDLL_APITEST] - Add a test for RtlReAllocateHeap -- shows that it doesn't handle allocations larger than 0x7f000 correctly in ROS CORE-9441

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Mar 29 14:07:00 2015 New Revision: 66958 URL: http://svn.reactos.org/svn/reactos?rev=66958&view=rev Log: [NTDLL_APITEST] - Add a test for RtlReAllocateHeap -- shows that it doesn't handle allocations larger than 0x7f000 correctly in ROS CORE-9441 Added: trunk/rostests/apitests/ntdll/RtlReAllocateHeap.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sun Mar 29 14:07:00 2015 @@ -27,6 +27,7 @@ RtlGetLongestNtPathLength.c RtlInitializeBitMap.c RtlMemoryStream.c + RtlReAllocateHeap.c StackOverflow.c SystemInfo.c Timer.c Added: trunk/rostests/apitests/ntdll/RtlReAllocateHeap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlReAlloc… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlReAllocateHeap.c (added) +++ trunk/rostests/apitests/ntdll/RtlReAllocateHeap.c [iso-8859-1] Sun Mar 29 14:07:00 2015 @@ -0,0 +1,78 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for RtlReAllocateHeap + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <ndk/rtlfuncs.h> + +static +BOOLEAN +CheckBuffer( + PVOID Buffer, + SIZE_T Size, + UCHAR Value) +{ + PUCHAR Array = Buffer; + SIZE_T i; + + for (i = 0; i < Size; i++) + if (Array[i] != Value) + { + trace("Expected %x, found %x at offset %lu\n", Value, Array[i], (ULONG)i); + return FALSE; + } + return TRUE; +} + +START_TEST(RtlReAllocateHeap) +{ + PUCHAR Buffer = NULL; + PUCHAR NewBuffer; + SIZE_T OldSize = 0; + SIZE_T Size; + + OldSize = 0x100; + Buffer = RtlReAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + NULL, + OldSize); + ok(Buffer == NULL, "RtlReAllocateHeap succeeded for NULL\n"); + if (Buffer) + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + OldSize); + if (!Buffer) + { + skip("RtlAllocateHeap failed for size %lu\n", OldSize); + return; + } + ok(CheckBuffer(Buffer, OldSize, 0), "HEAP_ZERO_MEMORY not respected for 0x%lx\n", OldSize); + + for (Size = 0x78000; Size < 0x90000; Size += 0x100) + { + RtlFillMemory(Buffer, OldSize, 0x7a); + NewBuffer = RtlReAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + Buffer, + Size); + if (!NewBuffer) + { + skip("RtlReAllocateHeap failed for size %lu\n", Size); + break; + } + Buffer = NewBuffer; + ok_hex(RtlSizeHeap(RtlGetProcessHeap(), 0, Buffer), Size); + ok(CheckBuffer(Buffer, OldSize, 0x7a), "CheckBuffer failed at size 0x%lx -> 0x%lx\n", OldSize, Size); + ok(CheckBuffer(Buffer + OldSize, Size - OldSize, 0), "HEAP_ZERO_MEMORY not respected for 0x%lx -> 0x%lx\n", OldSize, Size); + OldSize = Size; + } + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); +} + Propchange: trunk/rostests/apitests/ntdll/RtlReAllocateHeap.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sun Mar 29 14:07:00 2015 @@ -31,6 +31,7 @@ extern void func_RtlGetLongestNtPathLength(void); extern void func_RtlInitializeBitMap(void); extern void func_RtlMemoryStream(void); +extern void func_RtlReAllocateHeap(void); extern void func_StackOverflow(void); extern void func_TimerResolution(void); @@ -64,6 +65,7 @@ { "RtlGetLongestNtPathLength", func_RtlGetLongestNtPathLength }, { "RtlInitializeBitMap", func_RtlInitializeBitMap }, { "RtlMemoryStream", func_RtlMemoryStream }, + { "RtlReAllocateHeap", func_RtlReAllocateHeap }, { "StackOverflow", func_StackOverflow }, { "TimerResolution", func_TimerResolution },

9 years, 5 months

[akhaldi] 66957: [CSCRIPT] Add missing user32 import lib. Fixes build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 29 13:58:24 2015 New Revision: 66957 URL: http://svn.reactos.org/svn/reactos?rev=66957&view=rev Log: [CSCRIPT] Add missing user32 import lib. Fixes build. Modified: trunk/reactos/base/applications/cmdutils/cscript/CMakeLists.txt Modified: trunk/reactos/base/applications/cmdutils/cscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/cscript/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/cscript/CMakeLists.txt [iso-8859-1] Sun Mar 29 13:58:24 2015 @@ -15,7 +15,7 @@ set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ihost.tlb) target_link_libraries(cscript uuid wine) set_module_type(cscript win32cui UNICODE) -add_importlibs(cscript shell32 oleaut32 ole32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(cscript shell32 oleaut32 ole32 advapi32 user32 msvcrt kernel32 ntdll) add_dependencies(cscript stdole2 cscript_idlheader) add_pch(cscript ${wscript_folder}/wscript.h SOURCE) add_cd_file(TARGET cscript DESTINATION reactos/system32 FOR all)

9 years, 5 months

[akhaldi] 66956: [WSCRIPT_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 29 13:54:08 2015 New Revision: 66956 URL: http://svn.reactos.org/svn/reactos?rev=66956&view=rev Log: [WSCRIPT_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/wscript/run.c Modified: trunk/rostests/winetests/wscript/run.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wscript/run.c?r… ============================================================================== --- trunk/rostests/winetests/wscript/run.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wscript/run.c [iso-8859-1] Sun Mar 29 13:54:08 2015 @@ -256,10 +256,10 @@ ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); V_VT(pVarResult) = VT_BSTR; - res = GetFullPathNameA(script_name, sizeof(fullPath)/sizeof(WCHAR), fullPath, &pos); - if(!res || res > sizeof(fullPath)/sizeof(WCHAR)) + res = GetFullPathNameA(script_name, sizeof(fullPath), fullPath, &pos); + if(!res || res > sizeof(fullPath)) return E_FAIL; - if(!(V_BSTR(pVarResult) = SysAllocString(a2bstr(pos)))) + if(!(V_BSTR(pVarResult) = a2bstr(pos))) return E_OUTOFMEMORY; break; } @@ -272,10 +272,10 @@ ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); V_VT(pVarResult) = VT_BSTR; - res = GetFullPathNameA(script_name, sizeof(fullPath)/sizeof(WCHAR), fullPath, NULL); - if(!res || res > sizeof(fullPath)/sizeof(WCHAR)) + res = GetFullPathNameA(script_name, sizeof(fullPath), fullPath, NULL); + if(!res || res > sizeof(fullPath)) return E_FAIL; - if(!(V_BSTR(pVarResult) = SysAllocString(a2bstr(fullPath)))) + if(!(V_BSTR(pVarResult) = a2bstr(fullPath))) return E_OUTOFMEMORY; break; }

9 years, 5 months

[akhaldi] 66955: [WSCRIPT] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 29 13:53:55 2015 New Revision: 66955 URL: http://svn.reactos.org/svn/reactos?rev=66955&view=rev Log: [WSCRIPT] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/base/applications/cmdutils/wscript/CMakeLists.txt trunk/reactos/base/applications/cmdutils/wscript/host.c trunk/reactos/base/applications/cmdutils/wscript/main.c trunk/reactos/base/applications/cmdutils/wscript/wscript.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/cmdutils/wscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wscript/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wscript/CMakeLists.txt [iso-8859-1] Sun Mar 29 13:53:55 2015 @@ -11,7 +11,7 @@ set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ihost.tlb) target_link_libraries(wscript uuid wine) set_module_type(wscript win32gui UNICODE) -add_importlibs(wscript shell32 oleaut32 ole32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(wscript shell32 oleaut32 ole32 user32 advapi32 msvcrt kernel32 ntdll) add_dependencies(wscript stdole2 wscript_idlheader) add_pch(wscript wscript.h SOURCE) add_cd_file(TARGET wscript DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/wscript/host.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wscript/host.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wscript/host.c [iso-8859-1] Sun Mar 29 13:53:55 2015 @@ -30,6 +30,60 @@ VARIANT_FALSE; #endif +static HRESULT to_string(VARIANT *src, BSTR *dst) +{ + VARIANT v; + HRESULT hres; + + static const WCHAR nullW[] = {'n','u','l','l',0}; + + if(V_VT(src) == VT_NULL) { + *dst = SysAllocString(nullW); + return *dst ? S_OK : E_OUTOFMEMORY; + } + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, src, 0, VT_BSTR); + if(FAILED(hres)) { + WARN("Could not convert argument %s to string\n", debugstr_variant(src)); + return hres; + } + + *dst = V_BSTR(&v); + return S_OK; +} + +static void print_string(const WCHAR *string) +{ + DWORD count, ret, len, lena; + char *buf; + + if(wshInteractive) { + static const WCHAR windows_script_hostW[] = + {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; + MessageBoxW(NULL, string, windows_script_hostW, MB_OK); + return; + } + + len = strlenW(string); + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), string, len, &count, NULL); + if(ret) { + static const WCHAR crnlW[] = {'\r','\n'}; + WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), crnlW, sizeof(crnlW)/sizeof(*crnlW), &count, NULL); + return; + } + + lena = WideCharToMultiByte(GetConsoleOutputCP(), 0, string, len, NULL, 0, NULL, NULL); + buf = heap_alloc(len); + if(!buf) + return; + + WideCharToMultiByte(GetConsoleOutputCP(), 0, string, len, buf, lena, NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), buf, lena, &count, FALSE); + heap_free(buf); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), "\r\n", 2, &count, FALSE); +} + static HRESULT WINAPI Host_QueryInterface(IHost *iface, REFIID riid, void **ppv) { WINE_TRACE("(%s %p)\n", wine_dbgstr_guid(riid), ppv); @@ -249,8 +303,72 @@ static HRESULT WINAPI Host_Echo(IHost *iface, SAFEARRAY *args) { - WINE_FIXME("(%p)\n", args); - return E_NOTIMPL; + WCHAR *output = NULL, *ptr; + unsigned argc, i, len; + LONG ubound, lbound; + VARIANT *argv; + BSTR *strs; + HRESULT hres; + + TRACE("(%p)\n", args); + + if(SafeArrayGetDim(args) != 1) { + FIXME("Unsupported args dim %d\n", SafeArrayGetDim(args)); + return E_NOTIMPL; + } + + SafeArrayGetLBound(args, 1, &lbound); + SafeArrayGetUBound(args, 1, &ubound); + + hres = SafeArrayAccessData(args, (void**)&argv); + if(FAILED(hres)) + return hres; + + argc = ubound-lbound+1; + strs = heap_alloc_zero(argc*sizeof(*strs)); + if(!strs) { + SafeArrayUnaccessData(args); + return E_OUTOFMEMORY; + } + + /* Len of spaces between arguments. */ + len = argc-1; + + for(i=0; i < argc; i++) { + hres = to_string(argv+i, strs+i); + if(FAILED(hres)) + break; + + len += SysStringLen(strs[i]); + } + + SafeArrayUnaccessData(args); + if(SUCCEEDED(hres)) { + ptr = output = heap_alloc((len+1)*sizeof(WCHAR)); + if(output) { + for(i=0; i < argc; i++) { + if(i) + *ptr++ = ' '; + len = SysStringLen(strs[i]); + memcpy(ptr, strs[i], len*sizeof(WCHAR)); + ptr += len; + } + *ptr = 0; + }else { + hres = E_OUTOFMEMORY; + } + } + + for(i=0; i < argc; i++) + SysFreeString(strs[i]); + heap_free(strs); + if(FAILED(hres)) + return hres; + + print_string(output); + + heap_free(output); + return S_OK; } static HRESULT WINAPI Host_GetObject(IHost *iface, BSTR Pathname, BSTR ProgID, Modified: trunk/reactos/base/applications/cmdutils/wscript/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wscript/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wscript/main.c [iso-8859-1] Sun Mar 29 13:53:55 2015 @@ -174,7 +174,7 @@ return S_OK; } -static IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { +static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { ActiveScriptSiteWindow_QueryInterface, ActiveScriptSiteWindow_AddRef, ActiveScriptSiteWindow_Release, Modified: trunk/reactos/base/applications/cmdutils/wscript/wscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wscript/wscript.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wscript/wscript.h [iso-8859-1] Sun Mar 29 13:53:55 2015 @@ -51,4 +51,19 @@ extern VARIANT_BOOL wshInteractive; +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + #endif /* _WSCRIPT_H_ */ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 29 13:53:55 2015 @@ -240,7 +240,7 @@ reactos/base/applications/cmdutils/reg # Synced to Wine-1.7.27 reactos/base/applications/cmdutils/taskkill # Synced to Wine-1.7.27 reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.27 -reactos/base/applications/cmdutils/wscript # Synced to Wine-1.7.27 +reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.7.37 reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.7.27 reactos/base/applications/games/winmine # Forked at Wine-1_3_5 reactos/base/applications/extrac32 # Synced to Wine-1.7.27

9 years, 5 months

[akhaldi] 66954: [WSHOM_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 29 13:36:03 2015 New Revision: 66954 URL: http://svn.reactos.org/svn/reactos?rev=66954&view=rev Log: [WSHOM_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/wshom/CMakeLists.txt trunk/rostests/winetests/wshom/wshom.c trunk/rostests/winetests/wshom/wshom.idl Modified: trunk/rostests/winetests/wshom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wshom/CMakeList… ============================================================================== --- trunk/rostests/winetests/wshom/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wshom/CMakeLists.txt [iso-8859-1] Sun Mar 29 13:36:03 2015 @@ -1,8 +1,11 @@ +add_definitions(-DUSE_WINE_TODOS) -add_definitions(-DUSE_WINE_TODOS) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + add_idl_headers(wshom_winetest_idlheaders wshom.idl) add_executable(wshom_winetest wshom.c testlist.c) set_module_type(wshom_winetest win32cui) -add_importlibs(wshom_winetest oleaut32 ole32 msvcrt kernel32) +add_importlibs(wshom_winetest oleaut32 ole32 advapi32 msvcrt kernel32) add_dependencies(wshom_winetest stdole2 wshom_winetest_idlheaders) add_cd_file(TARGET wshom_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/wshom/wshom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wshom/wshom.c?r… ============================================================================== --- trunk/rostests/winetests/wshom/wshom.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wshom/wshom.c [iso-8859-1] Sun Mar 29 13:36:03 2015 @@ -23,6 +23,7 @@ #include <windef.h> #include <winbase.h> +#include <winreg.h> #include <initguid.h> #include <dispex.h> #include <wshom.h> @@ -35,6 +36,7 @@ static void test_wshshell(void) { + static const WCHAR notepadW[] = {'n','o','t','e','p','a','d','.','e','x','e',0}; static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; static const WCHAR lnk1W[] = {'f','i','l','e','.','l','n','k',0}; static const WCHAR pathW[] = {'%','P','A','T','H','%',0}; @@ -45,7 +47,7 @@ IDispatchEx *dispex; IWshCollection *coll; IDispatch *disp, *shortcut; - IUnknown *shell; + IUnknown *shell, *unk; IFolderCollection *folders; IWshShortcut *shcut; ITypeInfo *ti; @@ -53,16 +55,14 @@ TYPEATTR *tattr; DISPPARAMS dp; EXCEPINFO ei; - VARIANT arg, res; + VARIANT arg, res, arg2; BSTR str, ret; + DWORD retval; UINT err; hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDispatch, (void**)&disp); - if(FAILED(hr)) { - win_skip("Could not create WshShell object: %08x\n", hr); - return; - } + ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDispatch_QueryInterface(disp, &IID_IWshShell3, (void**)&shell); EXPECT_HR(hr, S_OK); @@ -73,6 +73,17 @@ hr = IUnknown_QueryInterface(shell, &IID_IWshShell3, (void**)&sh3); EXPECT_HR(hr, S_OK); + + hr = IWshShell3_QueryInterface(sh3, &IID_IObjectWithSite, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IWshShell3_QueryInterface(sh3, &IID_IWshShell, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + IUnknown_Release(unk); + + hr = IWshShell3_QueryInterface(sh3, &IID_IWshShell2, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + IUnknown_Release(unk); hr = IWshShell3_get_SpecialFolders(sh3, &coll); EXPECT_HR(hr, S_OK); @@ -173,17 +184,324 @@ IWshEnvironment_Release(env); + V_VT(&arg) = VT_I2; + V_I2(&arg) = 0; + V_VT(&arg2) = VT_ERROR; + V_ERROR(&arg2) = DISP_E_PARAMNOTFOUND; + + str = SysAllocString(notepadW); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + retval = 10; + hr = IWshShell3_Run(sh3, str, NULL, &arg2, &retval); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(retval == 10, "got %u\n", retval); + + retval = 10; + hr = IWshShell3_Run(sh3, str, &arg, NULL, &retval); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(retval == 10, "got %u\n", retval); + + retval = 10; + V_VT(&arg2) = VT_ERROR; + V_ERROR(&arg2) = 0; + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr); + ok(retval == 10, "got %u\n", retval); + + SysFreeString(str); + IWshCollection_Release(coll); IDispatch_Release(disp); IWshShell3_Release(sh3); IUnknown_Release(shell); } +/* delete key and all its subkeys */ +static DWORD delete_key(HKEY hkey) +{ + char name[MAX_PATH]; + DWORD ret; + + while (!(ret = RegEnumKeyA(hkey, 0, name, sizeof(name)))) { + HKEY tmp; + if (!(ret = RegOpenKeyExA(hkey, name, 0, KEY_ENUMERATE_SUB_KEYS, &tmp))) { + ret = delete_key(tmp); + RegCloseKey(tmp); + } + if (ret) break; + } + if (ret != ERROR_NO_MORE_ITEMS) return ret; + RegDeleteKeyA(hkey, ""); + return 0; +} + +static void test_registry(void) +{ + static const WCHAR keypathW[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\', + 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','T','e','s','t','\\',0}; + + static const WCHAR regszW[] = {'r','e','g','s','z',0}; + static const WCHAR regdwordW[] = {'r','e','g','d','w','o','r','d',0}; + static const WCHAR regbinaryW[] = {'r','e','g','b','i','n','a','r','y',0}; + static const WCHAR regmultiszW[] = {'r','e','g','m','u','l','t','i','s','z',0}; + + static const WCHAR regsz1W[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\', + 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','T','e','s','t','\\','r','e','g','s','z','1',0}; + static const WCHAR foobarW[] = {'f','o','o','b','a','r',0}; + static const WCHAR fooW[] = {'f','o','o',0}; + static const WCHAR brokenW[] = {'H','K','E','Y','_','b','r','o','k','e','n','_','k','e','y',0}; + static const WCHAR broken2W[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','a',0}; + WCHAR pathW[MAX_PATH]; + DWORD dwvalue, type; + VARIANT value, v; + IWshShell3 *sh3; + VARTYPE vartype; + LONG bound; + HRESULT hr; + BSTR name; + HKEY root; + LONG ret; + UINT dim; + + hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IWshShell3, (void**)&sh3); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* RegRead() */ + V_VT(&value) = VT_I2; + hr = IWshShell3_RegRead(sh3, NULL, &value); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value)); + + name = SysAllocString(brokenW); + hr = IWshShell3_RegRead(sh3, name, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + V_VT(&value) = VT_I2; + hr = IWshShell3_RegRead(sh3, name, &value); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got 0x%08x\n", hr); + ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value)); + SysFreeString(name); + + name = SysAllocString(broken2W); + V_VT(&value) = VT_I2; + hr = IWshShell3_RegRead(sh3, name, &value); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got 0x%08x\n", hr); + ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value)); + SysFreeString(name); + + ret = RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", &root); + ok(ret == 0, "got %d\n", ret); + + ret = RegSetValueExA(root, "regsz", 0, REG_SZ, (const BYTE*)"foobar", 7); + ok(ret == 0, "got %d\n", ret); + + ret = RegSetValueExA(root, "regmultisz", 0, REG_MULTI_SZ, (const BYTE*)"foo\0bar\0", 9); + ok(ret == 0, "got %d\n", ret); + + dwvalue = 10; + ret = RegSetValueExA(root, "regdword", 0, REG_DWORD, (const BYTE*)&dwvalue, sizeof(dwvalue)); + ok(ret == 0, "got %d\n", ret); + + dwvalue = 11; + ret = RegSetValueExA(root, "regbinary", 0, REG_BINARY, (const BYTE*)&dwvalue, sizeof(dwvalue)); + ok(ret == 0, "got %d\n", ret); + + /* REG_SZ */ + lstrcpyW(pathW, keypathW); + lstrcatW(pathW, regszW); + name = SysAllocString(pathW); + VariantInit(&value); + hr = IWshShell3_RegRead(sh3, name, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); + ok(!lstrcmpW(V_BSTR(&value), foobarW), "got %s\n", wine_dbgstr_w(V_BSTR(&value))); + VariantClear(&value); + SysFreeString(name); + + /* REG_DWORD */ + lstrcpyW(pathW, keypathW); + lstrcatW(pathW, regdwordW); + name = SysAllocString(pathW); + VariantInit(&value); + hr = IWshShell3_RegRead(sh3, name, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&value) == VT_I4, "got %d\n", V_VT(&value)); + ok(V_I4(&value) == 10, "got %d\n", V_I4(&value)); + SysFreeString(name); + + /* REG_BINARY */ + lstrcpyW(pathW, keypathW); + lstrcatW(pathW, regbinaryW); + name = SysAllocString(pathW); + VariantInit(&value); + hr = IWshShell3_RegRead(sh3, name, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&value) == (VT_ARRAY|VT_VARIANT), "got 0x%x\n", V_VT(&value)); + dim = SafeArrayGetDim(V_ARRAY(&value)); + ok(dim == 1, "got %u\n", dim); + + hr = SafeArrayGetLBound(V_ARRAY(&value), 1, &bound); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bound == 0, "got %u\n", bound); + + hr = SafeArrayGetUBound(V_ARRAY(&value), 1, &bound); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bound == 3, "got %u\n", bound); + + hr = SafeArrayGetVartype(V_ARRAY(&value), &vartype); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(vartype == VT_VARIANT, "got %d\n", vartype); + + bound = 0; + hr = SafeArrayGetElement(V_ARRAY(&value), &bound, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&v) == VT_UI1, "got %d\n", V_VT(&v)); + ok(V_UI1(&v) == 11, "got %u\n", V_UI1(&v)); + VariantClear(&v); + VariantClear(&value); + SysFreeString(name); + + /* REG_MULTI_SZ */ + lstrcpyW(pathW, keypathW); + lstrcatW(pathW, regmultiszW); + name = SysAllocString(pathW); + VariantInit(&value); + hr = IWshShell3_RegRead(sh3, name, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&value) == (VT_ARRAY|VT_VARIANT), "got 0x%x\n", V_VT(&value)); + + dim = SafeArrayGetDim(V_ARRAY(&value)); + ok(dim == 1, "got %u\n", dim); + + hr = SafeArrayGetLBound(V_ARRAY(&value), 1, &bound); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bound == 0, "got %u\n", bound); + + hr = SafeArrayGetUBound(V_ARRAY(&value), 1, &bound); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bound == 1, "got %u\n", bound); + + hr = SafeArrayGetVartype(V_ARRAY(&value), &vartype); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(vartype == VT_VARIANT, "got %d\n", vartype); + + bound = 0; + hr = SafeArrayGetElement(V_ARRAY(&value), &bound, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), fooW), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + VariantClear(&value); + + name = SysAllocString(regsz1W); + V_VT(&value) = VT_I2; + hr = IWshShell3_RegRead(sh3, name, &value); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value)); + VariantClear(&value); + SysFreeString(name); + + delete_key(root); + + /* RegWrite() */ + ret = RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", &root); + ok(ret == 0, "got %d\n", ret); + + hr = IWshShell3_RegWrite(sh3, NULL, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + lstrcpyW(pathW, keypathW); + lstrcatW(pathW, regszW); + name = SysAllocString(pathW); + + hr = IWshShell3_RegWrite(sh3, name, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + VariantInit(&value); + hr = IWshShell3_RegWrite(sh3, name, &value, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IWshShell3_RegWrite(sh3, name, &value, &value); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* type is optional */ + V_VT(&v) = VT_ERROR; + V_ERROR(&v) = DISP_E_PARAMNOTFOUND; + hr = IWshShell3_RegWrite(sh3, name, &value, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* default type is REG_SZ */ + V_VT(&value) = VT_I4; + V_I4(&value) = 12; + hr = IWshShell3_RegWrite(sh3, name, &value, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + type = REG_NONE; + ret = RegGetValueA(root, NULL, "regsz", RRF_RT_ANY, &type, NULL, NULL); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(type == REG_SZ, "got %d\n", type); + + ret = RegDeleteValueA(root, "regsz"); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + V_VT(&value) = VT_BSTR; + V_BSTR(&value) = SysAllocString(regszW); + hr = IWshShell3_RegWrite(sh3, name, &value, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&value); + + type = REG_NONE; + ret = RegGetValueA(root, NULL, "regsz", RRF_RT_ANY, &type, NULL, NULL); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(type == REG_SZ, "got %d\n", type); + + ret = RegDeleteValueA(root, "regsz"); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + V_VT(&value) = VT_R4; + V_R4(&value) = 1.2; + hr = IWshShell3_RegWrite(sh3, name, &value, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&value); + + type = REG_NONE; + ret = RegGetValueA(root, NULL, "regsz", RRF_RT_ANY, &type, NULL, NULL); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(type == REG_SZ, "got %d\n", type); + + ret = RegDeleteValueA(root, "regsz"); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + V_VT(&value) = VT_R4; + V_R4(&value) = 1.2; + V_VT(&v) = VT_I2; + V_I2(&v) = 1; + hr = IWshShell3_RegWrite(sh3, name, &value, &v); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + VariantClear(&value); + + SysFreeString(name); + + delete_key(root); + IWshShell3_Release(sh3); +} + START_TEST(wshom) { + IUnknown *unk; + HRESULT hr; + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUnknown, (void**)&unk); + if (FAILED(hr)) { + win_skip("Could not create WshShell object: %08x\n", hr); + return; + } + IUnknown_Release(unk); + test_wshshell(); + test_registry(); CoUninitialize(); } Modified: trunk/rostests/winetests/wshom/wshom.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wshom/wshom.idl… ============================================================================== --- trunk/rostests/winetests/wshom/wshom.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/wshom/wshom.idl [iso-8859-1] Sun Mar 29 13:36:03 2015 @@ -526,7 +526,7 @@ [in] BSTR Command, [in, optional] VARIANT* WindowStyle, [in, optional] VARIANT* WaitOnReturn, - [out, retval] int* out_ExitCode); + [out, retval] DWORD* out_ExitCode); [id(0x03e9)] HRESULT Popup(

9 years, 5 months

← Newer
1
2
3
4
5
6
7
8
...
50
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 March 2015