Ros-diffs September 2016

ros-diffs@reactos.org

18 participants
342 discussions

[dchapyshev] 72580: [RTL] - Implement RtlIsValidOemCharacter function * Fixes all new tests for this function

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Sep 4 22:57:44 2016 New Revision: 72580 URL: http://svn.reactos.org/svn/reactos?rev=72580&view=rev Log: [RTL] - Implement RtlIsValidOemCharacter function * Fixes all new tests for this function Modified: trunk/reactos/sdk/lib/rtl/nls.c trunk/reactos/sdk/lib/rtl/unicode.c Modified: trunk/reactos/sdk/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/nls.c?rev=7258… ============================================================================== --- trunk/reactos/sdk/lib/rtl/nls.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/nls.c [iso-8859-1] Sun Sep 4 22:57:44 2016 @@ -29,7 +29,7 @@ USHORT NlsOemCodePage = 0; BOOLEAN NlsMbOemCodePageTag = FALSE; /* exported */ PWCHAR NlsOemToUnicodeTable = NULL; -PCHAR NlsUnicodeToOemTable =NULL; +PCHAR NlsUnicodeToOemTable = NULL; PWCHAR NlsDbcsUnicodeToOemTable = NULL; PUSHORT NlsOemLeadByteInfo = NULL; /* exported */ Modified: trunk/reactos/sdk/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/unicode.c?rev=… ============================================================================== --- trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] Sun Sep 4 22:57:44 2016 @@ -24,6 +24,9 @@ extern PUSHORT NlsLeadByteInfo; extern USHORT NlsOemDefaultChar; extern USHORT NlsUnicodeDefaultChar; +extern PUSHORT NlsOemLeadByteInfo; +extern PWCHAR NlsOemToUnicodeTable; +extern PCHAR NlsUnicodeToOemTable; /* FUNCTIONS *****************************************************************/ @@ -503,14 +506,47 @@ } /* -* @unimplemented +* @implemented */ BOOLEAN NTAPI RtlIsValidOemCharacter(IN PWCHAR Char) { - UNIMPLEMENTED; - return FALSE; + WCHAR UnicodeChar; + WCHAR OemChar; + UCHAR Index; + + /* If multi-byte code page present */ + if (NlsMbOemCodePageTag) + { + USHORT Offset = 0; + + OemChar = NlsUnicodeToOemTable[*Char]; + + /* If character has Lead Byte */ + if (NlsOemLeadByteInfo[HIBYTE(OemChar)]) + Offset = NlsOemLeadByteInfo[HIBYTE(OemChar)]; + + Index = LOBYTE(OemChar) + Offset; + } + else + { + Index = NlsUnicodeToOemTable[*Char]; + } + + /* Receive Unicode character from the table */ + UnicodeChar = RtlUpcaseUnicodeChar(NlsOemToUnicodeTable[Index]); + + /* Receive OEM character from the table */ + OemChar = NlsUnicodeToOemTable[UnicodeChar]; + + /* Not valid character, failed */ + if (OemChar == NlsOemDefaultChar) + return FALSE; + + *Char = UnicodeChar; + + return TRUE; } /*

8 years

