Ros-diffs March 2016

ros-diffs@reactos.org

13 participants
263 discussions

[dreimer] 71067: [RAPPS] Database Update... incl. SHA1 hashes. Appreciate it! This took 5 hrs thx to the stupid and USELESS hashes!

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Mar 28 18:26:24 2016 New Revision: 71067 URL: http://svn.reactos.org/svn/reactos?rev=71067&view=rev Log: [RAPPS] Database Update... incl. SHA1 hashes. Appreciate it! This took 5 hrs thx to the stupid and USELESS hashes! Added: trunk/reactos/media/rapps/efsearch.txt - copied unchanged from r71066, trunk/reactos/media/rapps/efserch.txt trunk/reactos/media/rapps/libreofficestill.txt (with props) Removed: trunk/reactos/media/rapps/codeblocks_gcc_2.txt trunk/reactos/media/rapps/efserch.txt trunk/reactos/media/rapps/seamonkey.txt Modified: trunk/reactos/media/rapps/7zip.txt trunk/reactos/media/rapps/agatemulator.txt trunk/reactos/media/rapps/air.txt trunk/reactos/media/rapps/akelpad.txt trunk/reactos/media/rapps/audacity.txt trunk/reactos/media/rapps/bittorrent.txt trunk/reactos/media/rapps/burnawarefree.txt trunk/reactos/media/rapps/ccleaner.txt trunk/reactos/media/rapps/codeblocks.txt trunk/reactos/media/rapps/codeblocks_gcc.txt trunk/reactos/media/rapps/doublecommander.txt trunk/reactos/media/rapps/fira.txt trunk/reactos/media/rapps/firefox.txt trunk/reactos/media/rapps/foxit.txt trunk/reactos/media/rapps/freebasic.txt trunk/reactos/media/rapps/ghostscript.txt trunk/reactos/media/rapps/gimp.txt trunk/reactos/media/rapps/gnucash.txt trunk/reactos/media/rapps/hiawatha.txt trunk/reactos/media/rapps/irfanview.txt trunk/reactos/media/rapps/irfanviewplugins.txt trunk/reactos/media/rapps/kindlepc.txt trunk/reactos/media/rapps/kmeleon.txt trunk/reactos/media/rapps/lazaruside.txt trunk/reactos/media/rapps/librecad.txt trunk/reactos/media/rapps/libreoffice.txt trunk/reactos/media/rapps/libreofficehelp.txt trunk/reactos/media/rapps/miktex.txt trunk/reactos/media/rapps/mirandaim.txt trunk/reactos/media/rapps/mirc.txt trunk/reactos/media/rapps/mono2.txt trunk/reactos/media/rapps/mpc.txt trunk/reactos/media/rapps/nginx.txt trunk/reactos/media/rapps/nirlauncher.txt trunk/reactos/media/rapps/npp.txt trunk/reactos/media/rapps/openoffice.txt trunk/reactos/media/rapps/openttd.txt trunk/reactos/media/rapps/opera.txt trunk/reactos/media/rapps/pdfsam.txt trunk/reactos/media/rapps/peazip.txt trunk/reactos/media/rapps/pidgin.txt trunk/reactos/media/rapps/putty.txt trunk/reactos/media/rapps/python.txt trunk/reactos/media/rapps/qmmp.txt trunk/reactos/media/rapps/scite.txt trunk/reactos/media/rapps/scribus.txt trunk/reactos/media/rapps/scummvm.txt trunk/reactos/media/rapps/smplayer.txt trunk/reactos/media/rapps/steam.txt trunk/reactos/media/rapps/sumatrapdf.txt trunk/reactos/media/rapps/thunderbird.txt trunk/reactos/media/rapps/tileworld.txt trunk/reactos/media/rapps/totalcommander.txt trunk/reactos/media/rapps/ultravnc.txt trunk/reactos/media/rapps/vlc.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/7zip.txt?rev=7… Modified: trunk/reactos/media/rapps/agatemulator.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/agatemulator.t… Modified: trunk/reactos/media/rapps/air.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/air.txt?rev=71… Modified: trunk/reactos/media/rapps/akelpad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/akelpad.txt?re… Modified: trunk/reactos/media/rapps/audacity.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/audacity.txt?r… Modified: trunk/reactos/media/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/bittorrent.txt… Modified: trunk/reactos/media/rapps/burnawarefree.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/burnawarefree.… Modified: trunk/reactos/media/rapps/ccleaner.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ccleaner.txt?r… Modified: trunk/reactos/media/rapps/codeblocks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks.txt… Modified: trunk/reactos/media/rapps/codeblocks_gcc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks_gcc… Removed: trunk/reactos/media/rapps/codeblocks_gcc_2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks_gcc… Modified: trunk/reactos/media/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/doublecommande… Removed: trunk/reactos/media/rapps/efserch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/efserch.txt?re… Modified: trunk/reactos/media/rapps/fira.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/fira.txt?rev=7… Modified: trunk/reactos/media/rapps/firefox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/firefox.txt?re… Modified: trunk/reactos/media/rapps/foxit.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/foxit.txt?rev=… Modified: trunk/reactos/media/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/freebasic.txt?… Modified: trunk/reactos/media/rapps/ghostscript.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ghostscript.tx… Modified: trunk/reactos/media/rapps/gimp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gimp.txt?rev=7… Modified: trunk/reactos/media/rapps/gnucash.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gnucash.txt?re… Modified: trunk/reactos/media/rapps/hiawatha.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/hiawatha.txt?r… Modified: trunk/reactos/media/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/irfanview.txt?… Modified: trunk/reactos/media/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/irfanviewplugi… Modified: trunk/reactos/media/rapps/kindlepc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kindlepc.txt?r… Modified: trunk/reactos/media/rapps/kmeleon.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kmeleon.txt?re… Modified: trunk/reactos/media/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/lazaruside.txt… Modified: trunk/reactos/media/rapps/librecad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/librecad.txt?r… Modified: trunk/reactos/media/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreoffice.tx… Modified: trunk/reactos/media/rapps/libreofficehelp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreofficehel… Added: trunk/reactos/media/rapps/libreofficestill.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreofficesti… Modified: trunk/reactos/media/rapps/miktex.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/miktex.txt?rev… Modified: trunk/reactos/media/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mirandaim.txt?… Modified: trunk/reactos/media/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mirc.txt?rev=7… Modified: trunk/reactos/media/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mono2.txt?rev=… Modified: trunk/reactos/media/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mpc.txt?rev=71… Modified: trunk/reactos/media/rapps/nginx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nginx.txt?rev=… Modified: trunk/reactos/media/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nirlauncher.tx… Modified: trunk/reactos/media/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/npp.txt?rev=71… Modified: trunk/reactos/media/rapps/openoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/openoffice.txt… Modified: trunk/reactos/media/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/openttd.txt?re… Modified: trunk/reactos/media/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/opera.txt?rev=… Modified: trunk/reactos/media/rapps/pdfsam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pdfsam.txt?rev… Modified: trunk/reactos/media/rapps/peazip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/peazip.txt?rev… Modified: trunk/reactos/media/rapps/pidgin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pidgin.txt?rev… Modified: trunk/reactos/media/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/putty.txt?rev=… Modified: trunk/reactos/media/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/python.txt?rev… Modified: trunk/reactos/media/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/qmmp.txt?rev=7… Modified: trunk/reactos/media/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scite.txt?rev=… Modified: trunk/reactos/media/rapps/scribus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scribus.txt?re… Modified: trunk/reactos/media/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scummvm.txt?re… Removed: trunk/reactos/media/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/seamonkey.txt?… Modified: trunk/reactos/media/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/smplayer.txt?r… Modified: trunk/reactos/media/rapps/steam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/steam.txt?rev=… Modified: trunk/reactos/media/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sumatrapdf.txt… Modified: trunk/reactos/media/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/thunderbird.tx… Modified: trunk/reactos/media/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tileworld.txt?… Modified: trunk/reactos/media/rapps/totalcommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/totalcommander… Modified: trunk/reactos/media/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ultravnc.txt?r… Modified: trunk/reactos/media/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vlc.txt?rev=71…

8 years, 5 months

[tkreuzer] 71066: [CMAKE/MSVC] Enable function level linking and comdat folding independent from build type. This reduces freeldr size and allows to build with /RTC1 again. Since GCC doesn't suppor...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Mar 28 16:38:26 2016 New Revision: 71066 URL: http://svn.reactos.org/svn/reactos?rev=71066&view=rev Log: [CMAKE/MSVC] Enable function level linking and comdat folding independent from build type. This reduces freeldr size and allows to build with /RTC1 again. Since GCC doesn't support function level linking, cmlib should be refactored by moving some functions into different source files to avoid linking unused code into freeldr. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=71066… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Mon Mar 28 16:38:26 2016 @@ -6,7 +6,6 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Release") add_compile_flags("/Ox /Ob2 /Ot /Oy /GT /GF") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /OPT:ICF") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /OPT:ICF") elseif(OPTIMIZE STREQUAL "1") add_definitions(/O1) elseif(OPTIMIZE STREQUAL "2") @@ -18,6 +17,11 @@ elseif(OPTIMIZE STREQUAL "5") add_definitions(/GF /Gy /Ob2 /Os /Ox /GS-) endif() + +# Enable function level linking and comdat folding +add_compile_flags("/Gy") +set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /OPT:ICF") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /OPT:ICF") if(ARCH STREQUAL "i386") add_definitions(/DWIN32 /D_WINDOWS)

8 years, 5 months

