Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[akhaldi] 70154: [KERNEL32] Partially sync profile.c with Wine Staging 1.7.55. Fixes 2 kernel32:profile tests. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 27 18:46:45 2015 New Revision: 70154 URL: http://svn.reactos.org/svn/reactos?rev=70154&view=rev Log: [KERNEL32] Partially sync profile.c with Wine Staging 1.7.55. Fixes 2 kernel32:profile tests. CORE-10536 Modified: trunk/reactos/dll/win32/kernel32/wine/profile.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/kernel32/wine/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/profile.c [iso-8859-1] Fri Nov 27 18:46:45 2015 @@ -256,8 +256,8 @@ } } -/* returns 1 if a character white space else 0 */ -static inline int PROFILE_isspaceW(WCHAR c) +/* returns TRUE if a whitespace character, else FALSE */ +static inline BOOL PROFILE_isspaceW(WCHAR c) { /* ^Z (DOS EOF) is a space too (found on CD-ROMs) */ return isspaceW(c) || c == 0x1a; @@ -489,7 +489,7 @@ { while (*section) { - if ((*section)->name[0] && !strcmpiW( (*section)->name, name )) + if (!strcmpiW( (*section)->name, name )) { PROFILESECTION *to_del = *section; *section = to_del->next; @@ -513,7 +513,7 @@ { while (*section) { - if ((*section)->name[0] && !strcmpiW( (*section)->name, section_name )) + if (!strcmpiW( (*section)->name, section_name )) { PROFILEKEY **key = &(*section)->key; while (*key) @@ -545,7 +545,7 @@ PROFILESECTION **section= &CurProfile->section; while (*section) { - if ((*section)->name[0] && !strcmpiW( (*section)->name, section_name )) + if (!strcmpiW( (*section)->name, section_name )) { PROFILEKEY **key = &(*section)->key; while (*key) @@ -571,31 +571,28 @@ LPCWSTR key_name, BOOL create, BOOL create_always ) { LPCWSTR p; - int seclen, keylen; + int seclen = 0, keylen = 0; while (PROFILE_isspaceW(*section_name)) section_name++; if (*section_name) + { p = section_name + strlenW(section_name) - 1; - else - p = section_name; - - while ((p > section_name) && PROFILE_isspaceW(*p)) p--; - seclen = p - section_name + 1; + while ((p > section_name) && PROFILE_isspaceW(*p)) p--; + seclen = p - section_name + 1; + } while (PROFILE_isspaceW(*key_name)) key_name++; if (*key_name) + { p = key_name + strlenW(key_name) - 1; - else - p = key_name; - - while ((p > key_name) && PROFILE_isspaceW(*p)) p--; - keylen = p - key_name + 1; + while ((p > key_name) && PROFILE_isspaceW(*p)) p--; + keylen = p - key_name + 1; + } while (*section) { - if ( ((*section)->name[0]) - && (!(strncmpiW( (*section)->name, section_name, seclen ))) - && (((*section)->name)[seclen] == '\0') ) + if (!strncmpiW((*section)->name, section_name, seclen) && + ((*section)->name)[seclen] == '\0') { PROFILEKEY **key = &(*section)->key; @@ -862,7 +859,7 @@ while (section) { - if (section->name[0] && !strcmpiW( section->name, section_name )) + if (!strcmpiW( section->name, section_name )) { UINT oldlen = len; for (key = section->key; key; key = key->next) @@ -977,11 +974,6 @@ if (!def_val) def_val = empty_strW; if (key_name) { - if (!key_name[0]) - { - PROFILE_CopyEntry(buffer, def_val, len, TRUE); - return strlenW(buffer); - } key = PROFILE_Find( &CurProfile->section, section, key_name, FALSE, FALSE); PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len, TRUE ); @@ -991,7 +983,7 @@ return strlenW( buffer ); } /* no "else" here ! */ - if (section && section[0]) + if (section) { INT ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, FALSE); if (!buffer[0]) /* no luck -> def_val */ @@ -1102,11 +1094,11 @@ if (p >= def_val) { - int len = (int)(p - def_val) + 1; - - defval_tmp = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); - memcpy(defval_tmp, def_val, len * sizeof(WCHAR)); - defval_tmp[len] = '\0'; + int vlen = (int)(p - def_val) + 1; + + defval_tmp = HeapAlloc(GetProcessHeap(), 0, (vlen + 1) * sizeof(WCHAR)); + memcpy(defval_tmp, def_val, vlen * sizeof(WCHAR)); + defval_tmp[vlen] = '\0'; def_val = defval_tmp; } } @@ -1391,8 +1383,8 @@ /*********************************************************************** * WritePrivateProfileStringA (KERNEL32.@) */ -BOOL WINAPI WritePrivateProfileStringA( LPCSTR section, LPCSTR entry, - LPCSTR string, LPCSTR filename ) +BOOL WINAPI DECLSPEC_HOTPATCH WritePrivateProfileStringA( LPCSTR section, LPCSTR entry, + LPCSTR string, LPCSTR filename ) { UNICODE_STRING sectionW, entryW, stringW, filenameW; BOOL ret; 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] Fri Nov 27 18:46:45 2015 @@ -269,7 +269,7 @@ reactos/dll/win32/kernel32/wine/actctx.c # Partly synced with Wine 1.7.55 reactos/dll/win32/kernel32/wine/comm.c # Synced in r52754 reactos/dll/win32/kernel32/wine/lzexpand.c # Synced in r52754 - reactos/dll/win32/kernel32/wine/profile.c # Synced in r52754 + reactos/dll/win32/kernel32/wine/profile.c # Partially synced to WineStaging-1.7.55 reactos/dll/win32/kernel32/wine/res.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/casemap.c # Synced to WineStaging-1.7.37 reactos/dll/win32/kernel32/winnls/string/chartype.c # Synced in r52754

9 years

[tfaber] 70153: [NTDLL_WINETEST] - Fix warnings

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Nov 27 18:27:41 2015 New Revision: 70153 URL: http://svn.reactos.org/svn/reactos?rev=70153&view=rev Log: [NTDLL_WINETEST] - Fix warnings Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt trunk/rostests/winetests/ntdll/rtl.c Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeList… ============================================================================== --- trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] Fri Nov 27 18:27:41 2015 @@ -34,5 +34,5 @@ add_cd_file(TARGET ntdll_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) - add_target_compile_flags(ntdll_winetest "-Wno-format -Wno-error") + add_target_compile_flags(ntdll_winetest "-Wno-format") endif() Modified: trunk/rostests/winetests/ntdll/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] Fri Nov 27 18:27:41 2015 @@ -108,8 +108,8 @@ static NTSTATUS (WINAPI *pRtlDecompressBuffer)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, PULONG); static NTSTATUS (WINAPI *pRtlDecompressFragment)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, ULONG, PULONG, PVOID); static NTSTATUS (WINAPI *pRtlCompressBuffer)(USHORT, const UCHAR*, ULONG, PUCHAR, ULONG, ULONG, PULONG, PVOID); -static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(RTL_CRITICAL_SECTION *); -static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(RTL_CRITICAL_SECTION *); +static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *); +static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);

9 years