[dchapyshev] 72579: [KMTEST] - Implement tests for RtlIsValidOemCharacter function

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Sep 4 22:15:53 2016 New Revision: 72579 URL: http://svn.reactos.org/svn/reactos?rev=72579&view=rev Log: [KMTEST] - Implement tests for RtlIsValidOemCharacter function Added: trunk/rostests/kmtests/rtl/RtlIsValidOemCharacter.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Sun Sep 4 22:15:53 2016 @@ -87,6 +87,7 @@ ntos_se/SeHelpers.c ntos_se/SeInheritance.c ntos_se/SeQueryInfoToken.c + rtl/RtlIsValidOemCharacter.c ${COMMON_SOURCE} kmtest_drv/kmtest_drv.rc) Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Sun Sep 4 22:15:53 2016 @@ -65,6 +65,7 @@ KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlException; KMT_TESTFUNC Test_RtlIntSafe; +KMT_TESTFUNC Test_RtlIsValidOemCharacter; KMT_TESTFUNC Test_RtlMemory; KMT_TESTFUNC Test_RtlRegistry; KMT_TESTFUNC Test_RtlSplayTree; @@ -134,6 +135,7 @@ { "RtlAvlTreeKM", Test_RtlAvlTree }, { "RtlExceptionKM", Test_RtlException }, { "RtlIntSafeKM", Test_RtlIntSafe }, + { "RtlIsValidOemCharacter", Test_RtlIsValidOemCharacter }, { "RtlMemoryKM", Test_RtlMemory }, { "RtlRegistryKM", Test_RtlRegistry }, { "RtlSplayTreeKM", Test_RtlSplayTree }, Added: trunk/rostests/kmtests/rtl/RtlIsValidOemCharacter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlIsValidOem… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlIsValidOemCharacter.c (added) +++ trunk/rostests/kmtests/rtl/RtlIsValidOemCharacter.c [iso-8859-1] Sun Sep 4 22:15:53 2016 @@ -0,0 +1,53 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Runtime library for RtlIsValidOemCharacter + * PROGRAMMER: Dmitry Chapyshev <dmitry(a)reactos.org> + */ + +#define KMT_EMULATE_KERNEL +#include <kmt_test.h> + +START_TEST(RtlIsValidOemCharacter) +{ + const WCHAR ValidCharsEn[] = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz~!#$%^&*()_+|`:;\"'-/\\ "; + const WCHAR InvalidChars[] = L"?\x0372\x03CF\x3D5F"; + WCHAR unicode_null = UNICODE_NULL; + WCHAR tmp; + BOOLEAN res; + INT i; + + res = RtlIsValidOemCharacter(&unicode_null); + ok(res != FALSE, "UNICODE_NULL is valid char\n"); + + /* Test for valid chars */ + for (i = 0; i < (sizeof(ValidCharsEn) / sizeof(WCHAR)) - 1; i++) + { + tmp = ValidCharsEn[i]; + + res = RtlIsValidOemCharacter(&tmp); + ok(res != FALSE, "Expected success. '%C' [%d] is valid char\n", ValidCharsEn[i], i); + ok(tmp == RtlUpcaseUnicodeChar(ValidCharsEn[i]), "Expected upcase char for '%C' [%d]\n", ValidCharsEn[i], i); + + tmp = RtlUpcaseUnicodeChar(ValidCharsEn[i]); + res = RtlIsValidOemCharacter(&tmp); + ok(res != FALSE, "Expected success. '%C' [%d] is valid char\n", ValidCharsEn[i], i); + ok(tmp == RtlUpcaseUnicodeChar(ValidCharsEn[i]), "Expected upcase char for '%C' [%d]\n", ValidCharsEn[i], i); + } + + /* Test for invalid chars */ + for (i = 0; i < (sizeof(InvalidChars) / sizeof(WCHAR)) - 1; i++) + { + tmp = InvalidChars[i]; + + res = RtlIsValidOemCharacter(&tmp); + ok(res == FALSE, "Expected fail. '%C' [%d] is NOT valid char\n", InvalidChars[i], i); + ok(tmp == RtlUpcaseUnicodeChar(InvalidChars[i]), "Expected upcase char for '%C' [%d]\n", InvalidChars[i], i); + + tmp = RtlUpcaseUnicodeChar(InvalidChars[i]); + res = RtlIsValidOemCharacter(&tmp); + ok(res == FALSE, "Expected fail. '%C' [%d] is NOT valid char\n", InvalidChars[i], i); + ok(tmp == RtlUpcaseUnicodeChar(InvalidChars[i]), "Expected upcase char for '%C' [%d]\n", InvalidChars[i], i); + } +} + Propchange: trunk/rostests/kmtests/rtl/RtlIsValidOemCharacter.c ------------------------------------------------------------------------------ svn:eol-style = native

8 years

