Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 66961: [SAMSRV] Add Italian translation. By Carlo Bramini. CORE-9438
by akhaldi＠svn.reactos.org 29 Mar '15

29 Mar '15

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

1 0

[tfaber] 66960: [NTDLL_APITEST] - Also test decreasing the size in RtlReAllocateHeap. Patch by Mark Jansen. CORE-9441
by tfaber＠svn.reactos.org 29 Mar '15

29 Mar '15

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); } -

1 0

[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 29 Mar '15

29 Mar '15

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) {

1 0

[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 29 Mar '15

29 Mar '15

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 },

1 0

[akhaldi] 66957: [CSCRIPT] Add missing user32 import lib. Fixes build.
by akhaldi＠svn.reactos.org 29 Mar '15

29 Mar '15

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)

1 0

[akhaldi] 66956: [WSCRIPT_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 29 Mar '15

29 Mar '15

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; }

1 0

[akhaldi] 66955: [WSCRIPT] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 29 Mar '15

29 Mar '15

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

1 0

[akhaldi] 66954: [WSHOM_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 29 Mar '15

29 Mar '15

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(

1 0

[akhaldi] 66953: [WSHOM.OCX] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 29 Mar '15

29 Mar '15

Author: akhaldi Date: Sun Mar 29 13:35:37 2015 New Revision: 66953 URL: http://svn.reactos.org/svn/reactos?rev=66953&view=rev Log: [WSHOM.OCX] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt trunk/reactos/dll/win32/wshom.ocx/shell.c trunk/reactos/dll/win32/wshom.ocx/wshom.idl trunk/reactos/dll/win32/wshom.ocx/wshom_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/CMakeL… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt [iso-8859-1] Sun Mar 29 13:35:37 2015 @@ -1,5 +1,9 @@ add_definitions(-D__WINESRC__) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(wshom.ocx wshom.ocx.spec) add_idl_headers(wshom_idlheader wshom.idl) @@ -24,7 +28,7 @@ set_source_files_properties(wshom.rc PROPERTIES OBJECT_DEPENDS "${wshom_rc_deps}") set_module_type(wshom win32ocx) target_link_libraries(wshom uuid wine) -add_importlibs(wshom oleaut32 ole32 shell32 msvcrt kernel32 ntdll) +add_importlibs(wshom oleaut32 ole32 shell32 advapi32 msvcrt kernel32 ntdll) add_dependencies(wshom stdole2 wshom_idlheader) add_pch(wshom wshom_private.h SOURCE) add_cd_file(TARGET wshom DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/wshom.ocx/shell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/shell.… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/shell.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshom.ocx/shell.c [iso-8859-1] Sun Mar 29 13:35:37 2015 @@ -21,8 +21,28 @@ #include <shellapi.h> #include <shlobj.h> #include <dispex.h> +#include <winreg.h> #include <wine/unicode.h> + +/* FIXME: Vista+*/ +LONG WINAPI RegSetKeyValueW( HKEY hkey, LPCWSTR subkey, LPCWSTR name, DWORD type, const void *data, DWORD len ) +{ + HKEY hsubkey = NULL; + DWORD ret; + + TRACE("(%p,%s,%s,%d,%p,%d)\n", hkey, debugstr_w(subkey), debugstr_w(name), type, data, len ); + + if (subkey && subkey[0]) /* need to create the subkey */ + { + if ((ret = RegCreateKeyW( hkey, subkey, &hsubkey )) != ERROR_SUCCESS) return ret; + hkey = hsubkey; + } + + ret = RegSetValueExW( hkey, name, 0, type, (const BYTE*)data, len ); + if (hsubkey) RegCloseKey( hsubkey ); + return ret; +} static IWshShell3 WshShell3; @@ -813,9 +833,11 @@ *ppv = NULL; - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IDispatch) || - IsEqualGUID(riid, &IID_IWshShell3)) + if (IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IWshShell3) || + IsEqualGUID(riid, &IID_IWshShell2) || + IsEqualGUID(riid, &IID_IWshShell) || + IsEqualGUID(riid, &IID_IUnknown)) { *ppv = iface; } @@ -825,7 +847,7 @@ } else { - FIXME("Unknown iface %s\n", debugstr_guid(riid)); + WARN("unknown iface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -908,14 +930,22 @@ return WshEnvironment_Create(env); } -static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *WaitOnReturn, int *exit_code) +static inline BOOL is_optional_argument(const VARIANT *arg) +{ + return V_VT(arg) == VT_ERROR && V_ERROR(arg) == DISP_E_PARAMNOTFOUND; +} + +static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *wait, DWORD *exit_code) { SHELLEXECUTEINFOW info; int waitforprocess; - VARIANT s, w; - HRESULT hr; - - TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(WaitOnReturn), exit_code); + VARIANT s; + HRESULT hr; + + TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(wait), exit_code); + + if (!style || !wait || !exit_code) + return E_POINTER; VariantInit(&s); hr = VariantChangeType(&s, style, 0, VT_I4); @@ -925,19 +955,21 @@ return hr; } - VariantInit(&w); - hr = VariantChangeType(&w, WaitOnReturn, 0, VT_I4); - if (FAILED(hr)) - { - ERR("failed to convert wait argument, 0x%08x\n", hr); - return hr; + if (is_optional_argument(wait)) + waitforprocess = 0; + else { + VARIANT w; + + VariantInit(&w); + hr = VariantChangeType(&w, wait, 0, VT_I4); + if (FAILED(hr)) + return hr; + + waitforprocess = V_I4(&w); } memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - - waitforprocess = V_I4(&w); - info.fMask = waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT; info.lpFile = cmd; info.nShow = V_I4(&s); @@ -951,16 +983,11 @@ { if (waitforprocess) { - if (exit_code) - { - DWORD code; - GetExitCodeProcess(info.hProcess, &code); - *exit_code = code; - } + GetExitCodeProcess(info.hProcess, exit_code); CloseHandle(info.hProcess); } else - if (exit_code) *exit_code = 0; + *exit_code = 0; return S_OK; } @@ -1001,16 +1028,289 @@ } } -static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR Name, VARIANT* out_Value) -{ - FIXME("(%s %p): stub\n", debugstr_w(Name), out_Value); - return E_NOTIMPL; -} - -static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR Name, VARIANT *Value, VARIANT *Type) -{ - FIXME("(%s %s %s): stub\n", debugstr_w(Name), debugstr_variant(Value), debugstr_variant(Type)); - return E_NOTIMPL; +static HKEY get_root_key(const WCHAR *path) +{ + static const struct { + const WCHAR full[20]; + const WCHAR abbrev[5]; + HKEY hkey; + } rootkeys[] = { + { {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}, {'H','K','C','U',0}, HKEY_CURRENT_USER }, + { {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}, {'H','K','L','M',0}, HKEY_LOCAL_MACHINE }, + { {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}, {'H','K','C','R',0}, HKEY_CLASSES_ROOT }, + { {'H','K','E','Y','_','U','S','E','R','S',0}, {0}, HKEY_USERS }, + { {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}, {0}, HKEY_CURRENT_CONFIG } + }; + int i; + + for (i = 0; i < sizeof(rootkeys)/sizeof(rootkeys[0]); i++) { + if (!strncmpW(path, rootkeys[i].full, strlenW(rootkeys[i].full))) + return rootkeys[i].hkey; + if (rootkeys[i].abbrev[0] && !strncmpW(path, rootkeys[i].abbrev, strlenW(rootkeys[i].abbrev))) + return rootkeys[i].hkey; + } + + return NULL; +} + +/* Caller is responsible to free 'subkey' if 'value' is not NULL */ +static HRESULT split_reg_path(const WCHAR *path, WCHAR **subkey, WCHAR **value) +{ + *value = NULL; + + /* at least one separator should be present */ + *subkey = strchrW(path, '\\'); + if (!*subkey) + return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); + + /* default value or not */ + if ((*subkey)[strlenW(*subkey)-1] == '\\') { + (*subkey)++; + *value = NULL; + } + else { + *value = strrchrW(*subkey, '\\'); + if (*value - *subkey > 1) { + unsigned int len = *value - *subkey - 1; + WCHAR *ret; + + ret = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); + if (!ret) + return E_OUTOFMEMORY; + + memcpy(ret, *subkey + 1, len*sizeof(WCHAR)); + ret[len] = 0; + *subkey = ret; + } + (*value)++; + } + + return S_OK; +} + +static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *value) +{ + DWORD type, datalen, ret; + WCHAR *subkey, *val; + HRESULT hr; + HKEY root; + + TRACE("(%s %p)\n", debugstr_w(name), value); + + if (!name || !value) + return E_POINTER; + + root = get_root_key(name); + if (!root) + return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); + + hr = split_reg_path(name, &subkey, &val); + if (FAILED(hr)) + return hr; + + type = REG_NONE; + datalen = 0; + ret = RegGetValueW(root, subkey, val, RRF_RT_ANY, &type, NULL, &datalen); + if (ret == ERROR_SUCCESS) { + void *data; + + data = HeapAlloc(GetProcessHeap(), 0, datalen); + if (!data) { + hr = E_OUTOFMEMORY; + goto fail; + } + + ret = RegGetValueW(root, subkey, val, RRF_RT_ANY, &type, data, &datalen); + if (ret) { + HeapFree(GetProcessHeap(), 0, data); + hr = HRESULT_FROM_WIN32(ret); + goto fail; + } + + switch (type) { + case REG_SZ: + case REG_EXPAND_SZ: + V_VT(value) = VT_BSTR; + V_BSTR(value) = SysAllocStringLen((WCHAR*)data, datalen - sizeof(WCHAR)); + if (!V_BSTR(value)) + hr = E_OUTOFMEMORY; + break; + case REG_DWORD: + V_VT(value) = VT_I4; + V_I4(value) = *(DWORD*)data; + break; + case REG_BINARY: + { + BYTE *ptr = (BYTE*)data; + SAFEARRAYBOUND bound; + unsigned int i; + SAFEARRAY *sa; + VARIANT *v; + + bound.lLbound = 0; + bound.cElements = datalen; + sa = SafeArrayCreate(VT_VARIANT, 1, &bound); + if (!sa) + break; + + hr = SafeArrayAccessData(sa, (void**)&v); + if (FAILED(hr)) { + SafeArrayDestroy(sa); + break; + } + + for (i = 0; i < datalen; i++) { + V_VT(&v[i]) = VT_UI1; + V_UI1(&v[i]) = ptr[i]; + } + SafeArrayUnaccessData(sa); + + V_VT(value) = VT_ARRAY|VT_VARIANT; + V_ARRAY(value) = sa; + break; + } + case REG_MULTI_SZ: + { + WCHAR *ptr = (WCHAR*)data; + SAFEARRAYBOUND bound; + SAFEARRAY *sa; + VARIANT *v; + + /* get element count first */ + bound.lLbound = 0; + bound.cElements = 0; + while (*ptr) { + bound.cElements++; + ptr += strlenW(ptr)+1; + } + + sa = SafeArrayCreate(VT_VARIANT, 1, &bound); + if (!sa) + break; + + hr = SafeArrayAccessData(sa, (void**)&v); + if (FAILED(hr)) { + SafeArrayDestroy(sa); + break; + } + + ptr = (WCHAR*)data; + while (*ptr) { + V_VT(v) = VT_BSTR; + V_BSTR(v) = SysAllocString(ptr); + ptr += strlenW(ptr)+1; + v++; + } + + SafeArrayUnaccessData(sa); + V_VT(value) = VT_ARRAY|VT_VARIANT; + V_ARRAY(value) = sa; + break; + } + default: + FIXME("value type %d not supported\n", type); + hr = E_FAIL; + }; + + HeapFree(GetProcessHeap(), 0, data); + if (FAILED(hr)) + VariantInit(value); + } + else + hr = HRESULT_FROM_WIN32(ret); + +fail: + if (val) + HeapFree(GetProcessHeap(), 0, subkey); + return hr; +} + +static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR name, VARIANT *value, VARIANT *type) +{ + static const WCHAR regexpandszW[] = {'R','E','G','_','E','X','P','A','N','D','_','S','Z',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}; + + DWORD regtype, data_len; + WCHAR *subkey, *val; + const BYTE *data; + HRESULT hr; + HKEY root; + VARIANT v; + LONG ret; + + TRACE("(%s %s %s)\n", debugstr_w(name), debugstr_variant(value), debugstr_variant(type)); + + if (!name || !value || !type) + return E_POINTER; + + root = get_root_key(name); + if (!root) + return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); + + /* value type */ + if (is_optional_argument(type)) + regtype = REG_SZ; + else { + if (V_VT(type) != VT_BSTR) + return E_INVALIDARG; + + if (!strcmpW(V_BSTR(type), regszW)) + regtype = REG_SZ; + else if (!strcmpW(V_BSTR(type), regdwordW)) + regtype = REG_DWORD; + else if (!strcmpW(V_BSTR(type), regexpandszW)) + regtype = REG_EXPAND_SZ; + else if (!strcmpW(V_BSTR(type), regbinaryW)) + regtype = REG_BINARY; + else { + FIXME("unrecognized value type %s\n", debugstr_w(V_BSTR(type))); + return E_FAIL; + } + } + + /* it's always a string or a DWORD */ + VariantInit(&v); + switch (regtype) + { + case REG_SZ: + case REG_EXPAND_SZ: + hr = VariantChangeType(&v, value, 0, VT_BSTR); + if (hr == S_OK) { + data = (BYTE*)V_BSTR(&v); + data_len = SysStringByteLen(V_BSTR(&v)) + sizeof(WCHAR); + } + break; + case REG_DWORD: + case REG_BINARY: + hr = VariantChangeType(&v, value, 0, VT_I4); + data = (BYTE*)&V_I4(&v); + data_len = sizeof(DWORD); + break; + default: + FIXME("unexpected regtype %d\n", regtype); + return E_FAIL; + }; + + if (FAILED(hr)) { + FIXME("failed to convert value, regtype %d, 0x%08x\n", regtype, hr); + return hr; + } + + hr = split_reg_path(name, &subkey, &val); + if (FAILED(hr)) + goto fail; + + ret = RegSetKeyValueW(root, subkey, val, regtype, data, data_len); + if (ret) + hr = HRESULT_FROM_WIN32(ret); + +fail: + VariantClear(&v); + if (val) + HeapFree(GetProcessHeap(), 0, subkey); + return hr; } static HRESULT WINAPI WshShell3_RegDelete(IWshShell3 *iface, BSTR Name) Modified: trunk/reactos/dll/win32/wshom.ocx/wshom.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/wshom.… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/wshom.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshom.ocx/wshom.idl [iso-8859-1] Sun Mar 29 13:35:37 2015 @@ -528,7 +528,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( Modified: trunk/reactos/dll/win32/wshom.ocx/wshom_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/wshom_… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/wshom_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshom.ocx/wshom_main.c [iso-8859-1] Sun Mar 29 13:35:37 2015 @@ -108,7 +108,7 @@ return S_OK; } - FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + WARN("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); return E_NOINTERFACE; } 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:35:37 2015 @@ -223,7 +223,7 @@ reactos/dll/win32/wldap32 # Synced to Wine-1.7.27 reactos/dll/win32/wmi # Synced to Wine-1.7.27 reactos/dll/win32/wmiutils # Synced to Wine-1.7.27 -reactos/dll/win32/wshom.ocx # Synced to Wine-1.7.27 +reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.7.37 reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.27 reactos/dll/win32/wuapi # Synced to Wine-1.7.27 reactos/dll/win32/xinput1_1 # Synced to Wine-1.7.27

1 0

[tkreuzer] 66952: [CMAKE/BOOTDATA] Implement support for decentralized registry inf files. This is done with the new add_registry_inf() cmake function, which takes one or more inf files, which are ...
by tkreuzer＠svn.reactos.org 29 Mar '15

29 Mar '15

Author: tkreuzer Date: Sun Mar 29 11:38:05 2015 New Revision: 66952 URL: http://svn.reactos.org/svn/reactos?rev=66952&view=rev Log: [CMAKE/BOOTDATA] Implement support for decentralized registry inf files. This is done with the new add_registry_inf() cmake function, which takes one or more inf files, which are then converted to UTF-16 and merged into a single registry.inf, which is then used to create the livecd hives and imported by usetup. Move the registry entries for some drivers out of hivesys.inf into separate files next to the driver. Added: trunk/reactos/drivers/base/beep/beep_reg.inf (with props) trunk/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf (with props) trunk/reactos/drivers/filesystems/cdfs/cdfs_reg.inf (with props) trunk/reactos/drivers/filesystems/msfs/msfs_reg.inf (with props) trunk/reactos/drivers/filesystems/npfs/npfs_reg.inf (with props) trunk/reactos/drivers/input/kbdclass/kbdclass_reg.inf (with props) trunk/reactos/drivers/input/mouclass/mouclass_reg.inf (with props) trunk/reactos/drivers/network/afd/afd_reg.inf (with props) trunk/reactos/drivers/storage/class/cdrom/cdrom_reg.inf (with props) trunk/reactos/drivers/storage/class/disk/disk_reg.inf (with props) trunk/reactos/drivers/storage/floppy/floppy_reg.inf (with props) trunk/reactos/drivers/storage/ide/uniata/uniata_reg.inf (with props) trunk/reactos/drivers/storage/port/buslogic/buslogic_reg.inf (with props) trunk/reactos/win32ss/drivers/miniport/vbe/vbemp_reg.inf (with props) trunk/reactos/win32ss/drivers/miniport/vga/vga_reg.inf (with props) Modified: trunk/reactos/CMakeLists.txt trunk/reactos/boot/bootdata/CMakeLists.txt trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/drivers/base/beep/CMakeLists.txt trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt trunk/reactos/drivers/filesystems/npfs/CMakeLists.txt trunk/reactos/drivers/input/kbdclass/CMakeLists.txt trunk/reactos/drivers/input/mouclass/CMakeLists.txt trunk/reactos/drivers/network/afd/CMakeLists.txt trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt trunk/reactos/drivers/storage/class/disk/CMakeLists.txt trunk/reactos/drivers/storage/floppy/CMakeLists.txt trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt trunk/reactos/drivers/storage/port/buslogic/CMakeLists.txt trunk/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt trunk/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=66952&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -244,6 +244,9 @@ add_subdirectory(tools/wpp) add_subdirectory(win32ss) + # Create the registry hives + create_registry_hives() + # Create {bootcd, livecd, bootcdregtest}.lst create_iso_lists() Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -5,59 +5,12 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB FOR bootcd regtest) -list(APPEND _common_hives - ${CMAKE_CURRENT_SOURCE_DIR}/hivecls.inf - ${CMAKE_CURRENT_SOURCE_DIR}/hivedef.inf - ${CMAKE_CURRENT_SOURCE_DIR}/hivesft.inf - ${CMAKE_CURRENT_SOURCE_DIR}/hivesys.inf) +add_registry_inf( + hivecls.inf + hivedef.inf + hivesft.inf + hivesys.inf) -foreach(_hive ${_common_hives}) - get_filename_component(_hive_name ${_hive} NAME) - set(_converted_hive ${CMAKE_CURRENT_BINARY_DIR}/${_hive_name}) - add_custom_command(OUTPUT ${_converted_hive} - COMMAND native-utf16le ${_hive} ${_converted_hive} - DEPENDS native-utf16le ${_hive}) - list(APPEND _converted_common_hives ${_converted_hive}) -endforeach() - -add_custom_target(converted_hives DEPENDS ${_converted_common_hives}) -add_cd_file(TARGET converted_hives - FILE ${_converted_common_hives} - DESTINATION reactos - NO_CAB - FOR bootcd regtest) - -# livecd hives -list(APPEND _livecd_hives - ${_converted_common_hives} - ${CMAKE_CURRENT_SOURCE_DIR}/livecd.inf - ${CMAKE_CURRENT_SOURCE_DIR}/hiveinst.inf) - -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sam - ${CMAKE_CURRENT_BINARY_DIR}/default - ${CMAKE_CURRENT_BINARY_DIR}/security - ${CMAKE_CURRENT_BINARY_DIR}/software - ${CMAKE_CURRENT_BINARY_DIR}/system - COMMAND native-mkhive ${CMAKE_CURRENT_BINARY_DIR} ${_livecd_hives} - DEPENDS native-mkhive ${_livecd_hives} ${_converted_common_hives}) - -add_custom_target(livecd_hives - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/sam - ${CMAKE_CURRENT_BINARY_DIR}/default - ${CMAKE_CURRENT_BINARY_DIR}/security - ${CMAKE_CURRENT_BINARY_DIR}/software - ${CMAKE_CURRENT_BINARY_DIR}/system) - -add_cd_file( - FILE ${CMAKE_CURRENT_BINARY_DIR}/sam - ${CMAKE_CURRENT_BINARY_DIR}/default - ${CMAKE_CURRENT_BINARY_DIR}/security - ${CMAKE_CURRENT_BINARY_DIR}/software - ${CMAKE_CURRENT_BINARY_DIR}/system - TARGET livecd_hives - DESTINATION reactos/system32/config - FOR livecd) #regtest add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/regtest.cmd DESTINATION reactos/bin FOR all) Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -1348,22 +1348,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\swenum","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\swenum","Type",0x00010001,0x00000001 - -; Afd driver -HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Group",0x00000000,"TDI" -HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ImagePath",0x00020000,"system32\drivers\afd.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x00000001 - -; UniATA/Atapi miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"System Bus Extender" -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ImagePath",0x00020000,"system32\drivers\uniata.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000010 - ; Audio Service HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,"Audio Service" HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Description",0x00000000,"Provides audio facilities to applications" @@ -1374,21 +1358,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Type",0x00010001,0x00000010 -; BusLogic 958 miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Group",0x00000000,"SCSI Miniport" -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ImagePath",0x00020000,"system32\drivers\buslogic.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Tag",0x00010001,0x00000020 - -; Beep device driver -HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ImagePath",0x00020000,"system32\drivers\beep.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Type",0x00010001,0x00000001 - ; Background Intelligent Transfer Service (BITS) HKLM,"SYSTEM\CurrentControlSet\Services\BITS","DisplayName",0x00000000,"BITS" HKLM,"SYSTEM\CurrentControlSet\Services\BITS","Description",0x00000000,"Background Intelligent Transfer Service (BITS)" @@ -1406,33 +1375,12 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Type",0x00010001,0x00000001 -; Cdfs (ISO96660) filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x00020000,"system32\drivers\cdfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002 - -; Cdrom class driver -HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Group",0x00000000,"SCSI Class" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","ImagePath",0x00020000,"system32\drivers\cdrom.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Type",0x00010001,0x00000001 - ; Debug output driver HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Group",0x00000000,"Debug" HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ImagePath",0x00020000,"system32\drivers\debugout.sys" HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Type",0x00010001,0x00000001 - -; Disk class driver -HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Group",0x00000000,"SCSI Class" -HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ImagePath",0x00020000,"system32\drivers\disk.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Type",0x00010001,0x00000001 ; DHCP client service HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","DisplayName",0x00000000,"DHCP Client" @@ -1482,35 +1430,12 @@ HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Service Control Manager","EventMessageFile",0x00020000,"%SystemRoot%\system32\netevent.dll" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Service Control Manager","TypesSupported",0x00010001,0x00000007 -; Floppy driver -HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Group",0x00000000,"Primary Disk" -HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ImagePath",0x00020000,"system32\drivers\floppy.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Type",0x00010001,0x00000001 - ; Filesystem recognizer driver HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Group",0x00000000,"Boot file system" HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ImagePath",0x00020000,"system32\drivers\fs_rec.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008 - -; Keyboard class driver -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Group",0x00000000,"Keyboard Class" -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ImagePath",0x00020000,"system32\drivers\kbdclass.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass\Parameters","ConnectMultiplePorts",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"kbdclass" - -; Kernel Security Support Provider Interface Driver -HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","ErrorControl",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","ImagePath",0x00020000,"system32\drivers\ksecdd.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Type",0x00010001,0x00000001 ; Workstation service HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","DisplayName",0x00000000,"Workstation service" @@ -1530,22 +1455,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ImagePath",0x00020000,"system32\drivers\mpu401.sys" -; Mouse class driver -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Group",0x00000000,"Pointer Class" -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ImagePath",0x00020000,"system32\drivers\mouclass.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","ConnectMultiplePorts",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"mouclass" - -; Mailslot filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Group",0x00000000,"File System" -HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ImagePath",0x00020000,"system32\drivers\msfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Type",0x00010001,0x00000002 - ; Multiple UNC provider driver ;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Description",0x00000000,"Multiple UNC Provider (MUP)" ;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ErrorControl",0x00010001,0x00000001 @@ -1569,13 +1478,6 @@ ;HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","ImagePath",0x00020000,"%SystemRoot%\system32\lsass.exe" ;HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Start",0x00010001,0x00000003 ;HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","Type",0x00010001,0x00000020 - -; Named Pipe filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Group",0x00000000,"File System" -HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ImagePath",0x00020000,"system32\drivers\npfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Type",0x00010001,0x00000002 ; NTFS filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ErrorControl",0x00010001,0x00000000 @@ -2020,48 +1922,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Type",0x00010001,0x00000002 -; VBE SVGA driver -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save" -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ImagePath",0x00020000,"system32\drivers\vbemp.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Tag",0x00010001,0x00000001 - -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,8 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,640 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,480 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.FixedOutput",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Flags",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Orientation",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XPanning",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YPanning",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeX",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeY",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.ToDesktop",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.PrimaryDevice",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Device Description",0x00020000,"Generic VESA Adapter" - -; This is not true but it allows to use 3rd party drivers while having the VBE driver installed -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","VgaCompatible",0x00010001,1 - -; VGA miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Group",0x00000000,"Video Save" -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ImagePath",0x00020000,"system32\drivers\vgamp.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Tag",0x00010001,0x00000002 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","VgaCompatible",0x00010001,1 - -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDrivers",0x00010000,"vgaddi" -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.VRefresh",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.BitsPerPel",0x00010001,8 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 - ; ControlSet selection settings HKLM,"SYSTEM\Select","Current",0x00010001,0x00000001 HKLM,"SYSTEM\Select","Default",0x00010001,0x00000001 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -519,9 +519,6 @@ 00000455 = kbdbur.dll [HiveInfs.Install] -AddReg=hivecls.inf,AddReg -AddReg=hivedef.inf,AddReg -AddReg=hivesft.inf,AddReg -AddReg=hivesys.inf,AddReg +AddReg=registry.inf,AddReg ; EOF Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -226,13 +226,10 @@ add_dependencies(freeldr_pe asm) add_dependencies(freeldr_pe_dbg asm) -# Retrieve the full path to the generated file of the 'freeldr_pe' target -get_target_property(_freeldr_pe_output_file freeldr_pe LOCATION) - concatenate_files( ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - ${_freeldr_pe_output_file}) + ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.dll) add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys) @@ -243,7 +240,7 @@ concatenate_files( ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - ${_freeldr_pe_output_file}) + ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.dll) add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) 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] Sun Mar 29 11:38:05 2015 @@ -315,7 +315,7 @@ endforeach() if(_CD_TARGET) #manage dependency - add_dependencies(bootcd ${_CD_TARGET} converted_hives) + add_dependencies(bootcd ${_CD_TARGET} registry_inf) endif() else() #add it in reactos.cab @@ -337,7 +337,7 @@ if(NOT __cd EQUAL -1) #manage dependency if(_CD_TARGET) - add_dependencies(livecd ${_CD_TARGET} converted_hives) + add_dependencies(livecd ${_CD_TARGET} registry_inf) endif() foreach(item ${_CD_FILE}) if(_CD_NAME_ON_CD) @@ -385,7 +385,7 @@ endforeach() if(_CD_TARGET) #manage dependency - add_dependencies(bootcdregtest ${_CD_TARGET} converted_hives) + add_dependencies(bootcdregtest ${_CD_TARGET} registry_inf) endif() else() #add it in reactos.cab @@ -668,7 +668,7 @@ function(preprocess_file __in __out) set(__arg ${__in}) - foreach(__def in ${ARGN}) + foreach(__def ${ARGN}) list(APPEND __arg -D${__def}) endforeach() if(MSVC) @@ -708,6 +708,78 @@ endfunction() endif() +function(add_registry_inf) + # Add to the inf files list + foreach(_file ${ARGN}) + set(_source_file "${CMAKE_CURRENT_SOURCE_DIR}/${_file}") + set_property(GLOBAL APPEND PROPERTY REGISTRY_INF_LIST ${_source_file}) + endforeach() +endfunction() + +function(create_registry_hives) + + # Shortcut to the registry.inf file + set(_registry_inf "${CMAKE_BINARY_DIR}/boot/bootdata/registry.inf") + + # Get the list of inf files + get_property(_inf_files GLOBAL PROPERTY REGISTRY_INF_LIST) + + # Convert files to utf16le + foreach(_file ${_inf_files}) + get_filename_component(_file_name ${_file} NAME_WE) + string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _converted_file "${_file}") + string(REPLACE ${_file_name} "${_file_name}_utf16" _converted_file ${_converted_file}) + add_custom_command(OUTPUT ${_converted_file} + COMMAND native-utf16le ${_file} ${_converted_file} + DEPENDS native-utf16le ${_file}) + list(APPEND _converted_files ${_converted_file}) + endforeach() + + # Concatenate all registry files to registry.inf + concatenate_files(${_registry_inf} ${_converted_files}) + + # Add registry.inf to bootcd + add_custom_target(registry_inf DEPENDS ${_registry_inf}) + add_cd_file(TARGET registry_inf + FILE ${_registry_inf} + DESTINATION reactos + NO_CAB + FOR bootcd regtest) + + # livecd hives + list(APPEND _livecd_inf_files + ${_registry_inf} + ${CMAKE_SOURCE_DIR}/boot/bootdata/livecd.inf + ${CMAKE_SOURCE_DIR}/boot/bootdata/hiveinst.inf) + + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/sam + ${CMAKE_BINARY_DIR}/boot/bootdata/default + ${CMAKE_BINARY_DIR}/boot/bootdata/security + ${CMAKE_BINARY_DIR}/boot/bootdata/software + ${CMAKE_BINARY_DIR}/boot/bootdata/system + COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/ ${_livecd_inf_files} + DEPENDS native-mkhive ${_livecd_inf_files}) + + add_custom_target(livecd_hives + DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/sam + ${CMAKE_BINARY_DIR}/boot/bootdata/default + ${CMAKE_BINARY_DIR}/boot/bootdata/security + ${CMAKE_BINARY_DIR}/boot/bootdata/software + ${CMAKE_BINARY_DIR}/boot/bootdata/system) + + add_cd_file( + FILE ${CMAKE_BINARY_DIR}/boot/bootdata/sam + ${CMAKE_BINARY_DIR}/boot/bootdata/default + ${CMAKE_BINARY_DIR}/boot/bootdata/security + ${CMAKE_BINARY_DIR}/boot/bootdata/software + ${CMAKE_BINARY_DIR}/boot/bootdata/system + TARGET livecd_hives + DESTINATION reactos/system32/config + FOR livecd) + +endfunction() + if(KDBG) set(ROSSYM_LIB "rossym") else() Modified: trunk/reactos/drivers/base/beep/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/beep/CMakeLis… ============================================================================== --- trunk/reactos/drivers/base/beep/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/beep/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -3,3 +3,4 @@ set_module_type(beep kernelmodedriver) add_importlibs(beep ntoskrnl hal) add_cd_file(TARGET beep DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(beep_reg.inf) Added: trunk/reactos/drivers/base/beep/beep_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/beep/beep_reg… ============================================================================== --- trunk/reactos/drivers/base/beep/beep_reg.inf (added) +++ trunk/reactos/drivers/base/beep/beep_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,7 @@ +; Beep device driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Group",0x00000000,"Base" +HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ImagePath",0x00020000,"system32\drivers\beep.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Type",0x00010001,0x00000001 Propchange: trunk/reactos/drivers/base/beep/beep_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/CMak… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -19,3 +19,4 @@ set_module_type(ksecdd kernelmodedriver) add_importlibs(ksecdd ntoskrnl hal) add_cd_file(TARGET ksecdd DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(ksecdd_reg.inf) Added: trunk/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/ksec… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf (added) +++ trunk/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,7 @@ +; Kernel Security Support Provider Interface Driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","ErrorControl",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Group",0x00000000,"Base" +HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","ImagePath",0x00020000,"system32\drivers\ksecdd.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Type",0x00010001,0x00000001 Propchange: trunk/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -23,3 +23,4 @@ add_importlibs(cdfs ntoskrnl hal) add_pch(cdfs cdfs.h SOURCE) add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(cdfs_reg.inf) Added: trunk/reactos/drivers/filesystems/cdfs/cdfs_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs_reg.inf (added) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,7 @@ +; Cdfs (ISO96660) filesystem driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System" +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x00020000,"system32\drivers\cdfs.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002 Propchange: trunk/reactos/drivers/filesystems/cdfs/cdfs_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -12,3 +12,4 @@ add_importlibs(msfs ntoskrnl hal) add_pch(msfs msfs.h SOURCE) add_cd_file(TARGET msfs DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(msfs_reg.inf) Added: trunk/reactos/drivers/filesystems/msfs/msfs_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs_reg.inf (added) +++ trunk/reactos/drivers/filesystems/msfs/msfs_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,6 @@ +; Mailslot filesystem driver +HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Group",0x00000000,"File System" +HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ImagePath",0x00020000,"system32\drivers\msfs.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Type",0x00010001,0x00000002 Propchange: trunk/reactos/drivers/filesystems/msfs/msfs_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/npfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -28,3 +28,4 @@ add_importlibs(npfs ntoskrnl hal) add_pch(npfs npfs.h SOURCE) add_cd_file(TARGET npfs DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(npfs_reg.inf) Added: trunk/reactos/drivers/filesystems/npfs/npfs_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs_reg.inf (added) +++ trunk/reactos/drivers/filesystems/npfs/npfs_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,6 @@ +; Named Pipe filesystem driver +HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Group",0x00000000,"File System" +HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ImagePath",0x00020000,"system32\drivers\npfs.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Type",0x00010001,0x00000002 Propchange: trunk/reactos/drivers/filesystems/npfs/npfs_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/input/kbdclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/CMa… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -14,3 +14,4 @@ target_link_libraries(kbdclass ${PSEH_LIB}) add_importlibs(kbdclass ntoskrnl hal) add_cd_file(TARGET kbdclass DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(kbdclass_reg.inf) Added: trunk/reactos/drivers/input/kbdclass/kbdclass_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass_reg.inf (added) +++ trunk/reactos/drivers/input/kbdclass/kbdclass_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,9 @@ +; Keyboard class driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Group",0x00000000,"Keyboard Class" +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ImagePath",0x00020000,"system32\drivers\kbdclass.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass\Parameters","ConnectMultiplePorts",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"kbdclass" Propchange: trunk/reactos/drivers/input/kbdclass/kbdclass_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/input/mouclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/CMa… ============================================================================== --- trunk/reactos/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -14,3 +14,4 @@ add_importlibs(mouclass ntoskrnl hal) add_pch(mouclass mouclass.h SOURCE) add_cd_file(TARGET mouclass DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(mouclass_reg.inf) Added: trunk/reactos/drivers/input/mouclass/mouclass_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass_reg.inf (added) +++ trunk/reactos/drivers/input/mouclass/mouclass_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,9 @@ +; Mouse class driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Group",0x00000000,"Pointer Class" +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ImagePath",0x00020000,"system32\drivers\mouclass.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","ConnectMultiplePorts",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"mouclass" Propchange: trunk/reactos/drivers/input/mouclass/mouclass_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/network/afd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/CMakeL… ============================================================================== --- trunk/reactos/drivers/network/afd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -24,3 +24,4 @@ add_importlibs(afd ntoskrnl hal) add_pch(afd include/afd.h SOURCE) add_cd_file(TARGET afd DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(afd_reg.inf) Added: trunk/reactos/drivers/network/afd/afd_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd_re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd_reg.inf (added) +++ trunk/reactos/drivers/network/afd/afd_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,7 @@ +; Afd driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Group",0x00000000,"TDI" +HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ImagePath",0x00020000,"system32\drivers\afd.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x00000001 Propchange: trunk/reactos/drivers/network/afd/afd_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -11,3 +11,4 @@ add_importlibs(cdrom class2 scsiport ntoskrnl hal) add_pch(cdrom precomp.h SOURCE) add_cd_file(TARGET cdrom DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(cdrom_reg.inf) Added: trunk/reactos/drivers/storage/class/cdrom/cdrom_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom_reg.inf (added) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,7 @@ +; Cdrom class driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Group",0x00000000,"SCSI Class" +HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","ImagePath",0x00020000,"system32\drivers\cdrom.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Type",0x00010001,0x00000001 Propchange: trunk/reactos/drivers/storage/class/cdrom/cdrom_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/storage/class/disk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -4,3 +4,4 @@ set_module_type(disk kernelmodedriver) add_importlibs(disk class2 scsiport ntoskrnl hal) add_cd_file(TARGET disk DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(disk_reg.inf) Added: trunk/reactos/drivers/storage/class/disk/disk_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk_reg.inf (added) +++ trunk/reactos/drivers/storage/class/disk/disk_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,7 @@ +; Disk class driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Group",0x00000000,"SCSI Class" +HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ImagePath",0x00020000,"system32\drivers\disk.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Type",0x00010001,0x00000001 Propchange: trunk/reactos/drivers/storage/class/disk/disk_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/storage/floppy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/CMa… ============================================================================== --- trunk/reactos/drivers/storage/floppy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -13,3 +13,4 @@ set_module_type(floppy kernelmodedriver) add_importlibs(floppy hal ntoskrnl) add_cd_file(TARGET floppy DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(floppy_reg.inf) Added: trunk/reactos/drivers/storage/floppy/floppy_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy_reg.inf (added) +++ trunk/reactos/drivers/storage/floppy/floppy_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,7 @@ +; Floppy driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Group",0x00000000,"Primary Disk" +HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ImagePath",0x00020000,"system32\drivers\floppy.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Type",0x00010001,0x00000001 Propchange: trunk/reactos/drivers/storage/floppy/floppy_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -31,3 +31,4 @@ set_module_type(uniata kernelmodedriver) add_importlibs(uniata scsiport ntoskrnl hal) add_cd_file(TARGET uniata DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(uniata_reg.inf) Added: trunk/reactos/drivers/storage/ide/uniata/uniata_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata_reg.inf (added) +++ trunk/reactos/drivers/storage/ide/uniata/uniata_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,8 @@ +; UniATA/Atapi miniport driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"System Bus Extender" +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ImagePath",0x00020000,"system32\drivers\uniata.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000010 Propchange: trunk/reactos/drivers/storage/ide/uniata/uniata_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/storage/port/buslogic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/buslo… ============================================================================== --- trunk/reactos/drivers/storage/port/buslogic/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/port/buslogic/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -4,3 +4,4 @@ set_module_type(buslogic kernelmodedriver) add_importlibs(buslogic scsiport) add_cd_file(TARGET buslogic DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(buslogic_reg.inf) Added: trunk/reactos/drivers/storage/port/buslogic/buslogic_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/buslo… ============================================================================== --- trunk/reactos/drivers/storage/port/buslogic/buslogic_reg.inf (added) +++ trunk/reactos/drivers/storage/port/buslogic/buslogic_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,8 @@ +; BusLogic 958 miniport driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Group",0x00000000,"SCSI Miniport" +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ImagePath",0x00020000,"system32\drivers\buslogic.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Tag",0x00010001,0x00000020 Propchange: trunk/reactos/drivers/storage/port/buslogic/buslogic_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -10,3 +10,4 @@ add_pch(vbemp vbemp.h SOURCE) target_link_libraries(vbemp libcntpr) add_cd_file(TARGET vbemp DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(vbemp_reg.inf) Added: trunk/reactos/win32ss/drivers/miniport/vbe/vbemp_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vbe/vbemp_reg.inf (added) +++ trunk/reactos/win32ss/drivers/miniport/vbe/vbemp_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,27 @@ +; VBE SVGA driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save" +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ImagePath",0x00020000,"system32\drivers\vbemp.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Tag",0x00010001,0x00000001 + +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,8 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,640 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,480 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.FixedOutput",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Flags",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Orientation",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XPanning",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YPanning",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeX",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeY",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.ToDesktop",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.PrimaryDevice",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Device Description",0x00020000,"Generic VESA Adapter" + +; This is not true but it allows to use 3rd party drivers while having the VBE driver installed +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","VgaCompatible",0x00010001,1 Propchange: trunk/reactos/win32ss/drivers/miniport/vbe/vbemp_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -9,3 +9,4 @@ add_importlibs(vgamp videoprt) add_pch(vgamp vgamp.h SOURCE) add_cd_file(TARGET vgamp DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(vga_reg.inf) Added: trunk/reactos/win32ss/drivers/miniport/vga/vga_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga/vga_reg.inf (added) +++ trunk/reactos/win32ss/drivers/miniport/vga/vga_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,15 @@ +; VGA miniport driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Group",0x00000000,"Video Save" +HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ImagePath",0x00020000,"system32\drivers\vgamp.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Tag",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","VgaCompatible",0x00010001,1 + +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDrivers",0x00010000,"vgaddi" +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.VRefresh",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.BitsPerPel",0x00010001,8 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 Propchange: trunk/reactos/win32ss/drivers/miniport/vga/vga_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs