Ros-diffs November 2019

ros-diffs@reactos.org

24 participants
322 discussions

[reactos] 01/01: [HNETCFG] CORE-16372 Jansen's hack

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ac96ca431c2d75efd106… commit 0ac96ca431c2d75efd1060122e2294357c7ec554 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 24 22:36:49 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 24 22:36:49 2019 +0900 [HNETCFG] CORE-16372 Jansen's hack --- dll/win32/hnetcfg/policy.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/hnetcfg/policy.c b/dll/win32/hnetcfg/policy.c index 1f5b0daa568..89ca9677be6 100644 --- a/dll/win32/hnetcfg/policy.c +++ b/dll/win32/hnetcfg/policy.c @@ -226,7 +226,11 @@ static HRESULT WINAPI netfw_rules_Item( fw_rules *This = impl_from_INetFwRules( iface ); FIXME("%p, %s, %p\n", This, debugstr_w(name), rule); +#ifdef __REACTOS__ + return S_OK; /* CORE-16372 Jansen's hack */ +#else return E_NOTIMPL; +#endif } static HRESULT WINAPI netfw_rules_get__NewEnum(

5 years, 1 month

[reactos] 01/01: [SHELL32] Set default exe icon (#2076)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=399854ce31ef8fe42b723… commit 399854ce31ef8fe42b72319e8cbae0e75989cfa3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 24 19:26:32 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 24 19:26:32 2019 +0900 [SHELL32] Set default exe icon (#2076) The default icon of an exe file was empty if no icon available from exe. CORE-10480 --- dll/win32/shell32/CExtractIcon.cpp | 15 +++++++++++++++ dll/win32/shell32/folders/CFSFolder.cpp | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/CExtractIcon.cpp b/dll/win32/shell32/CExtractIcon.cpp index 26bdb4e9307..e24f6c12800 100644 --- a/dll/win32/shell32/CExtractIcon.cpp +++ b/dll/win32/shell32/CExtractIcon.cpp @@ -138,6 +138,21 @@ HRESULT STDMETHODCALLTYPE CExtractIcon::SetNormalIcon( { TRACE("(%p, %s, %d)\n", this, debugstr_w(pszFile), iIcon); + if (lstrcmpiW(PathFindExtensionW(pszFile), L".exe") == 0) + { + if (!PrivateExtractIconExW(pszFile, 0, NULL, NULL, 1)) + { + WCHAR szPath[MAX_PATH]; + GetModuleFileNameW(shell32_hInstance, szPath, _countof(szPath)); + DuplicateString(szPath, &normalIcon.file); + if (!normalIcon.file) + return E_OUTOFMEMORY; + + normalIcon.index = -IDI_SHELL_EXE; + return S_OK; + } + } + DuplicateString(pszFile, &normalIcon.file); if (!normalIcon.file) return E_OUTOFMEMORY; diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index a356bb927a3..6acf3013e43 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -310,7 +310,7 @@ HRESULT CFSExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, RE if (!wcscmp(L"%1", wTemp)) /* icon is in the file */ { - ILGetDisplayNameExW(psf, pidl, wTemp, 0); + ILGetDisplayNameExW(psf, pidl, wTemp, ILGDN_FORPARSING); icon_idx = 0; }

5 years, 1 month

[reactos] 01/01: [SHELL32] Shift-Right-Click patch: Plan B (#2082)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db5a2fff5d4c3c6431abd… commit db5a2fff5d4c3c6431abde13f21ee33a27e714dc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 24 19:22:23 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 24 19:22:23 2019 +0900 [SHELL32] Shift-Right-Click patch: Plan B (#2082) Enable "CMD here" without Shift key. CORE-16519 --- boot/bootdata/hivecls.inf | 2 -- 1 file changed, 2 deletions(-) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index 5d761961599..d81e9565f6d 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -32,14 +32,12 @@ HKCR,"Directory","",0x00000000,"File Folder" HKCR,"Directory","AlwaysShowExt",0x00000000,"" HKCR,"Directory","NoRecentDocs",0x00000000,"" HKCR,"Directory\shell\cmd","",0x00020000,"@%SystemRoot%\system32\shell32.dll,-306" -HKCR,"Directory\shell\cmd","Extended",0x00000000,"" HKCR,"Directory\shell\cmd\command","",0x00000000,"cmd.exe /s /k pushd ""%V""" ; Drive HKCR,"Drive","",0x00000000,"Drive" ;HKCR,"Drive\DefaultIcon","",0x00000000,"%SystemRoot%\system32\shell32.dll,-4" HKCR,"Drive\shell\cmd","",0x00020000,"@%SystemRoot%\system32\shell32.dll,-306" -HKCR,"Drive\shell\cmd","Extended",0x00000000,"" HKCR,"Drive\shell\cmd\command","",0x00000000,"cmd.exe /s /k pushd ""%V""" ; Clipboard Element

5 years, 1 month

[reactos] 01/01: [MEDIA][FONTS] Improve tahoma.ttf (Punctuations) No.29

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f41366daade22615419c2… commit f41366daade22615419c250bb7e3f8609bb1d16e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 24 19:12:31 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 24 19:12:31 2019 +0900 [MEDIA][FONTS] Improve tahoma.ttf (Punctuations) No.29 Tahoma font. Version 0.017 khmz. PUNCTUATIONS. CORE-8408 --- media/fonts/tahoma.ttf | Bin 155388 -> 155384 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahoma.ttf b/media/fonts/tahoma.ttf index 2f667634099..ae36726fca0 100644 Binary files a/media/fonts/tahoma.ttf and b/media/fonts/tahoma.ttf differ

5 years, 1 month

[reactos] 02/02: [CMAKE] Turn printf format warnings (C4313 and C4477) into errors

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ff3bb904b5088125d7dc… commit 0ff3bb904b5088125d7dcd79f04dd77b0bc55b57 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 20 17:34:24 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 24 09:28:00 2019 +0100 [CMAKE] Turn printf format warnings (C4313 and C4477) into errors --- sdk/cmake/msvc.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 472275ae279..3b576cf867d 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -102,11 +102,13 @@ add_compile_flags("/wd4018") # - C4229: modifiers on data are ignored # - C4311: pointer truncation from '<pointer>' to '<integer>' # - C4312: conversion from '<integer>' to '<pointer>' of greater size +# - C4313: 'fprintf': '%x' in format string conflicts with argument n of type 'HANDLE' +# - C4477: '_snprintf' : format string '%ld' requires an argument of type 'long', but variadic argument 1 has type 'DWORD_PTR' # - C4603: macro is not defined or definition is different after precompiled header use # - C4700: uninitialized variable usage # - C4715: 'function': not all control paths return a value # - C4716: function must return a value -add_compile_flags("/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4603 /we4700 /we4715 /we4716") +add_compile_flags("/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4313 /we4477 /we4603 /we4700 /we4715 /we4716") # - C4189: local variable initialized but not referenced # Not in Release mode and not with MSVC 2010

5 years, 1 month

[reactos] 01/02: [NETREG] Fix a 64bit printf format warning

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03522e1edef953a846354… commit 03522e1edef953a8463541593fc935e87aeb0e49 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Nov 23 17:48:16 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 24 09:28:00 2019 +0100 [NETREG] Fix a 64bit printf format warning --- modules/rosapps/applications/net/netreg/netreg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rosapps/applications/net/netreg/netreg.cpp b/modules/rosapps/applications/net/netreg/netreg.cpp index f7f5105761e..35f0221698e 100644 --- a/modules/rosapps/applications/net/netreg/netreg.cpp +++ b/modules/rosapps/applications/net/netreg/netreg.cpp @@ -417,7 +417,7 @@ SOCKET make_listening_socket( int port ) { fprintf( stderr, "Creating the listener\n" ); SOCKET l = socket( PF_INET, SOCK_STREAM, 0 ); - fprintf( stderr, "Socket %x\n", l ); + fprintf( stderr, "Socket %Ix\n", l ); if( l == INVALID_SOCKET ) return l; if( bind( l, (struct sockaddr *)&sa, sizeof( sa ) ) < 0 ) {

5 years, 1 month

[reactos] 01/01: [CMAKE] Disable EH4 for x64 and VS versions 16.3+

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70bcd0fc6b91c2535d882… commit 70bcd0fc6b91c2535d8821150da66318f4295ca1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Nov 23 17:37:59 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 24 09:26:59 2019 +0100 [CMAKE] Disable EH4 for x64 and VS versions 16.3+ This fixes x64 build with latest VS 2019 See https://developercommunity.visualstudio.com/content/problem/746534/visual-c… --- sdk/cmake/msvc.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 419984b5d11..472275ae279 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -64,6 +64,13 @@ if(MSVC_VERSION GREATER 1899) add_compile_flags("/Zc:threadSafeInit-") endif () +# HACK: Disable use of __CxxFrameHandler4 on VS 16.3+ (x64 only) +# See https://developercommunity.visualstudio.com/content/problem/746534/visual-c… +if(ARCH STREQUAL "amd64" AND MSVC_VERSION GREATER 1922) + add_compile_flags("/d2FH4-") + add_link_options("/d2:-FH4-") +endif () + # Generate Warnings Level 3 add_compile_flags("/W3")

5 years, 1 month

[reactos] 01/01: [MEDIA][FONTS] Improve tahomabd.ttf (Latin, Greek and Cyrillic) No.28

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55251a0a8e24bad72def1… commit 55251a0a8e24bad72def1389351b00e349a917a5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 24 11:24:30 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 24 11:26:06 2019 +0900 [MEDIA][FONTS] Improve tahomabd.ttf (Latin, Greek and Cyrillic) No.28 Tahoma Bold. Version 0.015 khmz. 13px bitmap glyphs are totally improved. 15px bitmap glyphs are deleted. DIGITS. CORE-8408 --- media/fonts/tahomabd.ttf | Bin 160284 -> 145604 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index 982d0542483..701c6433486 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

5 years, 1 month

[reactos] 01/01: [DNSAPI][DNSRSLVR] Parse the hosts file when the resolver is initializing

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=630f34a0d05814dc8c118… commit 630f34a0d05814dc8c118bba46bb7098dc48da14 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Nov 23 17:07:59 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Nov 23 17:13:51 2019 +0100 [DNSAPI][DNSRSLVR] Parse the hosts file when the resolver is initializing - Move the hosts file handling from dnsapi.dll to the resolver service. Now, the hosts file is no longer parsed on each query. - Add support for DNS_QUERY_WIRE_ONLY and DNS_QUERY_NO_WIRE_QUERY flags to R_ResolverQuery. - GetCurrentTimeInSeconds() should return DWORD instead of DNS_STATUS. --- base/services/dnsrslvr/CMakeLists.txt | 1 + base/services/dnsrslvr/cache.c | 34 +-- base/services/dnsrslvr/dnsrslvr.c | 2 + base/services/dnsrslvr/hostsfile.c | 396 ++++++++++++++++++++++++++++++++++ base/services/dnsrslvr/precomp.h | 22 +- base/services/dnsrslvr/rpcserver.c | 59 +++-- dll/win32/dnsapi/query.c | 228 +------------------- sdk/include/reactos/idl/dnsrslvr.idl | 3 + sdk/include/reactos/windns_undoc.h | 2 +- 9 files changed, 484 insertions(+), 263 deletions(-) diff --git a/base/services/dnsrslvr/CMakeLists.txt b/base/services/dnsrslvr/CMakeLists.txt index a2821d93763..410715c6171 100644 --- a/base/services/dnsrslvr/CMakeLists.txt +++ b/base/services/dnsrslvr/CMakeLists.txt @@ -5,6 +5,7 @@ add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/dnsrslvr.idl) list(APPEND SOURCE cache.c dnsrslvr.c + hostsfile.c rpcserver.c precomp.h ${CMAKE_CURRENT_BINARY_DIR}/dnsrslvr_s.c) diff --git a/base/services/dnsrslvr/cache.c b/base/services/dnsrslvr/cache.c index 6a6eee4844e..748a1599383 100644 --- a/base/services/dnsrslvr/cache.c +++ b/base/services/dnsrslvr/cache.c @@ -20,7 +20,7 @@ static BOOL DnsCacheInitialized = FALSE; VOID DnsIntCacheInitialize(VOID) { - DPRINT("DnsIntCacheInitialize\n"); + DPRINT("DnsIntCacheInitialize()\n"); /* Check if we're initialized */ if (DnsCacheInitialized) @@ -35,7 +35,7 @@ DnsIntCacheInitialize(VOID) VOID DnsIntCacheFree(VOID) { - DPRINT("DnsIntCacheFree\n"); + DPRINT("DnsIntCacheFree()\n"); /* Check if we're initialized */ if (!DnsCacheInitialized) @@ -53,7 +53,7 @@ DnsIntCacheFree(VOID) VOID DnsIntCacheRemoveEntryItem(PRESOLVER_CACHE_ENTRY CacheEntry) { - DPRINT("DnsIntCacheRemoveEntryItem %p\n", CacheEntry); + DPRINT("DnsIntCacheRemoveEntryItem(%p)\n", CacheEntry); /* Remove the entry from the list */ RemoveEntryList(&CacheEntry->CacheLink); @@ -71,7 +71,7 @@ DnsIntCacheFlush(VOID) PLIST_ENTRY Entry; PRESOLVER_CACHE_ENTRY CacheEntry; - DPRINT("DnsIntCacheFlush\n"); + DPRINT("DnsIntCacheFlush()\n"); /* Lock the cache */ DnsCacheLock(); @@ -94,15 +94,19 @@ DnsIntCacheFlush(VOID) DnsCacheUnlock(); } -BOOL -DnsIntCacheGetEntryFromName(LPCWSTR Name, - PDNS_RECORDW *Record) +DNS_STATUS +DnsIntCacheGetEntryByName( + LPCWSTR Name, + WORD wType, + DWORD dwFlags, + PDNS_RECORDW *Record) { - BOOL Ret = FALSE; + DNS_STATUS Status = DNS_INFO_NO_RECORDS; PRESOLVER_CACHE_ENTRY CacheEntry; PLIST_ENTRY NextEntry; - DPRINT("DnsIntCacheGetEntryFromName %ws %p\n", Name, Record); + DPRINT("DnsIntCacheGetEntryByName(%S %hu 0x%lx %p)\n", + Name, wType, dwFlags, Record); /* Assume failure */ *Record = NULL; @@ -122,7 +126,7 @@ DnsIntCacheGetEntryFromName(LPCWSTR Name, { /* Copy the entry and return it */ *Record = DnsRecordSetCopyEx(CacheEntry->Record, DnsCharSetUnicode, DnsCharSetUnicode); - Ret = TRUE; + Status = ERROR_SUCCESS; break; } @@ -132,8 +136,7 @@ DnsIntCacheGetEntryFromName(LPCWSTR Name, /* Release the cache */ DnsCacheUnlock(); - /* Return */ - return Ret; + return Status; } BOOL @@ -143,7 +146,7 @@ DnsIntCacheRemoveEntryByName(LPCWSTR Name) PRESOLVER_CACHE_ENTRY CacheEntry; PLIST_ENTRY NextEntry; - DPRINT("DnsIntCacheRemoveEntryByName %ws\n", Name); + DPRINT("DnsIntCacheRemoveEntryByName(%S)\n", Name); /* Lock the cache */ DnsCacheLock(); @@ -179,7 +182,10 @@ DnsIntCacheAddEntry(PDNS_RECORDW Record) { PRESOLVER_CACHE_ENTRY Entry; - DPRINT("DnsIntCacheRemoveEntryByName %p\n", Record); + DPRINT("DnsIntCacheAddEntry(%p)\n", Record); + + DPRINT("Name: %S\n", Record->pName); + DPRINT("TTL: %lu\n", Record->dwTtl); /* Lock the cache */ DnsCacheLock(); diff --git a/base/services/dnsrslvr/dnsrslvr.c b/base/services/dnsrslvr/dnsrslvr.c index c0384050ca9..efcdcee0cce 100644 --- a/base/services/dnsrslvr/dnsrslvr.c +++ b/base/services/dnsrslvr/dnsrslvr.c @@ -101,6 +101,8 @@ ServiceMain( DnsIntCacheInitialize(); + ReadHostsFile(); + hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) diff --git a/base/services/dnsrslvr/hostsfile.c b/base/services/dnsrslvr/hostsfile.c new file mode 100644 index 00000000000..1f12b87455f --- /dev/null +++ b/base/services/dnsrslvr/hostsfile.c @@ -0,0 +1,396 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: base/services/dnsrslvr/hostsfile.c + * PURPOSE: HOSTS file routines + * PROGRAMERS: Art Yerkes + * Eric Kohl + */ + +#include "precomp.h" + + +#define NDEBUG +#include <debug.h> + + +static +PWSTR +AnsiToUnicode( + PSTR NarrowString) +{ + PWSTR WideString; + int WideLen; + + WideLen = MultiByteToWideChar(CP_ACP, + 0, + NarrowString, + -1, + NULL, + 0); + if (WideLen == 0) + return NULL; + + WideString = HeapAlloc(GetProcessHeap(), + 0, + WideLen * sizeof(WCHAR)); + if (WideString == NULL) + return NULL; + + MultiByteToWideChar(CP_ACP, + 0, + NarrowString, + -1, + WideString, + WideLen); + + return WideString; +} + + +static +BOOL +ParseV4Address( + LPCSTR AddressString, + OUT PDWORD pAddress) +{ + CHAR *cp; + DWORD val, base; + unsigned char c; + DWORD parts[4], *pp = parts; + + cp = (CHAR *)AddressString; + + if (!AddressString) + return FALSE; + + if (!isdigit(*cp)) + return FALSE; + +again: + /* + * Collect number up to ``.''. + * Values are specified as for C: + * 0x=hex, 0=octal, other=decimal. + */ + val = 0; base = 10; + if (*cp == '0') + { + if (*++cp == 'x' || *cp == 'X') + base = 16, cp++; + else + base = 8; + } + + while ((c = *cp)) + { + if (isdigit(c)) + { + val = (val * base) + (c - '0'); + cp++; + continue; + } + + if (base == 16 && isxdigit(c)) + { + val = (val << 4) + (c + 10 - (islower(c) ? 'a' : 'A')); + cp++; + continue; + } + break; + } + + if (*cp == '.') + { + /* + * Internet format: + * a.b.c.d + */ + if (pp >= parts + 4) + return FALSE; + *pp++ = val; + cp++; + goto again; + } + + /* Check for trailing characters */ + if (*cp && *cp > ' ') + return FALSE; + + if (pp >= parts + 4) + return FALSE; + + *pp++ = val; + /* + * Concoct the address according to + * the number of parts specified. + */ + if ((DWORD)(pp - parts) != 4) + return FALSE; + + if (parts[0] > 0xff || parts[1] > 0xff || parts[2] > 0xff || parts[3] > 0xff) + return FALSE; + + val = (parts[3] << 24) | (parts[2] << 16) | (parts[1] << 8) | parts[0]; + + if (pAddress) + *pAddress = val; + + return TRUE; +} + + +static +VOID +AddV4HostEntries( + PWSTR pszHostName, + DWORD dwIpAddress) +{ + DNS_RECORDW ARecord, PtrRecord; + WCHAR szInAddrArpaName[32]; + + /* Prepare the A record */ + ZeroMemory(&ARecord, sizeof(DNS_RECORDW)); + + ARecord.pName = pszHostName; + ARecord.wType = DNS_TYPE_A; + ARecord.wDataLength = sizeof(DNS_A_DATA); + ARecord.dwTtl = 86400; + + ARecord.Data.A.IpAddress = dwIpAddress; + + swprintf(szInAddrArpaName, + L"%u.%u.%u.%u.in-addr.arpa", + (dwIpAddress >> 24) & 0xFF, + (dwIpAddress >> 16) & 0xFF, + (dwIpAddress >> 8) & 0xFF, + dwIpAddress & 0xFF); + + /* Prepare the PTR record */ + ZeroMemory(&PtrRecord, sizeof(DNS_RECORDW)); + + PtrRecord.pName = szInAddrArpaName; + PtrRecord.wType = DNS_TYPE_PTR; + PtrRecord.wDataLength = sizeof(DNS_PTR_DATA); + PtrRecord.dwTtl = 86400; + + PtrRecord.Data.PTR.pNameHost = pszHostName; + + DnsIntCacheAddEntry(&ARecord); + DnsIntCacheAddEntry(&PtrRecord); +} + + +static +FILE * +OpenHostsFile(VOID) +{ + PWSTR ExpandedPath; + PWSTR DatabasePath; + HKEY DatabaseKey; + DWORD RegSize = 0; + size_t StringLength; + FILE *pHostsFile; + DWORD dwError; + + ExpandedPath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + if (ExpandedPath == NULL) + return NULL; + + /* Open the database path key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, + KEY_READ, + &DatabaseKey); + if (dwError == ERROR_SUCCESS) + { + /* Read the actual path */ + RegQueryValueExW(DatabaseKey, + L"DatabasePath", + NULL, + NULL, + NULL, + &RegSize); + + DatabasePath = HeapAlloc(GetProcessHeap(), 0, RegSize); + if (DatabasePath == NULL) + { + HeapFree(GetProcessHeap(), 0, ExpandedPath); + RegCloseKey(DatabaseKey); + return NULL; + } + + /* Read the actual path */ + dwError = RegQueryValueExW(DatabaseKey, + L"DatabasePath", + NULL, + NULL, + (LPBYTE)DatabasePath, + &RegSize); + + /* Close the key */ + RegCloseKey(DatabaseKey); + + if (dwError != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, DatabasePath); + HeapFree(GetProcessHeap(), 0, ExpandedPath); + return NULL; + } + + /* Expand the name */ + ExpandEnvironmentStringsW(DatabasePath, ExpandedPath, MAX_PATH); + + HeapFree(GetProcessHeap(), 0, DatabasePath); + } + else + { + /* Use defalt path */ + GetSystemDirectoryW(ExpandedPath, MAX_PATH); + + StringCchLengthW(ExpandedPath, MAX_PATH, &StringLength); + if (ExpandedPath[StringLength - 1] != L'\\') + { + /* It isn't, so add it ourselves */ + StringCchCatW(ExpandedPath, MAX_PATH, L"\\"); + } + + StringCchCatW(ExpandedPath, MAX_PATH, L"drivers\\etc\\"); + } + + /* Make sure that the path is backslash-terminated */ + StringCchLengthW(ExpandedPath, MAX_PATH, &StringLength); + if (ExpandedPath[StringLength - 1] != L'\\') + { + /* It isn't, so add it ourselves */ + StringCchCatW(ExpandedPath, MAX_PATH, L"\\"); + } + + /* Add the database name */ + StringCchCatW(ExpandedPath, MAX_PATH, L"hosts"); + + /* Open the hosts file */ + pHostsFile = _wfopen(ExpandedPath, L"r"); + + HeapFree(GetProcessHeap(), 0, ExpandedPath); + + return pHostsFile; +} + + +BOOL +ReadHostsFile(VOID) +{ + CHAR szLineBuffer[512]; + FILE *pHostFile = NULL; + CHAR *Ptr, *NameStart, *NameEnd, *AddressStart, *AddressEnd; + DWORD Address; + PWSTR pszHostName; + + pHostFile = OpenHostsFile(); + if (pHostFile == NULL) + return FALSE; + + for (;;) + { + /* Read a line */ + if (fgets(szLineBuffer, sizeof(szLineBuffer), pHostFile) == NULL) + break; + + NameStart = NameEnd = NULL; + AddressStart = AddressEnd = NULL; + + /* Search for the start of the ip address */ + Ptr = szLineBuffer; + for (;;) + { + if (*Ptr == 0 || *Ptr == '#') + break; + + if (!isspace(*Ptr)) + { + AddressStart = Ptr; + Ptr = Ptr + 1; + break; + } + + Ptr = Ptr + 1; + } + + /* Search for the end of the ip address */ + for (;;) + { + if (*Ptr == 0 || *Ptr == '#') + break; + + if (isspace(*Ptr)) + { + AddressEnd = Ptr; + Ptr = Ptr + 1; + break; + } + + Ptr = Ptr + 1; + } + + /* Search for the start of the name */ + for (;;) + { + if (*Ptr == 0 || *Ptr == '#') + break; + + if (!isspace(*Ptr)) + { + NameStart = Ptr; + Ptr = Ptr + 1; + break; + } + + Ptr = Ptr + 1; + } + + /* Search for the end of the name */ + for (;;) + { + if (*Ptr == 0 || *Ptr == '#') + break; + + if (isspace(*Ptr)) + { + NameEnd = Ptr; + break; + } + + Ptr = Ptr + 1; + } + + if (AddressStart == NULL || AddressEnd == NULL || + NameStart == NULL || NameEnd == NULL) + continue; + + *AddressEnd = 0; + *NameEnd = 0; + + DPRINT("%s ==> %s\n", NameStart, AddressStart); + + if (ParseV4Address(AddressStart, &Address)) + { + DPRINT("IP4: %s ==> 0x%08lx\n", AddressStart, Address); + + pszHostName = AnsiToUnicode(NameStart); + if (pszHostName != NULL) + { + AddV4HostEntries(pszHostName, Address); + + HeapFree(GetProcessHeap(), 0, pszHostName); + } + } + } + + fclose(pHostFile); + + return TRUE; +} + +/* EOF */ diff --git a/base/services/dnsrslvr/precomp.h b/base/services/dnsrslvr/precomp.h index 3983d3100a3..c0bbeecd30e 100644 --- a/base/services/dnsrslvr/precomp.h +++ b/base/services/dnsrslvr/precomp.h @@ -2,6 +2,7 @@ #define _DNSRSLVR_PCH_ #include <stdarg.h> +#include <stdio.h> #define WIN32_NO_STATUS #define _INC_WINDOWS @@ -9,15 +10,20 @@ #include <windef.h> #include <winbase.h> +#include <winnls.h> +#include <winreg.h> #include <winsvc.h> #include <windns.h> #include <windns_undoc.h> +#define NTOS_MODE_USER #include <ndk/rtlfuncs.h> #include <ndk/obfuncs.h> #include <dnsrslvr_s.h> +#include <strsafe.h> + typedef struct _RESOLVER_CACHE_ENTRY { LIST_ENTRY CacheLink; @@ -37,10 +43,22 @@ VOID DnsIntCacheInitialize(VOID); VOID DnsIntCacheRemoveEntryItem(PRESOLVER_CACHE_ENTRY CacheEntry); VOID DnsIntCacheFree(VOID); VOID DnsIntCacheFlush(VOID); -BOOL DnsIntCacheGetEntryFromName(LPCWSTR Name, - PDNS_RECORDW *Record); + +DNS_STATUS +DnsIntCacheGetEntryByName( + LPCWSTR Name, + WORD wType, + DWORD dwFlags, + PDNS_RECORDW *Record); + VOID DnsIntCacheAddEntry(PDNS_RECORDW Record); BOOL DnsIntCacheRemoveEntryByName(LPCWSTR Name); + +/* hostsfile.c */ + +BOOL +ReadHostsFile(VOID); + #endif /* _DNSRSLVR_PCH_ */ diff --git a/base/services/dnsrslvr/rpcserver.c b/base/services/dnsrslvr/rpcserver.c index 913d2b32a78..cb4b9476b04 100644 --- a/base/services/dnsrslvr/rpcserver.c +++ b/base/services/dnsrslvr/rpcserver.c @@ -41,30 +41,32 @@ RpcThreadRoutine(LPVOID lpParameter) return 0; } +/* Function: 0x04 */ DWORD __stdcall R_ResolverFlushCache( - DNSRSLVR_HANDLE pwszServerName) + _In_ DNSRSLVR_HANDLE pwszServerName) { DPRINT("R_ResolverFlushCache()\n"); // FIXME Should store (and flush) entries by server handle DnsIntCacheFlush(); - return 0; + return ERROR_SUCCESS; } +/* Function: 0x07 */ DWORD __stdcall R_ResolverQuery( - DNSRSLVR_HANDLE pszServerName, - LPCWSTR pszName, - WORD wType, - DWORD dwFlags, - DWORD *dwRecords, - DNS_RECORDW **ppResultRecords) + _In_ DNSRSLVR_HANDLE pszServerName, + _In_ LPCWSTR pszName, + _In_ WORD wType, + _In_ DWORD dwFlags, + _Inout_ DWORD *dwRecords, + _Out_ DNS_RECORDW **ppResultRecords) { PDNS_RECORDW Record; - DNS_STATUS Status; + DNS_STATUS Status = ERROR_SUCCESS; DPRINT("R_ResolverQuery(%S %S %x %lx %p %p)\n", pszServerName, pszName, wType, dwFlags, dwRecords, ppResultRecords); @@ -75,22 +77,41 @@ R_ResolverQuery( if ((dwFlags & DNS_QUERY_WIRE_ONLY) != 0 && (dwFlags & DNS_QUERY_NO_WIRE_QUERY) != 0) return ERROR_INVALID_PARAMETER; - if (DnsIntCacheGetEntryFromName(pszName, ppResultRecords)) - { - DPRINT("DNS cache query successful!\n"); - Status = ERROR_SUCCESS; - } - else + if (dwFlags & DNS_QUERY_WIRE_ONLY) { DPRINT("DNS query!\n"); Status = Query_Main(pszName, wType, dwFlags, ppResultRecords); - if (Status == ERROR_SUCCESS) + } + else if (dwFlags & DNS_QUERY_NO_WIRE_QUERY) + { + DPRINT("DNS cache query!\n"); + Status = DnsIntCacheGetEntryByName(pszName, + wType, + dwFlags, + ppResultRecords); + } + else + { + DPRINT("DNS cache query!\n"); + Status = DnsIntCacheGetEntryByName(pszName, + wType, + dwFlags, + ppResultRecords); + if (Status == DNS_INFO_NO_RECORDS) { - DPRINT("DNS query successful!\n"); - DnsIntCacheAddEntry(*ppResultRecords); + DPRINT("DNS query!\n"); + Status = Query_Main(pszName, + wType, + dwFlags, + ppResultRecords); + if (Status == ERROR_SUCCESS) + { + DPRINT("DNS query successful!\n"); + DnsIntCacheAddEntry(*ppResultRecords); + } } } @@ -125,6 +146,6 @@ void __RPC_USER midl_user_free(void __RPC_FAR * ptr) HeapFree(GetProcessHeap(), 0, ptr); } -void __RPC_USER WLANSVC_RPC_HANDLE_rundown(DNSRSLVR_HANDLE hClientHandle) +void __RPC_USER DNSRSLVR_RPC_HANDLE_rundown(DNSRSLVR_HANDLE hClientHandle) { } diff --git a/dll/win32/dnsapi/query.c b/dll/win32/dnsapi/query.c index d830e26f4a0..3ffaa41dffe 100644 --- a/dll/win32/dnsapi/query.c +++ b/dll/win32/dnsapi/query.c @@ -377,97 +377,6 @@ CHAR return p; } -HANDLE -OpenNetworkDatabase(LPCWSTR Name) -{ - PWSTR ExpandedPath; - PWSTR DatabasePath; - INT ErrorCode; - HKEY DatabaseKey; - DWORD RegType; - DWORD RegSize = 0; - size_t StringLength; - HANDLE ret; - - ExpandedPath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); - if (!ExpandedPath) - return INVALID_HANDLE_VALUE; - - /* Open the database path key */ - ErrorCode = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"System\\CurrentControlSet\\Services\\Tcpip\\Parameters", - 0, - KEY_READ, - &DatabaseKey); - if (ErrorCode == NO_ERROR) - { - /* Read the actual path */ - ErrorCode = RegQueryValueExW(DatabaseKey, - L"DatabasePath", - NULL, - &RegType, - NULL, - &RegSize); - - DatabasePath = HeapAlloc(GetProcessHeap(), 0, RegSize); - if (!DatabasePath) - { - HeapFree(GetProcessHeap(), 0, ExpandedPath); - return INVALID_HANDLE_VALUE; - } - - /* Read the actual path */ - ErrorCode = RegQueryValueExW(DatabaseKey, - L"DatabasePath", - NULL, - &RegType, - (LPBYTE)DatabasePath, - &RegSize); - - /* Close the key */ - RegCloseKey(DatabaseKey); - - /* Expand the name */ - ExpandEnvironmentStringsW(DatabasePath, ExpandedPath, MAX_PATH); - - HeapFree(GetProcessHeap(), 0, DatabasePath); - } - else - { - /* Use defalt path */ - GetSystemDirectoryW(ExpandedPath, MAX_PATH); - StringCchLengthW(ExpandedPath, MAX_PATH, &StringLength); - if (ExpandedPath[StringLength - 1] != L'\\') - { - /* It isn't, so add it ourselves */ - StringCchCatW(ExpandedPath, MAX_PATH, L"\\"); - } - StringCchCatW(ExpandedPath, MAX_PATH, L"DRIVERS\\ETC\\"); - } - - /* Make sure that the path is backslash-terminated */ - StringCchLengthW(ExpandedPath, MAX_PATH, &StringLength); - if (ExpandedPath[StringLength - 1] != L'\\') - { - /* It isn't, so add it ourselves */ - StringCchCatW(ExpandedPath, MAX_PATH, L"\\"); - } - - /* Add the database name */ - StringCchCatW(ExpandedPath, MAX_PATH, Name); - - /* Return a handle to the file */ - ret = CreateFileW(ExpandedPath, - FILE_READ_DATA, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - - HeapFree(GetProcessHeap(), 0, ExpandedPath); - return ret; -} /* This function is far from perfect but it works enough */ IP4_ADDRESS @@ -609,118 +518,6 @@ again: return TRUE; } -/* This function is far from perfect but it works enough */ -IP4_ADDRESS -FindEntryInHosts(CONST CHAR * name) -{ - BOOL Found = FALSE; - HANDLE HostsFile; - CHAR HostsDBData[BUFSIZ] = { 0 }; - PCHAR AddressStr, DnsName = NULL, AddrTerm, NameSt, NextLine, ThisLine, Comment; - UINT ValidData = 0; - DWORD ReadSize; - DWORD Address; - - /* Open the network database */ - HostsFile = OpenNetworkDatabase(L"hosts"); - if (HostsFile == INVALID_HANDLE_VALUE) - { - WSASetLastError(WSANO_RECOVERY); - return 0; - } - - while (!Found && ReadFile(HostsFile, - HostsDBData + ValidData, - sizeof(HostsDBData) - ValidData, - &ReadSize, - NULL)) - { - ValidData += ReadSize; - ReadSize = 0; - NextLine = ThisLine = HostsDBData; - - /* Find the beginning of the next line */ - while ((NextLine < HostsDBData + ValidData) && - (*NextLine != '\r') && - (*NextLine != '\n')) - { - NextLine++; - } - - /* Zero and skip, so we can treat what we have as a string */ - if (NextLine > HostsDBData + ValidData) - break; - - *NextLine = 0; - NextLine++; - - Comment = strchr(ThisLine, '#'); - if (Comment) - *Comment = 0; /* Terminate at comment start */ - - AddressStr = ThisLine; - /* Find the first space separating the IP address from the DNS name */ - AddrTerm = strchr(ThisLine, ' '); - if (AddrTerm) - { - /* Terminate the address string */ - *AddrTerm = 0; - - /* Find the last space before the DNS name */ - NameSt = strrchr(ThisLine, ' '); - - /* If there is only one space (the one we removed above), then just use the address terminator */ - if (!NameSt) - NameSt = AddrTerm; - - /* Move from the space to the first character of the DNS name */ - NameSt++; - - DnsName = NameSt; - - if (!stricmp(name, DnsName) || !stricmp(name, AddressStr)) - { - Found = TRUE; - break; - } - } - - /* Get rid of everything we read so far */ - while (NextLine <= HostsDBData + ValidData && - isspace(*NextLine)) - { - NextLine++; - } - - if (HostsDBData + ValidData - NextLine <= 0) - break; - - memmove(HostsDBData, NextLine, HostsDBData + ValidData - NextLine); - ValidData -= NextLine - HostsDBData; - } - - CloseHandle(HostsFile); - - if (!Found) - { - WSASetLastError(WSANO_DATA); - return 0; - } - - if (strstr(AddressStr, ":")) - { - WSASetLastError(WSAEINVAL); - return 0; - } - - if (!ParseV4Address(AddressStr, &Address)) - { - WSASetLastError(WSAEINVAL); - return 0; - } - - return Address; -} DNS_STATUS WINAPI DnsQuery_W(LPCWSTR Name, @@ -858,29 +655,6 @@ Query_Main(LPCWSTR Name, i++; } - if ((Options & DNS_QUERY_NO_HOSTS_FILE) == 0) - { - if ((Address = FindEntryInHosts(AnsiName)) != 0) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); - *QueryResultSet = (PDNS_RECORD)RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); - - if (NULL == *QueryResultSet) - { - return ERROR_OUTOFMEMORY; - } - - (*QueryResultSet)->pNext = NULL; - (*QueryResultSet)->wType = Type; - (*QueryResultSet)->wDataLength = sizeof(DNS_A_DATA); - (*QueryResultSet)->Data.A.IpAddress = Address; - - (*QueryResultSet)->pName = (LPSTR)xstrsave(Name); - - return (*QueryResultSet)->pName ? ERROR_SUCCESS : ERROR_OUTOFMEMORY; - } - } - network_info_result = GetNetworkParams(NULL, &network_info_blen); network_info = (PFIXED_INFO)RtlAllocateHeap(RtlGetProcessHeap(), 0, (size_t)network_info_blen); if (NULL == network_info) @@ -1122,7 +896,7 @@ DnsFlushResolverCache(VOID) return (Status == ERROR_SUCCESS); } -DNS_STATUS +DWORD WINAPI GetCurrentTimeInSeconds(VOID) { diff --git a/sdk/include/reactos/idl/dnsrslvr.idl b/sdk/include/reactos/idl/dnsrslvr.idl index 2c0bf7b787d..cae2e196e62 100644 --- a/sdk/include/reactos/idl/dnsrslvr.idl +++ b/sdk/include/reactos/idl/dnsrslvr.idl @@ -10,6 +10,9 @@ cpp_quote("#ifndef _WINDNS_INCLUDED_") #include <windns.h> cpp_quote("#endif") +cpp_quote("#ifndef _WINDNS_UNDOC_H_") +#include <windns_undoc.h> +cpp_quote("#endif") typedef [handle, string] LPWSTR DNSRSLVR_HANDLE; diff --git a/sdk/include/reactos/windns_undoc.h b/sdk/include/reactos/windns_undoc.h index 56cc56d205c..1b07f61f94a 100644 --- a/sdk/include/reactos/windns_undoc.h +++ b/sdk/include/reactos/windns_undoc.h @@ -27,7 +27,7 @@ WINAPI DnsGetCacheDataTable( _Out_ PDNS_CACHE_ENTRY *DnsCache); -DNS_STATUS +DWORD WINAPI GetCurrentTimeInSeconds(VOID);

5 years, 1 month

[reactos] 01/01: [MOUNTMGR] Fix out of bounds write CORE-16530

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4a0549eb61b99b24e245… commit d4a0549eb61b99b24e245ba1b2d5343ecc98c7da Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Nov 23 16:23:28 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Nov 23 16:24:56 2019 +0100 [MOUNTMGR] Fix out of bounds write CORE-16530 --- drivers/filters/mountmgr/mountmgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/filters/mountmgr/mountmgr.c b/drivers/filters/mountmgr/mountmgr.c index aa152621b51..b79bb0f9f01 100644 --- a/drivers/filters/mountmgr/mountmgr.c +++ b/drivers/filters/mountmgr/mountmgr.c @@ -42,6 +42,7 @@ KEVENT UnloadEvent; LONG Unloading; static const WCHAR Cunc[] = L"\\??\\C:"; +#define Cunc_LETTER_POSITION 4 /* * @implemented @@ -1106,7 +1107,7 @@ MountMgrMountedDeviceArrival(IN PDEVICE_EXTENSION DeviceExtension, /* Start checking all letters that could have been associated */ for (Letter = L'D'; Letter <= L'Z'; Letter++) { - CSymLink.Buffer[LETTER_POSITION] = Letter; + CSymLink.Buffer[Cunc_LETTER_POSITION] = Letter; InitializeObjectAttributes(&ObjectAttributes, &CSymLink,

5 years, 1 month

← Newer
1
...
6
7
8
9
10
11
12
...
33
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 2019