[cwittich] 72578: [SHELL32] sync CQueryAssociations.cpp with wine

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Sep 4 20:10:29 2016 New Revision: 72578 URL: http://svn.reactos.org/svn/reactos?rev=72578&view=rev Log: [SHELL32] sync CQueryAssociations.cpp with wine Modified: trunk/reactos/dll/win32/shell32/CQueryAssociations.cpp Modified: trunk/reactos/dll/win32/shell32/CQueryAssociations.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CQueryAs… ============================================================================== --- trunk/reactos/dll/win32/shell32/CQueryAssociations.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CQueryAssociations.cpp [iso-8859-1] Sun Sep 4 20:10:29 2016 @@ -96,6 +96,9 @@ this->hkeySource = this->hkeyProgID = NULL; if (pszAssoc != NULL) { + WCHAR *progId; + HRESULT hr; + LONG ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszAssoc, 0, @@ -105,29 +108,58 @@ { return S_OK; } - /* if this is not a prog id */ - if ((*pszAssoc == '.') || (*pszAssoc == '{')) - { - RegOpenKeyExW(this->hkeySource, - szProgID, - 0, - KEY_READ, - &this->hkeyProgID); - } - else + + /* if this is a progid */ + if (*pszAssoc != '.' && *pszAssoc != '{') { this->hkeyProgID = this->hkeySource; - } - + return S_OK; + } + + /* if it's not a progid, it's a file extension or clsid */ + if (*pszAssoc == '.') + { + /* for a file extension, the progid is the default value */ + hr = this->GetValue(this->hkeySource, NULL, (void**)&progId, NULL); + if (FAILED(hr)) + return S_OK; + } + else /* if (*pszAssoc == '{') */ + { + HKEY progIdKey; + /* for a clsid, the progid is the default value of the ProgID subkey */ + ret = RegOpenKeyExW(this->hkeySource, + szProgID, + 0, + KEY_READ, + &progIdKey); + if (ret != ERROR_SUCCESS) + return S_OK; + hr = this->GetValue(progIdKey, NULL, (void**)&progId, NULL); + if (FAILED(hr)) + return S_OK; + RegCloseKey(progIdKey); + } + + /* open the actual progid key, the one with the shell subkey */ + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, + progId, + 0, + KEY_READ, + &this->hkeyProgID); + HeapFree(GetProcessHeap(), 0, progId); + return S_OK; } else if (hkeyProgid != NULL) { - this->hkeyProgID = hkeyProgid; + /* reopen the key so we don't end up closing a key owned by the caller */ + RegOpenKeyExW(hkeyProgid, NULL, 0, KEY_READ, &this->hkeyProgID); + this->hkeySource = this->hkeyProgID; return S_OK; } - - return E_INVALIDARG; + else + return E_INVALIDARG; } /************************************************************************** @@ -324,51 +356,34 @@ case ASSOCSTR_DEFAULTICON: { static const WCHAR DefaultIconW[] = L"DefaultIcon"; - WCHAR *pszFileType; - HKEY hkeyFile; - - hr = this->GetValue(this->hkeySource, NULL, (void**)&pszFileType, NULL); - if (FAILED(hr)) - { - return hr; - } - DWORD ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, &hkeyFile); + DWORD ret; + DWORD size = 0; + ret = RegGetValueW(this->hkeyProgID, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); if (ret == ERROR_SUCCESS) { - DWORD size = 0; - ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); - if (ret == ERROR_SUCCESS) + WCHAR *icon = static_cast<WCHAR *>(HeapAlloc(GetProcessHeap(), 0, size)); + if (icon) { - WCHAR *icon = static_cast<WCHAR *>(HeapAlloc(GetProcessHeap(), 0, size)); - if (icon) + ret = RegGetValueW(this->hkeyProgID, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); + if (ret == ERROR_SUCCESS) { - ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); - if (ret == ERROR_SUCCESS) - { - hr = this->ReturnString(flags, pszOut, pcchOut, icon, strlenW(icon) + 1); - } - else - { - hr = HRESULT_FROM_WIN32(ret); - } - HeapFree(GetProcessHeap(), 0, icon); + hr = this->ReturnString(flags, pszOut, pcchOut, icon, strlenW(icon) + 1); } else { - hr = E_OUTOFMEMORY; + hr = HRESULT_FROM_WIN32(ret); } + HeapFree(GetProcessHeap(), 0, icon); } else { hr = HRESULT_FROM_WIN32(ret); } - RegCloseKey(hkeyFile); } else { hr = HRESULT_FROM_WIN32(ret); } - HeapFree(GetProcessHeap(), 0, pszFileType); return hr; } case ASSOCSTR_SHELLEXTENSION:

8 years