[tkreuzer] 71065: {SPEC2DEF] Allow forwarders to contain ordinals (xydll.#123)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Mar 28 16:31:32 2016 New Revision: 71065 URL: http://svn.reactos.org/svn/reactos?rev=71065&view=rev Log: {SPEC2DEF] Allow forwarders to contain ordinals (xydll.#123) Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Mon Mar 28 16:31:32 2016 @@ -116,7 +116,7 @@ int IsSeparator(char chr) { - return ((chr <= ',' && chr != '$') || + return ((chr <= ',' && chr != '$' && chr != '#') || (chr >= ':' && chr < '?') ); }

8 years, 5 months

[tfaber] 71064: [SHELL32_APITEST] - Add tests for IShellFolder::CompareIDs. Patch by Mark Jansen, with additional test cases by Sylvain Deverre. CORE-10747

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Mar 28 15:35:21 2016 New Revision: 71064 URL: http://svn.reactos.org/svn/reactos?rev=71064&view=rev Log: [SHELL32_APITEST] - Add tests for IShellFolder::CompareIDs. Patch by Mark Jansen, with additional test cases by Sylvain Deverre. CORE-10747 Added: trunk/rostests/apitests/shell32/shelltest.cpp (with props) Modified: trunk/rostests/apitests/shell32/CMakeLists.txt trunk/rostests/apitests/shell32/CShellDesktop.cpp trunk/rostests/apitests/shell32/shelltest.h Modified: trunk/rostests/apitests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CMakeLis… ============================================================================== --- trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] Mon Mar 28 15:35:21 2016 @@ -7,8 +7,9 @@ CMyComputer.cpp CShellDesktop.cpp menu.cpp + shelltest.cpp testlist.c) -target_link_libraries(shell32_apitest wine uuid) +target_link_libraries(shell32_apitest wine uuid ${PSEH_LIB}) set_module_type(shell32_apitest win32cui) -add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 shlwapi msvcrt kernel32) +add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET shell32_apitest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/apitests/shell32/CShellDesktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CShellDe… ============================================================================== --- trunk/rostests/apitests/shell32/CShellDesktop.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CShellDesktop.cpp [iso-8859-1] Mon Mar 28 15:35:21 2016 @@ -3,16 +3,151 @@ * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory * PURPOSE: Test for CShellDesktop * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * Mark Jansen */ #include "shelltest.h" #include <atlbase.h> #include <atlcom.h> #include <strsafe.h> +#include <ndk/rtlfuncs.h> #define NDEBUG #include <debug.h> #include <shellutils.h> + + +// We would normally use S_LESSTHAN and S_GREATERTHAN, but w2k3 returns numbers like 3 and -3... +// So instead we check on the sign bit (compare result is the low word of the hresult). +#define SHORT_SIGN_BIT 0x8000 + +static +VOID +compare_imp(IShellFolder* psf, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2, HRESULT expected) +{ + HRESULT hr; + _SEH2_TRY + { + hr = psf->CompareIDs(0, pidl1, pidl2); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + winetest_ok(0, "Exception %lx!\n", _SEH2_GetExceptionCode()); + hr = HRESULT_FROM_WIN32(RtlNtStatusToDosError(_SEH2_GetExceptionCode())); + } + _SEH2_END; + if (expected == S_LESSTHAN) + winetest_ok(SUCCEEDED(hr) && (hr & SHORT_SIGN_BIT), "hr = %lx\n", hr); + else if (expected == S_EQUAL) + winetest_ok(hr == S_EQUAL, "hr = %lx\n", hr); + else if (expected == S_GREATERTHAN) + winetest_ok(SUCCEEDED(hr) && !(hr & SHORT_SIGN_BIT), "hr = %lx\n", hr); + else + winetest_ok(hr == expected, "hr = %lx\n", hr); +} + +// make the winetest_ok look like it came from the line where the compare function was called, and not from inside the compare_imp function :) +#define compare (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : compare_imp + +static +VOID +TestCompareIDList(IShellFolder* psf) +{ + compare(psf, NULL, NULL, E_INVALIDARG); + + CComHeapPtr<ITEMIDLIST> desktop; + HRESULT hr = SHGetFolderLocation(NULL, CSIDL_DESKTOP, NULL, NULL, &desktop); + ok(hr == S_OK, "hr = %lx\n", hr); + compare(psf, desktop, NULL, E_INVALIDARG); + compare(psf, NULL, desktop, E_INVALIDARG); + compare(psf, desktop, desktop, S_EQUAL); + + // First check the ordering of some special folders against eachother + CComHeapPtr<ITEMIDLIST> internet; + hr = SHGetFolderLocation(NULL, CSIDL_INTERNET, NULL, NULL, &internet); + ok(hr == S_OK, "hr = %lx\n", hr); + compare(psf, internet, desktop, S_LESSTHAN); + compare(psf, desktop, internet, S_GREATERTHAN); + + CComHeapPtr<ITEMIDLIST> programs; + hr = SHGetFolderLocation(NULL, CSIDL_PROGRAMS, NULL, NULL, &programs); + ok(hr == S_OK, "hr = %lx\n", hr); + compare(psf, programs, desktop, S_LESSTHAN); + compare(psf, desktop, programs, S_GREATERTHAN); + compare(psf, internet, programs, S_GREATERTHAN); + compare(psf, programs, internet, S_LESSTHAN); + + // Verify that an idlist retrieved from GetCurFolder is equal to the original one. + CComPtr<IPersistFolder2> persist; + hr = psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &persist)); + ok(hr == S_OK, "hr = %lx\n", hr); + if (hr == S_OK) + { + CComHeapPtr<ITEMIDLIST> cur; + hr = persist->GetCurFolder(&cur); + ok(hr == S_OK, "hr = %lx\n", hr); + compare(psf, cur, desktop, S_EQUAL); + compare(psf, desktop, cur, S_EQUAL); + } + + // Compare special folders against full paths + CComHeapPtr<ITEMIDLIST> dir1, dir2; + PathToIDList(L"A:\\AAA.AAA", &dir1); + PathToIDList(L"A:\\ZZZ.ZZZ", &dir2); + + compare(psf, dir1, desktop, S_LESSTHAN); + compare(psf, desktop, dir1, S_GREATERTHAN); + compare(psf, dir1, programs, S_LESSTHAN); + compare(psf, programs, dir1, S_GREATERTHAN); + compare(psf, dir1, dir1, S_EQUAL); + + compare(psf, dir2, desktop, S_LESSTHAN); + compare(psf, desktop, dir2, S_GREATERTHAN); + compare(psf, dir2, programs, S_LESSTHAN); + compare(psf, programs, dir2, S_GREATERTHAN); + compare(psf, dir2, dir2, S_EQUAL); + + CComHeapPtr<ITEMIDLIST> dir3, dir4; + PathToIDList(L"Z:\\AAA.AAA", &dir3); + PathToIDList(L"Z:\\ZZZ.ZZZ", &dir4); + + compare(psf, dir3, desktop, S_LESSTHAN); + compare(psf, desktop, dir3, S_GREATERTHAN); + compare(psf, dir3, programs, S_GREATERTHAN); + compare(psf, programs, dir3, S_LESSTHAN); + compare(psf, dir3, dir3, S_EQUAL); + + compare(psf, dir4, desktop, S_LESSTHAN); + compare(psf, desktop, dir4, S_GREATERTHAN); + compare(psf, dir4, programs, S_GREATERTHAN); + compare(psf, programs, dir4, S_LESSTHAN); + compare(psf, dir4, dir4, S_EQUAL); + + // Now compare the paths against eachother. + compare(psf, dir1, dir2, S_LESSTHAN); + compare(psf, dir2, dir1, S_GREATERTHAN); + + compare(psf, dir2, dir3, S_LESSTHAN); + compare(psf, dir3, dir2, S_GREATERTHAN); + + compare(psf, dir3, dir4, S_LESSTHAN); + compare(psf, dir4, dir3, S_GREATERTHAN); + + // Check that comparing desktop pidl with another one with another IShellFolder fails + CComPtr<IShellFolder> psf2; + hr = psf->BindToObject(programs, NULL, IID_IShellFolder, reinterpret_cast<void**>(&psf2)); + ok(hr == S_OK, "Impossible to bind to Programs pidl"); + if (hr == S_OK) + { + // Compare desktop pidl in programs scope should fail since it's relative pidl + compare(psf2, desktop, programs, E_INVALIDARG); + compare(psf2, programs, desktop, E_INVALIDARG); + // For the same reasons, filesystem paths can't be compared with special shell + // folders that don't have CFSFolder in children + compare(psf2, dir1, dir2, E_INVALIDARG); + compare(psf2, dir2, dir1, E_INVALIDARG); + } +} static VOID @@ -83,4 +218,5 @@ ok(psf == static_cast<IShellFolder *>(psf2), "Expected %p == %p\n", static_cast<PVOID>(psf), static_cast<PVOID>(psf2)); TestShellFolder(psf2); -} + TestCompareIDList(psf); +} Added: trunk/rostests/apitests/shell32/shelltest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/shelltes… ============================================================================== --- trunk/rostests/apitests/shell32/shelltest.cpp (added) +++ trunk/rostests/apitests/shell32/shelltest.cpp [iso-8859-1] Mon Mar 28 15:35:21 2016 @@ -0,0 +1,98 @@ +#include "shelltest.h" +#include <atlbase.h> +#include <atlcom.h> + + +// + Adapted from https://blogs.msdn.microsoft.com/oldnewthing/20130503-00/?p=4463/ +// In short: We want to create an IDLIST from an item that does not exist, +// so we have to provide WIN32_FIND_DATAW in a bind context. +// If we don't, the FS will be queried, and we do not get a valid IDLIST for a non-existing path. + +CComModule gModule; + +class CFileSysBindData : + public CComCoClass<CFileSysBindData>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IFileSystemBindData +{ +public: + virtual HRESULT STDMETHODCALLTYPE SetFindData(const WIN32_FIND_DATAW *pfd) + { + m_Data = *pfd; + return S_OK; + } + + virtual HRESULT STDMETHODCALLTYPE GetFindData(WIN32_FIND_DATAW *pfd) + { + *pfd = m_Data; + return S_OK; + } + + DECLARE_NOT_AGGREGATABLE(CFileSysBindData) + DECLARE_PROTECT_FINAL_CONSTRUCT() + BEGIN_COM_MAP(CFileSysBindData) + COM_INTERFACE_ENTRY_IID(IID_IFileSystemBindData, IFileSystemBindData) + END_COM_MAP() +private: + WIN32_FIND_DATAW m_Data; +}; + +static +HRESULT +AddFileSysBindCtx(_In_ IBindCtx *pbc) +{ + CComPtr<IFileSystemBindData> spfsbc(new CComObject<CFileSysBindData>()); + WIN32_FIND_DATAW wfd = { 0 }; + wfd.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; + spfsbc->SetFindData(&wfd); + HRESULT hr = pbc->RegisterObjectParam((LPOLESTR)STR_FILE_SYS_BIND_DATA, spfsbc); + ok(hr == S_OK, "hr = %lx\n", hr); + return hr; +} + +static +HRESULT +CreateBindCtxWithOpts(_In_ BIND_OPTS *pbo, _Outptr_ IBindCtx **ppbc) +{ + CComPtr<IBindCtx> spbc; + HRESULT hr = CreateBindCtx(0, &spbc); + ok(hr == S_OK, "hr = %lx\n", hr); + if (SUCCEEDED(hr)) + { + hr = spbc->SetBindOptions(pbo); + ok(hr == S_OK, "hr = %lx\n", hr); + } + *ppbc = SUCCEEDED(hr) ? spbc.Detach() : NULL; + return hr; +} + +static HRESULT +CreateFileSysBindCtx(_Outptr_ IBindCtx **ppbc) +{ + CComPtr<IBindCtx> spbc; + BIND_OPTS bo = { sizeof(bo), 0, STGM_CREATE, 0 }; + HRESULT hr = CreateBindCtxWithOpts(&bo, &spbc); + ok(hr == S_OK, "hr = %lx\n", hr); + if (SUCCEEDED(hr)) + { + hr = AddFileSysBindCtx(spbc); + ok(hr == S_OK, "hr = %lx\n", hr); + } + *ppbc = SUCCEEDED(hr) ? spbc.Detach() : NULL; + return hr; +} + +VOID +PathToIDList(LPCWSTR pszPath, ITEMIDLIST** ppidl) +{ + CComPtr<IBindCtx> spbc; + HRESULT hr = CreateFileSysBindCtx(&spbc); + ok(hr == S_OK, "hr = %lx\n", hr); + if (SUCCEEDED(hr)) + { + hr = SHParseDisplayName(pszPath, spbc, ppidl, 0, NULL); + ok(hr == S_OK, "hr = %lx\n", hr); + } +} + +// - Adapted from https://blogs.msdn.microsoft.com/oldnewthing/20130503-00/?p=4463/ Propchange: trunk/rostests/apitests/shell32/shelltest.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/shell32/shelltest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/shelltes… ============================================================================== --- trunk/rostests/apitests/shell32/shelltest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/shelltest.h [iso-8859-1] Mon Mar 28 15:35:21 2016 @@ -28,3 +28,5 @@ DEFINE_GUID(CLSID_MenuBandSite, 0xE13EF4E4, 0xD2F2, 0x11D0, 0x98, 0x16, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72); #include "unknownbase.h" + +VOID PathToIDList(LPCWSTR pszPath, ITEMIDLIST** ppidl);

8 years, 5 months

[tfaber] 71063: [USER32] - Fix is_dib_monochrome for bitmaps using BITMAPCOREINFO. Patch by Mark Jansen. CORE-10889

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Mar 28 14:58:20 2016 New Revision: 71063 URL: http://svn.reactos.org/svn/reactos?rev=71063&view=rev Log: [USER32] - Fix is_dib_monochrome for bitmaps using BITMAPCOREINFO. Patch by Mark Jansen. CORE-10889 Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon.c Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] Mon Mar 28 14:58:20 2016 @@ -117,11 +117,11 @@ static BOOL is_dib_monochrome( const BITMAPINFO* info ) { - if (info->bmiHeader.biBitCount != 1) return FALSE; - if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { const RGBTRIPLE *rgb = ((const BITMAPCOREINFO*)info)->bmciColors; + + if (((const BITMAPCOREINFO*)info)->bmciHeader.bcBitCount != 1) return FALSE; /* Check if the first color is black */ if ((rgb->rgbtRed == 0) && (rgb->rgbtGreen == 0) && (rgb->rgbtBlue == 0)) @@ -137,6 +137,8 @@ else /* assume BITMAPINFOHEADER */ { const RGBQUAD *rgb = info->bmiColors; + + if (info->bmiHeader.biBitCount != 1) return FALSE; /* Check if the first color is black */ if ((rgb->rgbRed == 0) && (rgb->rgbGreen == 0) &&

8 years, 5 months

[tfaber] 71062: [RTL] - Don't print an uninitialized variable in parse_assembly_identity_elem. Spotted by Mark Jansen. CORE-10927 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Mar 28 11:43:16 2016 New Revision: 71062 URL: http://svn.reactos.org/svn/reactos?rev=71062&view=rev Log: [RTL] - Don't print an uninitialized variable in parse_assembly_identity_elem. Spotted by Mark Jansen. CORE-10927 #resolve Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=71062… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Mon Mar 28 11:43:16 2016 @@ -1407,8 +1407,8 @@ } else if (xmlstr_cmp(&attr_name, languageW)) { - DPRINT1("Unsupported yet language attribute (%S)\n", - ai->language); + DPRINT1("Unsupported yet language attribute (%.*S)\n", + attr_value.len, attr_value.ptr); if (!(ai->language = xmlstrdupW(&attr_value))) return FALSE; } else

8 years, 5 months

[tfaber] 71061: [CMAKE] - Delay imports belong before regular imports because delayimp may pull in functions from kernel32 CORE-10935

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Mar 27 15:14:32 2016 New Revision: 71061 URL: http://svn.reactos.org/svn/reactos?rev=71061&view=rev Log: [CMAKE] - Delay imports belong before regular imports because delayimp may pull in functions from kernel32 CORE-10935 Modified: trunk/reactos/base/applications/iexplore/CMakeLists.txt trunk/reactos/dll/cpl/appwiz/CMakeLists.txt trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt trunk/reactos/dll/win32/crypt32/CMakeLists.txt trunk/reactos/dll/win32/msgina/CMakeLists.txt trunk/reactos/dll/win32/netapi32/CMakeLists.txt trunk/reactos/dll/win32/ole32/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/consrv_new.cmake trunk/rostests/apitests/winhttp/CMakeLists.txt trunk/rostests/apitests/wininet/CMakeLists.txt Modified: trunk/reactos/base/applications/iexplore/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== --- trunk/reactos/base/applications/iexplore/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/iexplore/CMakeLists.txt [iso-8859-1] Sun Mar 27 15:14:32 2016 @@ -3,6 +3,6 @@ add_executable(iexplore main.c iexplore.rc) target_link_libraries(iexplore wine) set_module_type(iexplore win32gui UNICODE) +add_delay_importlibs(iexplore advpack version) add_importlibs(iexplore ieframe msvcrt kernel32 ntdll) -add_delay_importlibs(iexplore advpack version) add_cd_file(TARGET iexplore DESTINATION reactos FOR all) Modified: trunk/reactos/dll/cpl/appwiz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/CMakeLists.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/CMakeLists.txt [iso-8859-1] Sun Mar 27 15:14:32 2016 @@ -23,7 +23,7 @@ set_module_type(appwiz cpl UNICODE) target_link_libraries(appwiz uuid wine) +add_delay_importlibs(appwiz msi) add_importlibs(appwiz urlmon ole32 comctl32 advapi32 shell32 user32 msvcrt kernel32 ntdll) -add_delay_importlibs(appwiz msi) add_pch(appwiz appwiz.h SOURCE) add_cd_file(TARGET appwiz DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/CMakeLists… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt [iso-8859-1] Sun Mar 27 15:14:32 2016 @@ -20,7 +20,7 @@ set_module_type(inetcpl cpl UNICODE) target_link_libraries(inetcpl wine) +add_delay_importlibs(inetcpl cryptui wininet ole32 urlmon shell32) add_importlibs(inetcpl advapi32 comctl32 user32 shlwapi msvcrt kernel32 ntdll) -add_delay_importlibs(inetcpl cryptui wininet ole32 urlmon shell32) add_pch(inetcpl inetcpl.h SOURCE) add_cd_file(TARGET inetcpl DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/C… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt [iso-8859-1] Sun Mar 27 15:14:32 2016 @@ -22,7 +22,7 @@ set_source_files_properties(devenum.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/devenum_classes.rgs) set_module_type(devenum win32dll UNICODE) target_link_libraries(devenum strmiids uuid wine) +add_delay_importlibs(devenum msvfw32) add_importlibs(devenum advapi32 advapi32_vista ole32 oleaut32 winmm user32 avicap32 msvcrt kernel32 ntdll) -add_delay_importlibs(devenum msvfw32) add_pch(devenum devenum_private.h SOURCE) add_cd_file(TARGET devenum DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] Sun Mar 27 15:14:32 2016 @@ -45,7 +45,7 @@ set_module_type(crypt32 win32dll) target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames) +add_delay_importlibs(crypt32 cryptnet) add_importlibs(crypt32 user32 advapi32 advapi32_vista msvcrt kernel32 ntdll) -add_delay_importlibs(crypt32 cryptnet) add_pch(crypt32 crypt32_private.h SOURCE) add_cd_file(TARGET crypt32 DESTINATION reactos/system32 FOR all) 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 Mar 27 15:14:32 2016 @@ -22,7 +22,7 @@ set_module_type(msgina win32dll) target_link_libraries(msgina wine) +add_delay_importlibs(msgina secur32) add_importlibs(msgina advapi32 user32 gdi32 powrprof userenv msvcrt kernel32 ntdll) -add_delay_importlibs(msgina secur32) add_pch(msgina msgina.h SOURCE) add_cd_file(TARGET msgina DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Sun Mar 27 15:14:32 2016 @@ -44,7 +44,7 @@ set_module_type(netapi32 win32dll) target_link_libraries(netapi32 wine ${PSEH_LIB}) +add_delay_importlibs(netapi32 samlib secur32) add_importlibs(netapi32 iphlpapi ws2_32 advapi32 rpcrt4 msvcrt kernel32 ntdll) -add_delay_importlibs(netapi32 samlib secur32) add_pch(netapi32 netapi32.h SOURCE) add_cd_file(TARGET netapi32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Sun Mar 27 15:14:32 2016 @@ -80,8 +80,8 @@ set_module_type(ole32 win32dll) target_link_libraries(ole32 wine uuid ${PSEH_LIB}) +add_delay_importlibs(ole32 oleaut32) add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 kernel32_vista ntdll) -add_delay_importlibs(ole32 oleaut32) add_dependencies(ole32 ole32idl) add_pch(ole32 precomp.h SOURCE) add_cd_file(TARGET ole32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/user/winsrv/consrv_new.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv_new.cmake [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv_new.cmake [iso-8859-1] Sun Mar 27 15:14:32 2016 @@ -44,7 +44,7 @@ add_library(consrv_new ${CONSRV_SOURCE}) #add_object_library(consrv_new ${CONSRV_SOURCE}) +add_delay_importlibs(consrv_new ole32) # And the default ones from winsrv add_importlibs(consrv_new psapi) # And the default ones from winsrv -add_delay_importlibs(consrv_new ole32) # And the default ones from winsrv target_link_libraries(consrv_new uuid) # And the default ones from winsrv set_module_type(consrv_new module UNICODE) Modified: trunk/rostests/apitests/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winhttp/CMakeLis… ============================================================================== --- trunk/rostests/apitests/winhttp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/winhttp/CMakeLists.txt [iso-8859-1] Sun Mar 27 15:14:32 2016 @@ -2,6 +2,6 @@ add_executable(winhttp_apitest WinHttpOpen.c testlist.c) target_link_libraries(winhttp_apitest wine) set_module_type(winhttp_apitest win32cui) +#add_delay_importlibs(winhttp_apitest winhttp) add_importlibs(winhttp_apitest msvcrt kernel32 ntdll) -#add_delay_importlibs(winhttp_apitest winhttp) add_cd_file(TARGET winhttp_apitest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/apitests/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wininet/CMakeLis… ============================================================================== --- trunk/rostests/apitests/wininet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/wininet/CMakeLists.txt [iso-8859-1] Sun Mar 27 15:14:32 2016 @@ -2,6 +2,6 @@ add_executable(wininet_apitest InternetOpen.c testlist.c) target_link_libraries(wininet_apitest wine) set_module_type(wininet_apitest win32cui) +#add_delay_importlibs(wininet_apitest wininet) add_importlibs(wininet_apitest msvcrt kernel32 ntdll) -#add_delay_importlibs(wininet_apitest wininet) add_cd_file(TARGET wininet_apitest DESTINATION reactos/bin FOR all)

8 years, 5 months

[pschweitzer] 71060: [NTFS] Fix invalid read for data shared over two sectors Patch by Trevor Thompson CORE-10998

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Mar 27 09:33:22 2016 New Revision: 71060 URL: http://svn.reactos.org/svn/reactos?rev=71060&view=rev Log: [NTFS] Fix invalid read for data shared over two sectors Patch by Trevor Thompson CORE-10998 Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] Sun Mar 27 09:33:22 2016 @@ -145,8 +145,12 @@ { RealReadOffset = ROUND_DOWN(ReadOffset, DeviceExt->NtfsInfo.BytesPerSector); RealLength = ROUND_UP(ToRead, DeviceExt->NtfsInfo.BytesPerSector); - - ReadBuffer = ExAllocatePoolWithTag(NonPagedPool, RealLength + DeviceExt->NtfsInfo.BytesPerSector, TAG_NTFS); + /* do we need to extend RealLength by one sector? */ + if (RealLength + RealReadOffset < ReadOffset + Length) + RealLength += DeviceExt->NtfsInfo.BytesPerSector; + + + ReadBuffer = ExAllocatePoolWithTag(NonPagedPool, RealLength + (DeviceExt->NtfsInfo.BytesPerSector * 2), TAG_NTFS); if (ReadBuffer == NULL) { DPRINT1("Not enough memory!\n");

8 years, 5 months

[jimtabor] 71059: [User32] - Fix crash by use of MDI container rules. - Patch by Michael Müller: Preserve beginning of extra data for MDI windows. - Patch by Jacek Caban : Ignore WM_CHILDACTIVATE o...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Mar 26 23:12:01 2016 New Revision: 71059 URL: http://svn.reactos.org/svn/reactos?rev=71059&view=rev Log: [User32] - Fix crash by use of MDI container rules. - Patch by Michael Müller: Preserve beginning of extra data for MDI windows. - Patch by Jacek Caban : Ignore WM_CHILDACTIVATE on disabled windows in DefMDIChildProc. - CORE-10912 Wine Staging 1.9.4 Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/user32/windows/mdi.c Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Mar 26 23:12:01 2016 @@ -730,6 +730,15 @@ UINT wDisableFlags; SBCALC SBCalc; } SBWND, *PSBWND; + +typedef struct _MDIWND +{ + WND wnd; + DWORD dwReserved; + PVOID pmdi; +} MDIWND, *PMDIWND; + +#define GWLP_MDIWND 4 typedef struct _MENUWND { Modified: trunk/reactos/win32ss/user/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/mdi.c [iso-8859-1] Sat Mar 26 23:12:01 2016 @@ -112,6 +112,7 @@ * states it must keep coherency with USER32 on its own. This is true for * Windows as well. */ + LONG reserved; UINT nActiveChildren; HWND hwndChildMaximized; HWND hwndActiveChild; @@ -216,7 +217,7 @@ 0, /* style */ MDIClientWndProcA, /* procA */ MDIClientWndProcW, /* procW */ - sizeof(MDICLIENTINFO), /* extra */ + sizeof(MDIWND), /* extra */ IDC_ARROW, /* cursor */ (HBRUSH)(COLOR_APPWORKSPACE+1) /* brush */ }; @@ -225,7 +226,7 @@ static MDICLIENTINFO *get_client_info( HWND client ) { #ifdef __REACTOS__ - return (MDICLIENTINFO *)GetWindowLongPtr(client, 0); + return (MDICLIENTINFO *)GetWindowLongPtr(client, GWLP_MDIWND); #else MDICLIENTINFO *ret = NULL; WND *win = WIN_GetPtr( client ); @@ -1123,7 +1124,7 @@ #ifdef __REACTOS__ if (!(ci = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ci)))) return FALSE; - SetWindowLongPtrW( hwnd, 0, (LONG_PTR)ci ); + SetWindowLongPtrW( hwnd, GWLP_MDIWND, (LONG_PTR)ci ); ci->hBmpClose = 0; NtUserSetWindowFNID( hwnd, FNID_MDICLIENT); // wine uses WIN_ISMDICLIENT #else @@ -1174,7 +1175,7 @@ HeapFree( GetProcessHeap(), 0, ci->frameTitle ); #ifdef __REACTOS__ HeapFree( GetProcessHeap(), 0, ci ); - SetWindowLongPtrW( hwnd, 0, 0 ); + SetWindowLongPtrW( hwnd, GWLP_MDIWND, 0 ); #endif return 0; } @@ -1592,7 +1593,8 @@ break; case WM_CHILDACTIVATE: - MDI_ChildActivate( client, hwnd ); + if (IsWindowEnabled( hwnd )) + MDI_ChildActivate( client, hwnd ); return 0; case WM_SYSCOMMAND:

8 years, 5 months

[jimtabor] 71058: [User32] - Patch by Piotr Caban : Select text control content while setting dialog focus. - CORE-10912 Wine Staging 1.9.4 - Added comments.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Mar 26 21:20:55 2016 New Revision: 71058 URL: http://svn.reactos.org/svn/reactos?rev=71058&view=rev Log: [User32] - Patch by Piotr Caban : Select text control content while setting dialog focus. - CORE-10912 Wine Staging 1.9.4 - Added comments. Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Sat Mar 26 21:20:55 2016 @@ -1049,7 +1049,11 @@ focus = GetNextDlgTabItem( hwnd, 0, FALSE ); if (!focus) focus = GetNextDlgGroupItem( hwnd, 0, FALSE ); if (focus) + { + if (SendMessageW( focus, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL) + SendMessageW( focus, EM_SETSEL, 0, MAXLONG ); SetFocus( focus ); + } } //// ReactOS see 43396, Fixes setting focus on Open and Close dialogs to the FileName edit control in OpenOffice. //// This now breaks test_SaveRestoreFocus. @@ -2021,7 +2025,7 @@ /* - * @implemented Modified for ReactOS. + * @implemented Modified for ReactOS. Do not Port Sync!!! */ BOOL WINAPI

8 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2016