[akhaldi] 70152: [KERNEL32][NTDLL] Apply Wine commit ab91c01 by Sebastian Lackner: RtlFindActivationContextSectionString should accept a NULL pointer as data. Fixes 15 kernel32:actctx tests. CORE-1...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Nov 27 18:06:47 2015 New Revision: 70152 URL: http://svn.reactos.org/svn/reactos?rev=70152&view=rev Log: [KERNEL32][NTDLL] Apply Wine commit ab91c01 by Sebastian Lackner: RtlFindActivationContextSectionString should accept a NULL pointer as data. Fixes 15 kernel32:actctx tests. CORE-10536 Modified: trunk/reactos/dll/win32/kernel32/wine/actctx.c trunk/reactos/lib/rtl/actctx.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/kernel32/wine/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/ac… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/actctx.c [iso-8859-1] Fri Nov 27 18:06:47 2015 @@ -132,7 +132,7 @@ TRACE("%08x %s %u %s %p\n", dwFlags, debugstr_guid(lpExtGuid), ulId, debugstr_a(lpSearchStr), pInfo); - if (!lpSearchStr) + if (!lpSearchStr || !pInfo) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -159,6 +159,12 @@ { UNICODE_STRING us; NTSTATUS status; + + if (!pInfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } RtlInitUnicodeString(&us, lpSearchStr); if ((status = RtlFindActivationContextSectionString(dwFlags, lpExtGuid, ulId, &us, pInfo))) Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=70152… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Fri Nov 27 18:06:47 2015 @@ -3287,19 +3287,22 @@ DPRINT("index: %d\n", index); if (!index) return STATUS_SXS_KEY_NOT_FOUND; - dll = get_dllredirect_data(actctx, index); - - data->ulDataFormatVersion = 1; - data->lpData = dll; - data->ulLength = dll->size; - data->lpSectionGlobalData = NULL; - data->ulSectionGlobalDataLength = 0; - data->lpSectionBase = actctx->dllredirect_section; - data->ulSectionTotalLength = RtlSizeHeap( RtlGetProcessHeap(), 0, actctx->dllredirect_section ); - data->hActCtx = NULL; - - if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) - data->ulAssemblyRosterIndex = index->rosterindex; + if (data) + { + dll = get_dllredirect_data(actctx, index); + + data->ulDataFormatVersion = 1; + data->lpData = dll; + data->ulLength = dll->size; + data->lpSectionGlobalData = NULL; + data->ulSectionGlobalDataLength = 0; + data->lpSectionBase = actctx->dllredirect_section; + data->ulSectionTotalLength = RtlSizeHeap( RtlGetProcessHeap(), 0, actctx->dllredirect_section ); + data->hActCtx = NULL; + + if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) + data->ulAssemblyRosterIndex = index->rosterindex; + } return STATUS_SUCCESS; } @@ -3496,20 +3499,23 @@ if (!index) return STATUS_SXS_KEY_NOT_FOUND; - class = get_wndclass_data(actctx, index); - - data->ulDataFormatVersion = 1; - data->lpData = class; - /* full length includes string length with nulls */ - data->ulLength = class->size + class->name_len + class->module_len + 2*sizeof(WCHAR); - data->lpSectionGlobalData = NULL; - data->ulSectionGlobalDataLength = 0; - data->lpSectionBase = actctx->wndclass_section; - data->ulSectionTotalLength = RtlSizeHeap( RtlGetProcessHeap(), 0, actctx->wndclass_section ); - data->hActCtx = NULL; - - if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) - data->ulAssemblyRosterIndex = index->rosterindex; + if (data) + { + class = get_wndclass_data(actctx, index); + + data->ulDataFormatVersion = 1; + data->lpData = class; + /* full length includes string length with nulls */ + data->ulLength = class->size + class->name_len + class->module_len + 2*sizeof(WCHAR); + data->lpSectionGlobalData = NULL; + data->ulSectionGlobalDataLength = 0; + data->lpSectionBase = actctx->wndclass_section; + data->ulSectionTotalLength = RtlSizeHeap( RtlGetProcessHeap(), 0, actctx->wndclass_section ); + data->hActCtx = NULL; + + if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) + data->ulAssemblyRosterIndex = index->rosterindex; + } return STATUS_SUCCESS; } @@ -4551,19 +4557,22 @@ index = find_string_index(actctx->progid_section, name); if (!index) return STATUS_SXS_KEY_NOT_FOUND; - progid = get_progid_data(actctx, index); - - data->ulDataFormatVersion = 1; - data->lpData = progid; - data->ulLength = progid->size; - data->lpSectionGlobalData = (BYTE*)actctx->progid_section + actctx->progid_section->global_offset; - data->ulSectionGlobalDataLength = actctx->progid_section->global_len; - data->lpSectionBase = actctx->progid_section; - data->ulSectionTotalLength = RtlSizeHeap( RtlGetProcessHeap(), 0, actctx->progid_section ); - data->hActCtx = NULL; - - if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) - data->ulAssemblyRosterIndex = index->rosterindex; + if (data) + { + progid = get_progid_data(actctx, index); + + data->ulDataFormatVersion = 1; + data->lpData = progid; + data->ulLength = progid->size; + data->lpSectionGlobalData = (BYTE*)actctx->progid_section + actctx->progid_section->global_offset; + data->ulSectionGlobalDataLength = actctx->progid_section->global_len; + data->lpSectionBase = actctx->progid_section; + data->ulSectionTotalLength = RtlSizeHeap( RtlGetProcessHeap(), 0, actctx->progid_section ); + data->hActCtx = NULL; + + if (data->cbSize >= FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) + sizeof(ULONG)) + data->ulAssemblyRosterIndex = index->rosterindex; + } return STATUS_SUCCESS; } @@ -4595,7 +4604,7 @@ if (status != STATUS_SUCCESS) return status; - if (flags & FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX) + if (data && (flags & FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX)) { actctx_addref(actctx); data->hActCtx = actctx; 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] Fri Nov 27 18:06:47 2015 @@ -266,7 +266,7 @@ reactos/dll/win32/gdi32/objects/linedda.c # Synced at 20090410 kernel32 - - reactos/dll/win32/kernel32/wine/actctx.c # Partly synced with Wine 1.7.17 + reactos/dll/win32/kernel32/wine/actctx.c # Partly synced with Wine 1.7.55 reactos/dll/win32/kernel32/wine/comm.c # Synced in r52754 reactos/dll/win32/kernel32/wine/lzexpand.c # Synced in r52754 reactos/dll/win32/kernel32/wine/profile.c # Synced in r52754