[akhaldi] 72577: [BTRFS][ZLIB] Addendum to r72576. CORE-11937

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 4 17:31:50 2016 New Revision: 72577 URL: http://svn.reactos.org/svn/reactos?rev=72577&view=rev Log: [BTRFS][ZLIB] Addendum to r72576. CORE-11937 Removed: trunk/reactos/drivers/filesystems/btrfs/zlib/ Modified: trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt Modified: trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… ============================================================================== --- trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt [iso-8859-1] Sun Sep 4 17:31:50 2016 @@ -1,4 +1,3 @@ -add_subdirectory(zlib) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib @@ -36,4 +35,3 @@ add_importlibs(btrfs ntoskrnl hal) add_pch(btrfs btrfs_drv.h SOURCE) add_cd_file(TARGET btrfs DESTINATION reactos/system32/drivers NO_CAB FOR all) - Modified: trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/CMak… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] Sun Sep 4 17:31:50 2016 @@ -2,25 +2,29 @@ add_definitions(-DNO_VIZ) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) -list(APPEND SOURCE +list(APPEND SOLO_SOURCE adler32.c - compress.c crc32.c deflate.c + inffast.c + inflate.c + inftrees.c + trees.c + zutil.c) + +list(APPEND SOURCE + compress.c gzclose.c gzlib.c gzread.c gzwrite.c infback.c - inffast.c - inflate.c - inftrees.c - trees.c - uncompr.c - zutil.c) + uncompr.c) if(CMAKE_CROSSCOMPILING) - add_library(zlib ${SOURCE}) + add_library(zlib ${SOURCE} ${SOLO_SOURCE}) + add_library(zlib_solo ${SOLO_SOURCE}) + add_target_compile_definitions(zlib_solo Z_SOLO) else() - add_library(zlibhost ${SOURCE}) + add_library(zlibhost ${SOURCE} ${SOLO_SOURCE}) endif()

8 years

[pschweitzer] 72576: [BTRFS] Sync btrfs to 0.6. CORE-11937

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Sep 4 15:27:46 2016 New Revision: 72576 URL: http://svn.reactos.org/svn/reactos?rev=72576&view=rev Log: [BTRFS] Sync btrfs to 0.6. CORE-11937 Added: trunk/reactos/drivers/filesystems/btrfs/compress.c (with props) trunk/reactos/drivers/filesystems/btrfs/zlib/ trunk/reactos/drivers/filesystems/btrfs/zlib/CMakeLists.txt (with props) Modified: trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt trunk/reactos/drivers/filesystems/btrfs/btrfs.c trunk/reactos/drivers/filesystems/btrfs/btrfs.rc trunk/reactos/drivers/filesystems/btrfs/btrfs_drv.h trunk/reactos/drivers/filesystems/btrfs/btrfsioctl.h trunk/reactos/drivers/filesystems/btrfs/create.c trunk/reactos/drivers/filesystems/btrfs/dirctrl.c trunk/reactos/drivers/filesystems/btrfs/extent-tree.c trunk/reactos/drivers/filesystems/btrfs/fastio.c trunk/reactos/drivers/filesystems/btrfs/fileinfo.c trunk/reactos/drivers/filesystems/btrfs/flushthread.c trunk/reactos/drivers/filesystems/btrfs/free-space.c trunk/reactos/drivers/filesystems/btrfs/fsctl.c trunk/reactos/drivers/filesystems/btrfs/pnp.c trunk/reactos/drivers/filesystems/btrfs/read.c trunk/reactos/drivers/filesystems/btrfs/registry.c trunk/reactos/drivers/filesystems/btrfs/reparse.c trunk/reactos/drivers/filesystems/btrfs/security.c trunk/reactos/drivers/filesystems/btrfs/treefuncs.c trunk/reactos/drivers/filesystems/btrfs/worker-thread.c trunk/reactos/drivers/filesystems/btrfs/write.c trunk/reactos/media/doc/README.FSD [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs_drv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/btrfsioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/compress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/dirctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/extent-tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/flushthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/free-space.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/reparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/treefuncs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/worker-thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/zlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/media/doc/README.FSD URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.FSD?rev=7…

8 years

[pschweitzer] 72575: [ZLIB] Revert r72574

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Sep 4 15:15:01 2016 New Revision: 72575 URL: http://svn.reactos.org/svn/reactos?rev=72575&view=rev Log: [ZLIB] Revert r72574 Modified: trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt Modified: trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/CMak… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] Sun Sep 4 15:15:01 2016 @@ -1,5 +1,5 @@ -add_definitions(-DNO_VIZ -DZ_SOLO) +add_definitions(-DNO_VIZ) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) list(APPEND SOURCE @@ -7,6 +7,10 @@ compress.c crc32.c deflate.c + gzclose.c + gzlib.c + gzread.c + gzwrite.c infback.c inffast.c inflate.c

