Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[akhaldi] 66953: [WSHOM.OCX] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

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

9 years, 9 months

[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

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

9 years, 9 months

[tkreuzer] 66951: [USETUP] Upgrade a few DPRINT to DPRINT1 for failure cases.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 29 11:29:02 2015 New Revision: 66951 URL: http://svn.reactos.org/svn/reactos?rev=66951&view=rev Log: [USETUP] Upgrade a few DPRINT to DPRINT1 for failure cases. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/registry.c trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Mar 29 11:29:02 2015 @@ -3633,7 +3633,7 @@ if (!SetInstallPathValue(&DestinationPath)) { - DPRINT("SetInstallPathValue() failed\n"); + DPRINT1("SetInstallPathValue() failed\n"); MUIDisplayError(ERROR_INITIALIZE_REGISTRY, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3643,7 +3643,7 @@ Status = NtInitializeRegistry(CM_BOOT_FLAG_SETUP); if (!NT_SUCCESS(Status)) { - DPRINT("NtInitializeRegistry() failed (Status %lx)\n", Status); + DPRINT1("NtInitializeRegistry() failed (Status %lx)\n", Status); MUIDisplayError(ERROR_CREATE_HIVE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3689,7 +3689,7 @@ if (!ImportRegistryFile(File, Section, LanguageId, Delete)) { - DPRINT("Importing %S failed\n", File); + DPRINT1("Importing %S failed\n", File); MUIDisplayError(ERROR_IMPORT_HIVE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; Modified: trunk/reactos/base/setup/usetup/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/registry… ============================================================================== --- trunk/reactos/base/setup/usetup/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/registry.c [iso-8859-1] Sun Mar 29 11:29:02 2015 @@ -560,7 +560,7 @@ &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT("NtOpenKey(%wZ) failed (Status %lx)\n", &Name, Status); + DPRINT1("NtOpenKey(%wZ) failed (Status %lx)\n", &Name, Status); continue; /* ignore if it doesn't exist */ } } @@ -571,7 +571,7 @@ &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT("CreateNestedKey(%wZ) failed (Status %lx)\n", &Name, Status); + DPRINT1("CreateNestedKey(%wZ) failed (Status %lx)\n", &Name, Status); continue; } } Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Sun Mar 29 11:29:02 2015 @@ -691,20 +691,20 @@ Entry = GetCurrentListEntry(List); if (Entry == NULL) { - DPRINT("GetCurrentListEntry() failed\n"); + DPRINT1("GetCurrentListEntry() failed\n"); return FALSE; } if (!SetupFindFirstLineW(InfFile, L"Display", (WCHAR*)GetListEntryUserData(Entry), &Context)) { - DPRINT("SetupFindFirstLineW() failed\n"); + DPRINT1("SetupFindFirstLineW() failed\n"); return FALSE; } /* Enable the right driver */ if (!INF_GetDataField(&Context, 3, &ServiceName)) { - DPRINT("INF_GetDataField() failed\n"); + DPRINT1("INF_GetDataField() failed\n"); return FALSE; } @@ -720,7 +720,7 @@ sizeof(ULONG)); if (!NT_SUCCESS(Status)) { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); return FALSE; } @@ -729,7 +729,7 @@ if (!INF_GetDataField(&Context, 4, &Buffer)) { - DPRINT("INF_GetDataField() failed\n"); + DPRINT1("INF_GetDataField() failed\n"); return FALSE; } @@ -742,13 +742,13 @@ sizeof(ULONG)); if (!NT_SUCCESS(Status)) { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); return FALSE; } if (!INF_GetDataField(&Context, 5, &Buffer)) { - DPRINT("INF_GetDataField() failed\n"); + DPRINT1("INF_GetDataField() failed\n"); return FALSE; } @@ -761,13 +761,13 @@ sizeof(ULONG)); if (!NT_SUCCESS(Status)) { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); return FALSE; } if (!INF_GetDataField(&Context, 6, &Buffer)) { - DPRINT("INF_GetDataField() failed\n"); + DPRINT1("INF_GetDataField() failed\n"); return FALSE; } @@ -780,7 +780,7 @@ sizeof(ULONG)); if (!NT_SUCCESS(Status)) { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); return FALSE; } @@ -928,7 +928,7 @@ PGENERIC_LIST CreateLanguageList( HINF InfFile, - WCHAR *DefaultLanguage) + WCHAR *DefaultLanguage) { CHAR Buffer[128]; PGENERIC_LIST List; @@ -956,7 +956,7 @@ if (!SetupFindFirstLineW (InfFile, L"Language", NULL, &Context)) { DestroyGenericList(List, FALSE); - return NULL; + return NULL; } do

9 years, 9 months

[tfaber] 66950: [NTOS:MM] - Do not track failed pool allocations as successful CORE-9440 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Mar 29 10:02:47 2015 New Revision: 66950 URL: http://svn.reactos.org/svn/reactos?rev=66950&view=rev Log: [NTOS:MM] - Do not track failed pool allocations as successful CORE-9440 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sun Mar 29 10:02:47 2015 @@ -1632,6 +1632,8 @@ { ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); } + + return NULL; } //

9 years, 9 months

[tfaber] 66949: [WSCRIPT] - Mark as GUI app CORE-9439

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Mar 29 07:48:38 2015 New Revision: 66949 URL: http://svn.reactos.org/svn/reactos?rev=66949&view=rev Log: [WSCRIPT] - Mark as GUI app CORE-9439 Modified: trunk/reactos/base/applications/cmdutils/wscript/CMakeLists.txt 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 07:48:38 2015 @@ -10,7 +10,7 @@ add_typelib(ihost.idl) 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 win32cui UNICODE) +set_module_type(wscript win32gui UNICODE) add_importlibs(wscript shell32 oleaut32 ole32 advapi32 msvcrt kernel32 ntdll) add_dependencies(wscript stdole2 wscript_idlheader) add_pch(wscript wscript.h SOURCE)

9 years, 9 months

[tfaber] 66948: [NTOSKRNL] - More pool tagging!

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Mar 29 06:04:19 2015 New Revision: 66948 URL: http://svn.reactos.org/svn/reactos?rev=66948&view=rev Log: [NTOSKRNL] - More pool tagging! Modified: trunk/reactos/ntoskrnl/include/internal/tag.h trunk/reactos/ntoskrnl/lpc/connect.c trunk/reactos/ntoskrnl/po/events.c trunk/reactos/ntoskrnl/po/power.c trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/ntoskrnl/se/access.c trunk/reactos/ntoskrnl/se/audit.c trunk/reactos/ntoskrnl/se/priv.c trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -164,16 +164,14 @@ /* formerly located in rtl/handle.c */ #define TAG_HDTB 'BTDH' -/* formerly located in se/acl.c */ -#define TAG_ACL 'cAeS' - -/* formerly located in se/sid.c */ -#define TAG_SID 'iSeS' - -/* formerly located in se/sd.c */ -#define TAG_SD 'dSeS' - -/* formerly located in se/token.c */ +/* Security Manager Tags */ +#define TAG_SE ' eS' +#define TAG_ACL 'cAeS' +#define TAG_SID 'iSeS' +#define TAG_SD 'dSeS' +#define TAG_QOS 'sQeS' +#define TAG_LUID 'uLeS' +#define TAG_PRIVILEGE_SET 'rPeS' #define TAG_TOKEN_USERS 'uKOT' #define TAG_TOKEN_PRIVILAGES 'pKOT' #define TAG_TOKEN_ACL 'kDOT' Modified: trunk/reactos/ntoskrnl/lpc/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/connect.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/connect.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/connect.c [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -164,7 +164,7 @@ //Status = SeQueryInformationToken(Token, TokenUser, (PVOID*)&TokenUserInfo); // FIXME: Need SeQueryInformationToken Status = STATUS_SUCCESS; - TokenUserInfo = ExAllocatePool(PagedPool, sizeof(TOKEN_USER)); + TokenUserInfo = ExAllocatePoolWithTag(PagedPool, sizeof(TOKEN_USER), TAG_SE); TokenUserInfo->User.Sid = ServerSid; PsDereferencePrimaryToken(Token); @@ -179,7 +179,7 @@ } /* Free token information */ - ExFreePool(TokenUserInfo); + ExFreePoolWithTag(TokenUserInfo, TAG_SE); } } else Modified: trunk/reactos/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/events.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -91,7 +91,7 @@ if (!SysButtonContext->WorkItem) { DPRINT("IoAllocateWorkItem() failed\n"); - ExFreePool(SysButtonContext); + ExFreePoolWithTag(SysButtonContext, 'IWOP'); return STATUS_SUCCESS; } IoQueueWorkItem( @@ -139,7 +139,7 @@ else { DPRINT1("IoBuildDeviceIoControlRequest() failed\n"); - ExFreePool(SysButtonContext); + ExFreePoolWithTag(SysButtonContext, 'IWOP'); } IoFreeWorkItem(CurrentWorkItem); @@ -258,10 +258,12 @@ DPRINT(" )\n"); } - SysButtonContext = ExAllocatePool(NonPagedPool, sizeof(SYS_BUTTON_CONTEXT)); + SysButtonContext = ExAllocatePoolWithTag(NonPagedPool, + sizeof(SYS_BUTTON_CONTEXT), + 'IWOP'); if (!SysButtonContext) { - DPRINT1("ExAllocatePool() failed\n"); + DPRINT1("ExAllocatePoolWithTag() failed\n"); ZwClose(FileHandle); return STATUS_INSUFFICIENT_RESOURCES; } @@ -273,7 +275,7 @@ { DPRINT1("IoAllocateWorkItem() failed\n"); ZwClose(FileHandle); - ExFreePool(SysButtonContext); + ExFreePoolWithTag(SysButtonContext, 'IWOP'); return STATUS_INSUFFICIENT_RESOURCES; } IoQueueWorkItem( Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=66… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -59,7 +59,7 @@ IoFreeIrp(Irp); ObDereferenceObject(RequestPowerItem->TopDeviceObject); - ExFreePool(Context); + ExFreePoolWithTag(Context, 'IRoP'); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -528,7 +528,9 @@ && MinorFunction != IRP_MN_WAIT_WAKE) return STATUS_INVALID_PARAMETER_2; - RequestPowerItem = ExAllocatePool(NonPagedPool, sizeof(REQUEST_POWER_ITEM)); + RequestPowerItem = ExAllocatePoolWithTag(NonPagedPool, + sizeof(REQUEST_POWER_ITEM), + 'IRoP'); if (!RequestPowerItem) return STATUS_INSUFFICIENT_RESOURCES; @@ -544,7 +546,7 @@ if (!Irp) { ObDereferenceObject(TopDeviceObject); - ExFreePool(RequestPowerItem); + ExFreePoolWithTag(RequestPowerItem, 'IRoP'); return STATUS_INSUFFICIENT_RESOURCES; } Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -14,6 +14,7 @@ #include <debug.h> #define TAG_ATMT 'TotA' /* Atom table */ +#define TAG_RTHL 'LHtR' /* Heap Lock */ extern ULONG NtGlobalFlag; @@ -159,7 +160,7 @@ RtlDeleteHeapLock(IN OUT PHEAP_LOCK Lock) { ExDeleteResourceLite(&Lock->Resource); - ExFreePool(Lock); + ExFreePoolWithTag(Lock, TAG_RTHL); return STATUS_SUCCESS; } @@ -200,7 +201,9 @@ NTAPI RtlInitializeHeapLock(IN OUT PHEAP_LOCK *Lock) { - PHEAP_LOCK HeapLock = ExAllocatePool(NonPagedPool, sizeof(HEAP_LOCK)); + PHEAP_LOCK HeapLock = ExAllocatePoolWithTag(NonPagedPool, + sizeof(HEAP_LOCK), + TAG_RTHL); if (HeapLock == NULL) return STATUS_NO_MEMORY; @@ -580,8 +583,9 @@ PRTL_ATOM_TABLE RtlpAllocAtomTable(ULONG Size) { - PRTL_ATOM_TABLE Table = ExAllocatePool(NonPagedPool, - Size); + PRTL_ATOM_TABLE Table = ExAllocatePoolWithTag(NonPagedPool, + Size, + TAG_ATMT); if (Table != NULL) { RtlZeroMemory(Table, @@ -594,7 +598,7 @@ VOID RtlpFreeAtomTable(PRTL_ATOM_TABLE AtomTable) { - ExFreePool(AtomTable); + ExFreePoolWithTag(AtomTable, TAG_ATMT); } PRTL_ATOM_TABLE_ENTRY Modified: trunk/reactos/ntoskrnl/se/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/access.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/se/access.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/access.c [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -460,7 +460,8 @@ AuxData = AccessState->AuxData; /* Deallocate Privileges */ - if (AccessState->PrivilegesAllocated) ExFreePool(AuxData->PrivilegeSet); + if (AccessState->PrivilegesAllocated) + ExFreePoolWithTag(AuxData->PrivilegeSet, TAG_PRIVILEGE_SET); /* Deallocate Name and Type Name */ if (AccessState->ObjectName.Buffer) Modified: trunk/reactos/ntoskrnl/se/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?rev=66… ============================================================================== --- trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -1113,7 +1113,7 @@ /* Allocate a temp buffer */ CapturedPrivilegeSet = ExAllocatePoolWithTag(PagedPool, PrivilegeSetSize, - 'rPeS'); + TAG_PRIVILEGE_SET); if (CapturedPrivilegeSet == NULL) { DPRINT1("Failed to allocate %u bytes\n", PrivilegeSetSize); @@ -1215,7 +1215,7 @@ SeReleaseSecurityDescriptor(CapturedSecurityDescriptor, UserMode, FALSE); if (CapturedPrivilegeSet != NULL) - ExFreePoolWithTag(CapturedPrivilegeSet, 'rPeS'); + ExFreePoolWithTag(CapturedPrivilegeSet, TAG_PRIVILEGE_SET); /* Release the security subject context */ SeReleaseSubjectContext(&SubjectContext); @@ -1336,7 +1336,7 @@ /* Allocate a temp buffer */ CapturedPrivileges = ExAllocatePoolWithTag(PagedPool, PrivilegesSize, - 'rPeS'); + TAG_PRIVILEGE_SET); if (CapturedPrivileges == NULL) { DPRINT1("Failed to allocate %u bytes\n", PrivilegesSize); @@ -1375,7 +1375,7 @@ ReleaseCapturedUnicodeString(&CapturedServiceName, PreviousMode); if (CapturedPrivileges != NULL) - ExFreePoolWithTag(CapturedPrivileges, 'rPeS'); + ExFreePoolWithTag(CapturedPrivileges, TAG_PRIVILEGE_SET); /* Release the security subject context */ SeReleaseSubjectContext(&SubjectContext); Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=669… ============================================================================== --- trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -219,7 +219,7 @@ { /* Calculate size and allocate the structure */ PrivilegeSize = FIELD_OFFSET(PRIVILEGE_SET, Privilege[PrivilegeCount]); - PrivilegeSet = ExAllocatePoolWithTag(PagedPool, PrivilegeSize, 'rPeS'); + PrivilegeSet = ExAllocatePoolWithTag(PagedPool, PrivilegeSize, TAG_PRIVILEGE_SET); *OutPrivilegeSet = PrivilegeSet; if (PrivilegeSet == NULL) { @@ -352,8 +352,9 @@ } else { - *Dest = ExAllocatePool(PoolType, - BufferSize); + *Dest = ExAllocatePoolWithTag(PoolType, + BufferSize, + TAG_LUID); if (*Dest == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -375,7 +376,7 @@ if (!NT_SUCCESS(Status) && AllocatedMem == NULL) { - ExFreePool(*Dest); + ExFreePoolWithTag(*Dest, TAG_LUID); } return Status; @@ -392,7 +393,7 @@ if (Privilege != NULL && (PreviousMode != KernelMode || CaptureIfKernel)) { - ExFreePool(Privilege); + ExFreePoolWithTag(Privilege, TAG_LUID); } } @@ -428,7 +429,9 @@ Privileges->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); /* Allocate a new privilege set */ - PrivilegeSet = ExAllocatePool(PagedPool, NewPrivilegeSetSize); + PrivilegeSet = ExAllocatePoolWithTag(PagedPool, + NewPrivilegeSetSize, + TAG_PRIVILEGE_SET); if (PrivilegeSet == NULL) return STATUS_INSUFFICIENT_RESOURCES; @@ -447,7 +450,7 @@ /* Free the old privilege set if it was allocated */ if (AccessState->PrivilegesAllocated != FALSE) - ExFreePool(AuxData->PrivilegeSet); + ExFreePoolWithTag(AuxData->PrivilegeSet, TAG_PRIVILEGE_SET); /* Now we are using an allocated privilege set */ AccessState->PrivilegesAllocated = TRUE; @@ -477,7 +480,7 @@ SeFreePrivileges(IN PPRIVILEGE_SET Privileges) { PAGED_CODE(); - ExFreePool(Privileges); + ExFreePoolWithTag(Privileges, TAG_PRIVILEGE_SET); } /* Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=66948… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Sun Mar 29 06:04:19 2015 @@ -281,8 +281,9 @@ { if (*Present) { - CapturedQos = ExAllocatePool(PoolType, - sizeof(SECURITY_QUALITY_OF_SERVICE)); + CapturedQos = ExAllocatePoolWithTag(PoolType, + sizeof(SECURITY_QUALITY_OF_SERVICE), + TAG_QOS); if (CapturedQos != NULL) { RtlCopyMemory(CapturedQos, @@ -312,8 +313,9 @@ if (((PSECURITY_QUALITY_OF_SERVICE)ObjectAttributes->SecurityQualityOfService)->Length == sizeof(SECURITY_QUALITY_OF_SERVICE)) { - CapturedQos = ExAllocatePool(PoolType, - sizeof(SECURITY_QUALITY_OF_SERVICE)); + CapturedQos = ExAllocatePoolWithTag(PoolType, + sizeof(SECURITY_QUALITY_OF_SERVICE), + TAG_QOS); if (CapturedQos != NULL) { RtlCopyMemory(CapturedQos, @@ -371,7 +373,7 @@ if (CapturedSecurityQualityOfService != NULL && (AccessMode != KernelMode || CaptureIfKernel)) { - ExFreePool(CapturedSecurityQualityOfService); + ExFreePoolWithTag(CapturedSecurityQualityOfService, TAG_QOS); } } @@ -904,9 +906,11 @@ } SaclLength = Sacl ? ROUND_UP((ULONG)Sacl->AclSize, 4) : 0; - NewSd = ExAllocatePool(NonPagedPool, - sizeof(SECURITY_DESCRIPTOR_RELATIVE) + OwnerLength + GroupLength + - DaclLength + SaclLength); + NewSd = ExAllocatePoolWithTag(NonPagedPool, + sizeof(SECURITY_DESCRIPTOR_RELATIVE) + + OwnerLength + GroupLength + + DaclLength + SaclLength, + TAG_SD); if (NewSd == NULL) { return STATUS_INSUFFICIENT_RESOURCES;

9 years, 9 months

[hbelusca] 66947: [BIN2C][CAT]: Use stderr for printing errors (to not mix them up with normal output that should go to stdout. This is especially needed for cat).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 29 02:00:15 2015 New Revision: 66947 URL: http://svn.reactos.org/svn/reactos?rev=66947&view=rev Log: [BIN2C][CAT]: Use stderr for printing errors (to not mix them up with normal output that should go to stdout. This is especially needed for cat). Modified: trunk/reactos/tools/bin2c.c trunk/reactos/tools/cat.c Modified: trunk/reactos/tools/bin2c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.c?rev=66947&r1… ============================================================================== --- trunk/reactos/tools/bin2c.c [iso-8859-1] (original) +++ trunk/reactos/tools/bin2c.c [iso-8859-1] Sun Mar 29 02:00:15 2015 @@ -19,7 +19,7 @@ /* Validate the arguments */ if (argc < 5) { - printf("Usage: bin2c infile.bin outfile.c outfile.h array_name [array_attribute [header_for_attribute]]\n"); + fprintf(stdout, "Usage: bin2c infile.bin outfile.c outfile.h array_name [array_attribute [header_for_attribute]]\n"); return -1; } @@ -27,14 +27,14 @@ inFile = fopen(argv[1], "rb"); if (!inFile) { - printf("ERROR: Couldn't open data file '%s'.\n", argv[1]); + fprintf(stderr, "ERROR: Couldn't open data file '%s'.\n", argv[1]); return -1; } outCFile = fopen(argv[2], "w"); if (!outCFile) { fclose(inFile); - printf("ERROR: Couldn't create output source file '%s'.\n", argv[2]); + fprintf(stderr, "ERROR: Couldn't create output source file '%s'.\n", argv[2]); return -1; } outHFile = fopen(argv[3], "w"); @@ -42,7 +42,7 @@ { fclose(outCFile); fclose(inFile); - printf("ERROR: Couldn't create output header file '%s'.\n", argv[3]); + fprintf(stderr, "ERROR: Couldn't create output header file '%s'.\n", argv[3]); return -1; } Modified: trunk/reactos/tools/cat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cat.c?rev=66947&r1=6… ============================================================================== --- trunk/reactos/tools/cat.c [iso-8859-1] (original) +++ trunk/reactos/tools/cat.c [iso-8859-1] Sun Mar 29 02:00:15 2015 @@ -23,11 +23,12 @@ void help(void) { - printf("\n" - "ReactOS File Concatenation Tool\n" - "\n" - "Usage: cat [options] [file [...]]\n" - "options - Currently ignored\n"); + fprintf(stdout, + "\n" + "ReactOS File Concatenation Tool\n" + "\n" + "Usage: cat [options] [file [...]]\n" + "options - Currently ignored\n"); } int main(int argc, char* argv[]) @@ -84,7 +85,7 @@ in = fopen(argv[i], "rb"); if (in == NULL) { - printf("Failed to open file '%s'\n", argv[i]); + fprintf(stderr, "Failed to open file '%s'\n", argv[i]); return -1; } @@ -104,7 +105,7 @@ */ if (!feof(in)) { - printf("Error while reading file '%s'\n", argv[i]); + fprintf(stderr, "Error while reading file '%s'\n", argv[i]); fclose(in); return -1; }

9 years, 9 months

[hbelusca] 66946: [CMAKE] Improve the concatenate_files macro introduced by Timo in r52179 + r52182 and hackfixed in r53914 . Notice that now it can take an arbitrary number of files to be concaten...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 29 01:53:10 2015 New Revision: 66946 URL: http://svn.reactos.org/svn/reactos?rev=66946&view=rev Log: [CMAKE] Improve the concatenate_files macro introduced by Timo in r52179 + r52182 and hackfixed in r53914 . Notice that now it can take an arbitrary number of files to be concatenated. Hence you need to specify first the output file, and all the rest is the different files. [FREELDR] Use the improved concatenate_files macro. Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/cmake/CMakeMacros.cmake 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 01:53:10 2015 @@ -226,10 +226,13 @@ 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 - ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys) + ${_freeldr_pe_output_file}) add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys) @@ -238,9 +241,9 @@ add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR livecd hybridcd NAME_ON_CD setupldr.sys) concatenate_files( + ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - freeldr_pe - ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) + ${_freeldr_pe_output_file}) 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 01:53:10 2015 @@ -504,33 +504,12 @@ endfunction() endif() -if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") - macro(to_win_path _cmake_path _native_path) - string(REPLACE "/" "\\" ${_native_path} "${_cmake_path}") - endmacro() - - # yeah the parameter mess sucks, but thats what works... - function(concatenate_files _file1 _target2 _output) - get_target_property(_file2 ${_target2} LOCATION) - to_win_path("${_file1}" _real_file1) - to_win_path("${_file2}" _real_file2) - to_win_path("${_output}" _real_output) - add_custom_command( - OUTPUT ${_output} - COMMAND cmd.exe /C "copy /Y /B ${_real_file1} + ${_real_file2} ${_real_output} > nul" - DEPENDS ${_file1} - DEPENDS ${_target2}) - endfunction() -else() - macro(concatenate_files _file1 _target2 _output) - get_target_property(_file2 ${_target2} LOCATION) - add_custom_command( - OUTPUT ${_output} - COMMAND cat ${_file1} ${_file2} > ${_output} - DEPENDS ${_file1} - DEPENDS ${_target2}) - endmacro() -endif() +macro(concatenate_files _output) + add_custom_command( + OUTPUT ${_output} + COMMAND native-cat ${ARGN} > ${_output} + DEPENDS ${ARGN} native-cat) +endmacro() function(add_importlibs _module) add_dependency_node(${_module})

9 years, 9 months

[hbelusca] 66945: [CAT] - stricmp doesn't exist in *nix, use strcasecmp instead. - setmode (for setting IO streams mode -- text, binary --) is useless in *nix world, so just define it as a dummy fu...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 29 00:52:49 2015 New Revision: 66945 URL: http://svn.reactos.org/svn/reactos?rev=66945&view=rev Log: [CAT] - stricmp doesn't exist in *nix, use strcasecmp instead. - setmode (for setting IO streams mode -- text, binary --) is useless in *nix world, so just define it as a dummy function. Should fix build. Modified: trunk/reactos/tools/cat.c Modified: trunk/reactos/tools/cat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cat.c?rev=66945&r1=6… ============================================================================== --- trunk/reactos/tools/cat.c [iso-8859-1] (original) +++ trunk/reactos/tools/cat.c [iso-8859-1] Sun Mar 29 00:52:49 2015 @@ -8,8 +8,16 @@ * Hermès Bélusca - Maïto */ +#include <stdio.h> + +#ifdef _WIN32 #include <fcntl.h> -#include <stdio.h> +#else +#define O_TEXT 0x4000 +#define O_BINARY 0x8000 +#define setmode(fd, mode) // This function is useless in *nix world. +#define stricmp strcasecmp +#endif #define ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0]))

9 years, 9 months

[gadamopoulos] 66944: [SHELL32] - Load the shell extensions of the * class only for files. CORE-6806

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Mar 29 00:37:39 2015 New Revision: 66944 URL: http://svn.reactos.org/svn/reactos?rev=66944&view=rev Log: [SHELL32] - Load the shell extensions of the * class only for files. CORE-6806 Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Sun Mar 29 00:37:39 2015 @@ -760,13 +760,6 @@ } } } - - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"*", 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - /* load default extensions */ - EnumerateDynamicContextHandlerForKey(hKey); - RegCloseKey(hKey); - } } } else @@ -844,6 +837,15 @@ /* sendto service is registered here */ EnumerateDynamicContextHandlerForKey(hKey); RegCloseKey(hKey); + } + + if (!(rfg & SFGAO_FOLDER)) + { + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"*", 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + EnumerateDynamicContextHandlerForKey(hKey); + RegCloseKey(hKey); + } } }

9 years, 9 months

← Newer
1
2
3
4
5
6
7
8
9
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2015