9 years

[tfaber] 70151: [NTOS:SE] - Fail in SeAccessCheck if the resulting access would be zero. CORE-10587 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Nov 27 12:06:59 2015 New Revision: 70151 URL: http://svn.reactos.org/svn/reactos?rev=70151&view=rev Log: [NTOS:SE] - Fail in SeAccessCheck if the resulting access would be zero. CORE-10587 #resolve Modified: trunk/reactos/ntoskrnl/se/accesschk.c Modified: trunk/reactos/ntoskrnl/se/accesschk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/accesschk.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] Fri Nov 27 12:06:59 2015 @@ -425,8 +425,17 @@ if (DesiredAccess == 0) { *GrantedAccess = PreviouslyGrantedAccess; - *AccessStatus = STATUS_SUCCESS; - ret = TRUE; + if (PreviouslyGrantedAccess == 0) + { + DPRINT1("Request for zero access to an object. Denying.\n"); + *AccessStatus = STATUS_ACCESS_DENIED; + ret = FALSE; + } + else + { + *AccessStatus = STATUS_SUCCESS; + ret = TRUE; + } } else {

9 years

[tfaber] 70150: [MSI] - Do not open registry keys with no access rights. Will be sent to Wine after 1.8 code freeze. CORE-10587

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Nov 27 11:34:12 2015 New Revision: 70150 URL: http://svn.reactos.org/svn/reactos?rev=70150&view=rev Log: [MSI] - Do not open registry keys with no access rights. Will be sent to Wine after 1.8 code freeze. CORE-10587 Modified: trunk/reactos/dll/win32/msi/action.c Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Fri Nov 27 11:34:12 2015 @@ -2987,7 +2987,7 @@ { *p = 0; if (!p[1]) continue; /* trailing backslash */ - hkey = open_key( comp, root, subkey, FALSE, access ); + hkey = open_key( comp, root, subkey, FALSE, access | READ_CONTROL ); if (!hkey) break; res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); RegCloseKey( hkey );

9 years

[tfaber] 70149: [OLE32] - Do not open registry keys with no access rights. Will be sent to Wine after 1.8 code freeze. CORE-10587

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Nov 27 11:27:21 2015 New Revision: 70149 URL: http://svn.reactos.org/svn/reactos?rev=70149&view=rev Log: [OLE32] - Do not open registry keys with no access rights. Will be sent to Wine after 1.8 code freeze. CORE-10587 Modified: trunk/reactos/dll/win32/ole32/comcat.c Modified: trunk/reactos/dll/win32/ole32/comcat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/comcat.c?r… ============================================================================== --- trunk/reactos/dll/win32/ole32/comcat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/comcat.c [iso-8859-1] Fri Nov 27 11:27:21 2015 @@ -229,7 +229,7 @@ if (res != ERROR_SUCCESS) return S_FALSE; for (string = impl_strings; *string; string += CHARS_IN_GUID) { HKEY catkey; - res = open_classes_key(subkey, string, 0, &catkey); + res = open_classes_key(subkey, string, READ_CONTROL, &catkey); if (res != ERROR_SUCCESS) { RegCloseKey(subkey); return S_FALSE;

9 years