8 years

[pschweitzer] 72574: [ZLIB] When building zlib, only build portable functions so that we have a portable library. CORE-11937

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Sep 4 15:11:26 2016 New Revision: 72574 URL: http://svn.reactos.org/svn/reactos?rev=72574&view=rev Log: [ZLIB] When building zlib, only build portable functions so that we have a portable library. CORE-11937 Modified: trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt Modified: trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/zlib/CMak… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] Sun Sep 4 15:11:26 2016 @@ -1,5 +1,5 @@ -add_definitions(-DNO_VIZ) +add_definitions(-DNO_VIZ -DZ_SOLO) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) list(APPEND SOURCE @@ -7,10 +7,6 @@ compress.c crc32.c deflate.c - gzclose.c - gzlib.c - gzread.c - gzwrite.c infback.c inffast.c inflate.c

8 years

[mjansen] 72573: [SHELL32] Use the new ShellDimScreen function to fade the background on logoff / shutdown dialogs. CORE-11422 #resolve

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun Sep 4 14:18:41 2016 New Revision: 72573 URL: http://svn.reactos.org/svn/reactos?rev=72573&view=rev Log: [SHELL32] Use the new ShellDimScreen function to fade the background on logoff / shutdown dialogs. CORE-11422 #resolve Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Sun Sep 4 14:18:41 2016 @@ -810,6 +810,27 @@ return MessageBoxW(hWndOwner, Prompt, Title, MB_YESNO|MB_ICONQUESTION) == IDYES; } +typedef HRESULT (__stdcall *tShellDimScreen) (IUnknown** Unknown, HWND* hWindow); + +BOOL +CallShellDimScreen(IUnknown** pUnknown, HWND* hWindow) +{ + static tShellDimScreen ShellDimScreen; + static BOOL Initialized = FALSE; + if (!Initialized) + { + HMODULE mod = LoadLibrary(TEXT("msgina.dll")); + ShellDimScreen = (tShellDimScreen)GetProcAddress(mod, MAKEINTRESOURCEA(16)); + Initialized = TRUE; + } + + HRESULT hr = E_FAIL; + if (ShellDimScreen) + hr = ShellDimScreen(pUnknown, hWindow); + return SUCCEEDED(hr); +} + + /************************************************************************* * RestartDialogEx [SHELL32.730] @@ -819,8 +840,13 @@ { TRACE("(%p)\n", hWndOwner); + CComPtr<IUnknown> fadeHandler; + HWND parent; + if (!CallShellDimScreen(&fadeHandler, &parent)) + parent = hWndOwner; + /* FIXME: use lpwstrReason */ - if (ConfirmDialog(hWndOwner, IDS_RESTART_PROMPT, IDS_RESTART_TITLE)) + if (ConfirmDialog(parent, IDS_RESTART_PROMPT, IDS_RESTART_TITLE)) { HANDLE hToken; TOKEN_PRIVILEGES npr; @@ -881,7 +907,12 @@ EXTERN_C int WINAPI LogoffWindowsDialog(HWND hWndOwner) { - DialogBox(shell32_hInstance, MAKEINTRESOURCE(IDD_LOG_OFF), hWndOwner, LogOffDialogProc); + CComPtr<IUnknown> fadeHandler; + HWND parent; + if (!CallShellDimScreen(&fadeHandler, &parent)) + parent = hWndOwner; + + DialogBox(shell32_hInstance, MAKEINTRESOURCE(IDD_LOG_OFF), parent, LogOffDialogProc); return 0; } @@ -952,12 +983,17 @@ TRACE("(%p)\n", hWndOwner); + CComPtr<IUnknown> fadeHandler; + HWND parent; + if (!CallShellDimScreen(&fadeHandler, &parent)) + parent = hWndOwner; + /* If the DLL cannot be found for any reason, then it simply uses a dialog box to ask if the user wants to shut down the computer. */ if(!msginaDll) { TRACE("Unable to load msgina.dll.\n"); - ExitWindowsDialog_backup(hWndOwner); + ExitWindowsDialog_backup(parent); return; } @@ -966,7 +1002,7 @@ if(pShellShutdownDialog) { /* Actually call the function */ - DWORD returnValue = pShellShutdownDialog(hWndOwner, NULL, FALSE); + DWORD returnValue = pShellShutdownDialog(parent, NULL, FALSE); switch(returnValue) { @@ -1019,6 +1055,6 @@ /* If the function cannot be found, then revert to using the backup solution */ TRACE("Unable to find the 'ShellShutdownDialog' function"); FreeLibrary(msginaDll); - ExitWindowsDialog_backup(hWndOwner); - } -} + ExitWindowsDialog_backup(parent); + } +}

8 years

[mjansen] 72572: [MSGINA] Implement ShellDimScreen. CORE-11422

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun Sep 4 14:17:22 2016 New Revision: 72572 URL: http://svn.reactos.org/svn/reactos?rev=72572&view=rev Log: [MSGINA] Implement ShellDimScreen. CORE-11422 Added: trunk/reactos/dll/win32/msgina/dimmedwindow.cpp (with props) Modified: trunk/reactos/dll/win32/msgina/CMakeLists.txt trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/stubs.c Modified: trunk/reactos/dll/win32/msgina/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msgina/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/CMakeLists.txt [iso-8859-1] Sun Sep 4 14:17:22 2016 @@ -1,11 +1,13 @@ + +set_cpp(WITH_RUNTIME) include_directories( - include + ${REACTOS_SOURCE_DIR}/sdk/lib/atl ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(msgina.dll msgina.spec) -list(APPEND SOURCE +list(APPEND C_SOURCE gui.c lsa.c msgina.c @@ -14,15 +16,19 @@ tui.c msgina.h) +list(APPEND CPP_SOURCE + dimmedwindow.cpp) + add_library(msgina SHARED - ${SOURCE} + ${C_SOURCE} + ${CPP_SOURCE} msgina.rc ${CMAKE_CURRENT_BINARY_DIR}/msgina_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msgina.def) -set_module_type(msgina win32dll) -target_link_libraries(msgina wine) +set_module_type(msgina win32dll UNICODE) +target_link_libraries(msgina atlnew wine uuid ${PSEH_LIB}) add_delay_importlibs(msgina secur32) add_importlibs(msgina advapi32 user32 gdi32 powrprof userenv msvcrt kernel32 ntdll) -add_pch(msgina msgina.h SOURCE) +add_pch(msgina msgina.h CPP_SOURCE) add_cd_file(TARGET msgina DESTINATION reactos/system32 FOR all) Added: trunk/reactos/dll/win32/msgina/dimmedwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/dimmedwin… ============================================================================== --- trunk/reactos/dll/win32/msgina/dimmedwindow.cpp (added) +++ trunk/reactos/dll/win32/msgina/dimmedwindow.cpp [iso-8859-1] Sun Sep 4 14:17:22 2016 @@ -0,0 +1,269 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS msgina.dll + * FILE: dll/win32/msgina/dimmedwindow.cpp + * PURPOSE: Implementation of ShellDimScreen + * PROGRAMMER: Mark Jansen + */ + +#define COM_NO_WINDOWS_H +#include "msgina.h" +#include <wingdi.h> +#include <atlbase.h> +#include <atlcom.h> +#include <pseh/pseh2.h> + +CComModule gModule; + +// Please note: The INIT_TIMER is a workaround because ReactOS does not redraw the desktop in time, +// so the start menu is still visible on the dimmed screen. +#define INIT_TIMER_ID 0x112233 +#define FADE_TIMER_ID 0x12345 + +class CDimmedWindow : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + IUnknown +{ +private: + HWND m_hwnd; + HDC m_hdc; + HBITMAP m_hbitmap; + HGDIOBJ m_oldbitmap; + LONG m_width; + LONG m_height; + BITMAPINFO m_bi; + UCHAR* m_bytes; + int m_step; + + static LRESULT WINAPI Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + +public: + CDimmedWindow() + : m_hwnd(NULL) + , m_hdc(NULL) + , m_hbitmap(NULL) + , m_oldbitmap(NULL) + , m_width(0) + , m_height(0) + , m_bytes(NULL) + , m_step(0) + { + WNDCLASSEXW wndclass = {sizeof(wndclass)}; + wndclass.lpfnWndProc = Proc; + wndclass.hInstance = hDllInstance; + wndclass.hCursor = LoadCursor(0, IDC_ARROW); + wndclass.lpszClassName = L"DimmedWindowClass"; + + if (!RegisterClassExW(&wndclass)) + return; + + m_width = GetSystemMetrics(SM_CXVIRTUALSCREEN); + m_height = GetSystemMetrics(SM_CYVIRTUALSCREEN); + + memset(&m_bi, 0, sizeof(m_bi)); + m_bi.bmiHeader.biSize = sizeof(m_bi); + m_bi.bmiHeader.biWidth = m_width; + m_bi.bmiHeader.biHeight = m_height; + m_bi.bmiHeader.biPlanes = 1; + m_bi.bmiHeader.biBitCount = 32; + m_bi.bmiHeader.biCompression = BI_RGB; + m_bi.bmiHeader.biSizeImage = m_width * 4 * m_height; + m_bytes = new UCHAR[m_width * 4 * m_height]; + + LONG x = GetSystemMetrics(SM_XVIRTUALSCREEN); + LONG y = GetSystemMetrics(SM_YVIRTUALSCREEN); + + m_hwnd = CreateWindowExW(WS_EX_TOPMOST, L"DimmedWindowClass", NULL, WS_POPUP, + x, y, m_width, m_height, + NULL, NULL, hDllInstance, (LPVOID)this); + } + + ~CDimmedWindow() + { + if (m_hwnd) + DestroyWindow(m_hwnd); + UnregisterClassW(L"DimmedWindowClass", hDllInstance); + if (m_oldbitmap) + SelectObject(m_hdc, m_oldbitmap); + if (m_hbitmap) + DeleteObject(m_hbitmap); + if (m_hdc) + DeleteObject(m_hdc); + if (m_bytes) + delete[] m_bytes; + } + + // This is needed so that we do not capture the start menu while it's closing. + void WaitForInit() + { + MSG msg; + + while (!IsWindowVisible(m_hwnd)) + { + while (::PeekMessage(&msg, m_hwnd, 0, 0, PM_REMOVE)) + { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + + if (IsWindowVisible(m_hwnd)) + break; + } + } + } + + void Init() + { + Capture(); + + ShowWindow(m_hwnd, SW_SHOWNA); + EnableWindow(m_hwnd, FALSE); + + SetTimer(m_hwnd, FADE_TIMER_ID, 200, NULL); + } + + void Capture() + { + HWND desktopWnd = GetDesktopWindow(); + HDC desktopDC = GetDC(desktopWnd); + + m_hdc = CreateCompatibleDC(desktopDC); + + m_hbitmap = CreateCompatibleBitmap(desktopDC, m_width, m_height); + m_oldbitmap = SelectObject(m_hdc, m_hbitmap); + BitBlt(m_hdc, 0, 0, m_width, m_height, desktopDC, 0, 0, SRCCOPY); + + ReleaseDC(desktopWnd, desktopDC); + } + + bool Step() + { + // Stop after 10 steps + if (m_step++ > 10 || !m_bytes) + return false; + + int lines = GetDIBits(m_hdc, m_hbitmap, 0, m_height, m_bytes, &m_bi, DIB_RGB_COLORS); + if (lines) + { + for (int xh = 0; xh < m_height; ++xh) + { + int h = m_width * 4 * xh; + for (int w = 0; w < m_width; ++w) + { + UCHAR b = m_bytes[(h + w * 4) + 0]; + UCHAR g = m_bytes[(h + w * 4) + 1]; + UCHAR r = m_bytes[(h + w * 4) + 2]; + + // Standard formula to convert a color. + int gray = (r * 30 + g * 59 + b * 11) / 100; + if (gray < 0) + gray = 0; + + // Do not fade too fast. + r = (r*2 + gray) / 3; + g = (g*2 + gray) / 3; + b = (b*2 + gray) / 3; + + m_bytes[(h + w * 4) + 0] = b; + m_bytes[(h + w * 4) + 1] = g; + m_bytes[(h + w * 4) + 2] = r; + } + } + SetDIBits(m_hdc, m_hbitmap, 0, lines, m_bytes, &m_bi, DIB_RGB_COLORS); + } + return true; + } + + void Blt(HDC hdc) + { + BitBlt(hdc, 0, 0, m_width, m_height, m_hdc, 0, 0, SRCCOPY); + } + + HWND Wnd() + { + return m_hwnd; + } + + + BEGIN_COM_MAP(CDimmedWindow) + COM_INTERFACE_ENTRY_IID(IID_IUnknown, IUnknown) + END_COM_MAP() + +}; + + +LRESULT WINAPI CDimmedWindow::Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch(uMsg) + { + case WM_NCCREATE: + { + LPCREATESTRUCT lpcs = reinterpret_cast<LPCREATESTRUCT>(lParam); + CDimmedWindow* info = static_cast<CDimmedWindow*>(lpcs->lpCreateParams); + SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG)info); + SetTimer(hWnd, INIT_TIMER_ID, 50, NULL); + break; + } + case WM_PAINT: + { + CDimmedWindow* info = reinterpret_cast<CDimmedWindow*>(GetWindowLongPtr(hWnd, GWLP_USERDATA)); + if (info) + { + PAINTSTRUCT paint; + HDC hdc = BeginPaint(hWnd, &paint); + info->Blt(hdc); + EndPaint(hWnd, &paint); + } + return 0; + } + case WM_TIMER: + if (wParam == INIT_TIMER_ID) + { + CDimmedWindow* info = reinterpret_cast<CDimmedWindow*>(GetWindowLongPtr(hWnd, GWLP_USERDATA)); + KillTimer(hWnd, INIT_TIMER_ID); + info->Init(); + return 0; + } + if (wParam == FADE_TIMER_ID) + { + CDimmedWindow* info = reinterpret_cast<CDimmedWindow*>(GetWindowLongPtr(hWnd, GWLP_USERDATA)); + if (info && info->Step()) + InvalidateRect(hWnd, NULL, TRUE); + else + KillTimer(hWnd, FADE_TIMER_ID); + return 0; + } + break; + default: + break; + } + return DefWindowProc(hWnd, uMsg, wParam, lParam); +} + + +extern "C" +HRESULT WINAPI +ShellDimScreen (void** pUnknown, HWND* hWindow) +{ + CComObject<CDimmedWindow> *pWindow; + HRESULT hr = CComObject<CDimmedWindow>::CreateInstance(&pWindow); + ULONG refcount; + + pWindow->WaitForInit(); + + _SEH2_TRY + { + hr = pWindow->QueryInterface(IID_IUnknown, pUnknown); + *hWindow = pWindow->Wnd(); + hr = S_OK; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + hr = E_INVALIDARG; + refcount = pWindow->AddRef(); + while (refcount) + refcount = pWindow->Release(); + } + _SEH2_END + + return hr; +} Propchange: trunk/reactos/dll/win32/msgina/dimmedwindow.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Sun Sep 4 14:17:22 2016 @@ -1,5 +1,9 @@ #ifndef _MSGINA_H #define _MSGINA_H + +#ifdef __cplusplus +extern "C" { +#endif #include <stdarg.h> @@ -125,4 +129,8 @@ IN PWSTR Domain, IN PWSTR Password); +#ifdef __cplusplus +} // extern "C" +#endif + #endif /* _MSGINA_H */ Modified: trunk/reactos/dll/win32/msgina/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] Sun Sep 4 14:17:22 2016 @@ -116,10 +116,3 @@ UNIMPLEMENTED; return FALSE; } - -HRESULT WINAPI -ShellDimScreen (void* Unknown, HWND* hWindow) -{ - UNIMPLEMENTED; - return E_FAIL; -}

8 years

[hbelusca] 72571: [NTVDM]: Improve a bit the WOW16 "unsupported" warning message. See CORE-10323

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Sep 4 11:46:08 2016 New Revision: 72571 URL: http://svn.reactos.org/svn/reactos?rev=72571&view=rev Log: [NTVDM]: Improve a bit the WOW16 "unsupported" warning message. See CORE-10323 Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Sun Sep 4 11:46:08 2016 @@ -796,7 +796,9 @@ /* Those are handled by NTVDM */ case SCS_WOW_BINARY: { - DisplayMessage(L"Trying to load '%S'. WOW16 applications are not supported at the moment.", + DisplayMessage(L"Trying to load '%S'.\n" + L"WOW16 applications are not supported internally by NTVDM at the moment.\n" + L"Press 'OK' to continue.", ProgramName); // Fall through }

8 years

← Newer
1
...
27
28
29
30
31
32
33
34
35
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 September 2016