[hbelusca] 70148: [WORDPAD] Fix latest Wine sync r70123 of wordpad wrt. our local change from r69999 (now mentioned with #ifdef __REACTOS__ ). CORE-10591

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Nov 27 09:44:14 2015 New Revision: 70148 URL: http://svn.reactos.org/svn/reactos?rev=70148&view=rev Log: [WORDPAD] Fix latest Wine sync r70123 of wordpad wrt. our local change from r69999 (now mentioned with #ifdef __REACTOS__ ). CORE-10591 Modified: trunk/reactos/base/applications/wordpad/wordpad.h Modified: trunk/reactos/base/applications/wordpad/wordpad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] Fri Nov 27 09:44:14 2015 @@ -185,7 +185,16 @@ #define IDI_WORDPAD 102 +#ifdef __REACTOS__ + +#define IDI_RTFDOC 103 +#define IDC_ZOOM 104 + +#else + #define IDC_ZOOM 103 + +#endif #define STRING_ALL_FILES 1400 #define STRING_TEXT_FILES_TXT 1401

9 years

[tfaber] 70147: [NTOS:PS] - Use the correct generic mapping for threads in NtOpenThread

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Nov 27 08:49:57 2015 New Revision: 70147 URL: http://svn.reactos.org/svn/reactos?rev=70147&view=rev Log: [NTOS:PS] - Use the correct generic mapping for threads in NtOpenThread Modified: trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Fri Nov 27 08:49:57 2015 @@ -1081,7 +1081,7 @@ Status = SeCreateAccessState(&AccessState, &AuxData, DesiredAccess, - &PsProcessType->TypeInfo.GenericMapping); + &PsThreadType->TypeInfo.GenericMapping); if (!NT_SUCCESS(Status)) return Status; /* Check if this is a debugger */

9 years

[tfaber] 70146: [ADVAPI32] - Do not open registry keys with no access rights CORE-10587

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Nov 27 08:20:58 2015 New Revision: 70146 URL: http://svn.reactos.org/svn/reactos?rev=70146&view=rev Log: [ADVAPI32] - Do not open registry keys with no access rights CORE-10587 Modified: trunk/reactos/dll/win32/advapi32/reg/hkcr.c Modified: trunk/reactos/dll/win32/advapi32/reg/hkcr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/hkc… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] Fri Nov 27 08:20:58 2015 @@ -263,7 +263,7 @@ } /* See if the subkey already exists in HKCU. */ - ErrorCode = RegOpenKeyExW(QueriedKey, lpSubKey, 0, 0, &TestKey); + ErrorCode = RegOpenKeyExW(QueriedKey, lpSubKey, 0, READ_CONTROL, &TestKey); if (ErrorCode != ERROR_FILE_NOT_FOUND) { if (ErrorCode == ERROR_SUCCESS) @@ -757,7 +757,7 @@ PreferredKey, FallbackSubKeyName, 0, - 0, + READ_CONTROL, &PreferredSubKey); if (ErrorCode == ERROR_SUCCESS)

9 years

[tfaber] 70145: [SETUPAPI] - Do not open registry keys with no access rights CORE-10587

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Nov 27 08:07:46 2015 New Revision: 70145 URL: http://svn.reactos.org/svn/reactos?rev=70145&view=rev Log: [SETUPAPI] - Do not open registry keys with no access rights CORE-10587 Modified: trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/dll/win32/setupapi/interface.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Fri Nov 27 08:07:46 2015 @@ -4719,7 +4719,7 @@ rc = RegOpenKeyExW(HKLM, REGSTR_PATH_HWPROFILES, 0, - 0, + READ_CONTROL, &hHWProfilesKey); if (rc != ERROR_SUCCESS) { @@ -4909,7 +4909,7 @@ list->HKLM, REGSTR_PATH_SYSTEMENUM, 0, /* Options */ - 0, + READ_CONTROL, &hEnumKey); if (rc != ERROR_SUCCESS) { @@ -5697,7 +5697,7 @@ HKEY enumKey, key = INVALID_HANDLE_VALUE; LONG l; - l = RegOpenKeyExW(RootKey, REGSTR_PATH_SYSTEMENUM, 0, 0, &enumKey); + l = RegOpenKeyExW(RootKey, REGSTR_PATH_SYSTEMENUM, 0, READ_CONTROL, &enumKey); if (!l) { l = RegOpenKeyExW(enumKey, devInfo->instanceId, 0, samDesired, &key); @@ -5752,7 +5752,7 @@ RootKey, REGSTR_PATH_CLASS_NT, 0, /* Options */ - 0, + READ_CONTROL, &hEnumKey); if (rc != ERROR_SUCCESS) { Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Fri Nov 27 08:07:46 2015 @@ -1997,7 +1997,7 @@ list ? list->HKLM : HKEY_LOCAL_MACHINE, REGSTR_PATH_SERVICES, 0, - 0, + READ_CONTROL, &hServicesKey); if (rc != ERROR_SUCCESS) { Modified: trunk/reactos/dll/win32/setupapi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/interfa… ============================================================================== --- trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/interface.c [iso-8859-1] Fri Nov 27 08:07:46 2015 @@ -155,7 +155,7 @@ list->HKLM, REGSTR_PATH_SYSTEMENUM, 0, /* Options */ - 0, + READ_CONTROL, &hEnumKey); if (rc != ERROR_SUCCESS) goto cleanup;

9 years

← Newer
1
...
5
6
7
8
9
10
11
...
46
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 November 2015