Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 71352: Branch '/trunk' replaced from /trunk:71349
by hbelusca＠svn.reactos.org 18 May '16

18 May '16

Author: hbelusca Date: Wed May 18 15:16:54 2016 New Revision: 71352 URL: http://svn.reactos.org/svn/reactos?rev=71352&view=rev Log: Branch '/trunk' replaced from /trunk:71349 Added: trunk/ (props changed) - copied from r71349, trunk/

1 0

[rnaumann] 71351: [SHELL32] Addendum to r71343: Remove some unneeded checks. The handles are initialized as NULL so they will never be true
by rnaumann＠svn.reactos.org 18 May '16

18 May '16

Author: rnaumann Date: Wed May 18 10:12:13 2016 New Revision: 71351 URL: http://svn.reactos.org/svn/reactos?rev=71351&view=rev Log: [SHELL32] Addendum to r71343: Remove some unneeded checks. The handles are initialized as NULL so they will never be true Modified: trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp [iso-8859-1] Wed May 18 10:12:13 2016 @@ -99,11 +99,6 @@ if (lpTaskIconName) { - if (hTaskIcon) - { - DeleteObject(hTaskIcon); - } - hTaskIcon = (HICON)LoadImage(shell32_hInstance, lpTaskIconName, IMAGE_ICON, @@ -132,11 +127,6 @@ if (lpFolderIconName) { - if (hFolderIcon) - { - DeleteObject(hFolderIcon); - } - hFolderIcon = (HICON)LoadImage(shell32_hInstance, lpFolderIconName, IMAGE_ICON, @@ -165,11 +155,6 @@ if (lpClickIconName) { - if (hClickIcon) - { - DeleteObject(hClickIcon); - } - hClickIcon = (HICON)LoadImage(shell32_hInstance, lpClickIconName, IMAGE_ICON,

1 0

[rnaumann] 71350: [TASKMGR] Use the correct title string for create new task dialog. Spotted by Jared Smudde. CORE-11129
by rnaumann＠svn.reactos.org 18 May '16

18 May '16

Author: rnaumann Date: Wed May 18 08:30:45 2016 New Revision: 71350 URL: http://svn.reactos.org/svn/reactos?rev=71350&view=rev Log: [TASKMGR] Use the correct title string for create new task dialog. Spotted by Jared Smudde. CORE-11129 Modified: trunk/reactos/base/applications/taskmgr/run.c Modified: trunk/reactos/base/applications/taskmgr/run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/run.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/run.c [iso-8859-1] Wed May 18 08:30:45 2016 @@ -44,7 +44,7 @@ /* NOTE - don't check whether running on win 9x or NT, let's just assume that a unicode build only runs on NT */ - RunFileDlg(hMainWnd, hIcon, NULL, NULL, szText, RFF_CALCDIRECTORY); + RunFileDlg(hMainWnd, hIcon, NULL, szTitle, szText, RFF_CALCDIRECTORY); DeleteObject(hIcon); }

1 0

[hbelusca] 71349: [ROSAPPS/RDESKTOP]: Fix an heresy in the code.
by hbelusca＠svn.reactos.org 17 May '16

17 May '16

Author: hbelusca Date: Tue May 17 22:44:47 2016 New Revision: 71349 URL: http://svn.reactos.org/svn/reactos?rev=71349&view=rev Log: [ROSAPPS/RDESKTOP]: Fix an heresy in the code. Modified: trunk/rosapps/applications/net/tsclient/rdesktop/constants.h Modified: trunk/rosapps/applications/net/tsclient/rdesktop/constants.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/tsclient/… ============================================================================== --- trunk/rosapps/applications/net/tsclient/rdesktop/constants.h [iso-8859-1] (original) +++ trunk/rosapps/applications/net/tsclient/rdesktop/constants.h [iso-8859-1] Tue May 17 22:44:47 2016 @@ -357,6 +357,7 @@ /* NT status codes for RDPDR */ #define STATUS_SUCCESS 0x00000000 #define STATUS_NOT_IMPLEMENTED 0x00000001 +#define STATUS_TIMEOUT 0x00000102 #define STATUS_PENDING 0x00000103 #define STATUS_NO_MORE_FILES 0x80000006 @@ -374,7 +375,6 @@ #define STATUS_DISK_FULL 0xc000007f #define STATUS_FILE_IS_A_DIRECTORY 0xc00000ba #define STATUS_NOT_SUPPORTED 0xc00000bb -#define STATUS_TIMEOUT 0xc0000102 #define STATUS_NOTIFY_ENUM_DIR 0xc000010c #define STATUS_CANCELLED 0xc0000120

1 0

[ekohl] 71348: [SYSSETUP/NETSHELL] 2nd Stage Network Setup Patch by Lee Schroeder and Eric Kohl. - Move Lees 2nd stage network setup wizard code to netshell. It gets called by syssetup via NetSetup...
by ekohl＠svn.reactos.org 17 May '16

17 May '16

Author: ekohl Date: Tue May 17 22:38:58 2016 New Revision: 71348 URL: http://svn.reactos.org/svn/reactos?rev=71348&view=rev Log: [SYSSETUP/NETSHELL] 2nd Stage Network Setup Patch by Lee Schroeder and Eric Kohl. - Move Lees 2nd stage network setup wizard code to netshell. It gets called by syssetup via NetSetupRequestWizardPages(). - Add code to syssetup which calls NetSetupRequestWizardPages and inserts the retrieved wizard pages into the setup wizard. - Prevent a font handle leak by storing the bold font handle in the SetuData. CORE-10955 #resolve #comment Thanks a lot! Added: trunk/reactos/dll/shellext/netshell/res/netsetup.ico (with props) trunk/reactos/dll/shellext/netshell/setup.cpp (with props) Modified: trunk/reactos/dll/shellext/netshell/CMakeLists.txt trunk/reactos/dll/shellext/netshell/lang/bg-BG.rc trunk/reactos/dll/shellext/netshell/lang/cs-CZ.rc trunk/reactos/dll/shellext/netshell/lang/da-DK.rc trunk/reactos/dll/shellext/netshell/lang/de-DE.rc trunk/reactos/dll/shellext/netshell/lang/el-GR.rc trunk/reactos/dll/shellext/netshell/lang/en-US.rc trunk/reactos/dll/shellext/netshell/lang/es-ES.rc trunk/reactos/dll/shellext/netshell/lang/fr-FR.rc trunk/reactos/dll/shellext/netshell/lang/he-IL.rc trunk/reactos/dll/shellext/netshell/lang/hu-HU.rc trunk/reactos/dll/shellext/netshell/lang/id-ID.rc trunk/reactos/dll/shellext/netshell/lang/it-IT.rc trunk/reactos/dll/shellext/netshell/lang/ja-JP.rc trunk/reactos/dll/shellext/netshell/lang/nl-NL.rc trunk/reactos/dll/shellext/netshell/lang/no-NO.rc trunk/reactos/dll/shellext/netshell/lang/pl-PL.rc trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc trunk/reactos/dll/shellext/netshell/lang/ru-RU.rc trunk/reactos/dll/shellext/netshell/lang/sk-SK.rc trunk/reactos/dll/shellext/netshell/lang/sq-AL.rc trunk/reactos/dll/shellext/netshell/lang/sv-SE.rc trunk/reactos/dll/shellext/netshell/lang/tr-TR.rc trunk/reactos/dll/shellext/netshell/lang/uk-UA.rc trunk/reactos/dll/shellext/netshell/lang/zh-CN.rc trunk/reactos/dll/shellext/netshell/lang/zh-TW.rc trunk/reactos/dll/shellext/netshell/netshell.rc trunk/reactos/dll/shellext/netshell/netshell.spec trunk/reactos/dll/shellext/netshell/precomp.h trunk/reactos/dll/shellext/netshell/resource.h trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/wizard.c trunk/reactos/sdk/include/reactos/libs/syssetup/syssetup.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/shellext/netshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/CMak… Modified: trunk/reactos/dll/shellext/netshell/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/shellext/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/nets… Modified: trunk/reactos/dll/shellext/netshell/netshell.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/nets… Modified: trunk/reactos/dll/shellext/netshell/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/prec… Added: trunk/reactos/dll/shellext/netshell/res/netsetup.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/res/… Modified: trunk/reactos/dll/shellext/netshell/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/reso… Added: trunk/reactos/dll/shellext/netshell/setup.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/setu… Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… Modified: trunk/reactos/sdk/include/reactos/libs/syssetup/syssetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/s…

1 0

[mjansen] 71347: [PSDK] now the ICurrentWorkingDirectory interface is actually an interface.
by mjansen＠svn.reactos.org 16 May '16

16 May '16

Author: mjansen Date: Mon May 16 18:50:14 2016 New Revision: 71347 URL: http://svn.reactos.org/svn/reactos?rev=71347&view=rev Log: [PSDK] now the ICurrentWorkingDirectory interface is actually an interface. Modified: trunk/reactos/sdk/include/psdk/shlobj.h Modified: trunk/reactos/sdk/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/shlobj.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/shlobj.h [iso-8859-1] Mon May 16 18:50:14 2016 @@ -653,7 +653,7 @@ STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE; /*** ICurrentWorkingDirectory methods ***/ - STDMETHOD(GetDirectory)(THIS_ _Out_writes_(cchSize) PWSTR pwzPath, DWORD cchSize); + STDMETHOD(GetDirectory)(THIS_ _Out_writes_(cchSize) PWSTR pwzPath, DWORD cchSize) PURE; STDMETHOD(SetDirectory)(THIS_ _In_ PCWSTR pwzPath) PURE; }; #undef INTERFACE

1 0

[ekohl] 71346: [NETAPI32] Add NetGetAnyDCName stub. CORE-11261 #comment Please test again!
by ekohl＠svn.reactos.org 16 May '16

16 May '16

Author: ekohl Date: Mon May 16 18:34:52 2016 New Revision: 71346 URL: http://svn.reactos.org/svn/reactos?rev=71346&view=rev Log: [NETAPI32] Add NetGetAnyDCName stub. CORE-11261 #comment Please test again! Modified: trunk/reactos/dll/win32/netapi32/access.c trunk/reactos/dll/win32/netapi32/netapi32.spec Modified: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] Mon May 16 18:34:52 2016 @@ -262,6 +262,22 @@ } /************************************************************ + * NetGetAnyDCName (NETAPI32.@) + * + * Return the name of any domain controller (DC) + */ +NET_API_STATUS WINAPI +NetGetAnyDCName( + _In_ LPCWSTR servername, + _In_ LPCWSTR domainname, + _Out_ LPBYTE *bufptr) +{ + FIXME("NetGetAnyDCName(%s, %s, %p) stub!\n", debugstr_w(servername), + debugstr_w(domainname), bufptr); + return ERROR_NO_LOGON_SERVERS; +} + +/************************************************************ * NetEnumerateTrustedDomains (NETAPI32.@) * * On success, *DomainNames is a multi-sz allocated using NetApiBufferAllocate Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Mon May 16 18:34:52 2016 @@ -147,7 +147,7 @@ @ stub NetFileClose @ stdcall NetFileEnum(wstr wstr wstr long ptr long ptr ptr ptr) @ stub NetFileGetInfo -@ stub NetGetAnyDCName +@ stdcall NetGetAnyDCName(wstr wstr ptr) @ stdcall NetGetDCName(wstr wstr ptr) @ stub NetGetDisplayInformationIndex @ stdcall NetGetJoinInformation(wstr ptr ptr)

1 0

[mjansen] 71345: [BROWSEUI_APITEST] Add tests for ACListISF, a class used for autocompletion. CORE-9281 - Add tests for ACListISF. - Change the SHExplorerParseCmdLine test to use GetProcAddress ins...
by mjansen＠svn.reactos.org 16 May '16

16 May '16

Author: mjansen Date: Mon May 16 18:03:09 2016 New Revision: 71345 URL: http://svn.reactos.org/svn/reactos?rev=71345&view=rev Log: [BROWSEUI_APITEST] Add tests for ACListISF, a class used for autocompletion. CORE-9281 - Add tests for ACListISF. - Change the SHExplorerParseCmdLine test to use GetProcAddress instead of relying on the import (it's not there anymore in NT 6.0+) Added: trunk/rostests/apitests/browseui/ACListISF.cpp (with props) Modified: trunk/rostests/apitests/browseui/CMakeLists.txt trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c trunk/rostests/apitests/browseui/testlist.c Added: trunk/rostests/apitests/browseui/ACListISF.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/browseui/ACListI… ============================================================================== --- trunk/rostests/apitests/browseui/ACListISF.cpp (added) +++ trunk/rostests/apitests/browseui/ACListISF.cpp [iso-8859-1] Mon May 16 18:03:09 2016 @@ -0,0 +1,472 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for ACListISF objects + * PROGRAMMER: Mark Jansen + */ + +#define _UNICODE +#define UNICODE +#include <apitest.h> +#include <shlobj.h> +#include <atlbase.h> +#include <tchar.h> // +#include <atlcom.h> // These 3 includes only exist here to make gcc happy about (unused) templates.. +#include <atlwin.h> // + +// Yes, gcc at it again, let's validate everything found inside unused templates! +ULONG DbgPrint(PCH Format,...); + +#include <shellutils.h> +#include <shlwapi.h> +#include <strsafe.h> + +static bool g_ShowHidden; +static DWORD g_WinVersion; +#define WINVER_VISTA 0x0600 + + +#define ok_hr(status, expected) ok_hex(status, expected) + +// We do not want our results to originate from the helper functions, so have them originate from the calls to them +#define test_at_end (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_at_end_imp +#define test_ExpectDrives (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_ExpectDrives_imp +#define test_ExpectFolders (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : test_ExpectFolders_imp +#define winetest_ok_hr(expression, expected) \ + do { \ + int _value = (expression); \ + winetest_ok(_value == (expected), "Wrong value for '%s', expected: " #expected " (0x%x), got: 0x%x\n", \ + #expression, (int)(expected), _value); \ + } while (0) + + + + +static void test_at_end_imp(CComPtr<IEnumString>& EnumStr) +{ + CComHeapPtr<OLECHAR> Result; + ULONG Fetched = 12345; + HRESULT hr = EnumStr->Next(1, &Result, &Fetched); + winetest_ok(hr == S_FALSE, "Expected hr to be S_FALSE, was 0x%lx\n", hr); + winetest_ok(Fetched == 0u, "Expected Fetched to be 0, was: %lu\n", Fetched); + if (Fetched == 1u) + winetest_ok(0, "Expected there not to be a result, got: %s\n", wine_dbgstr_w(Result)); +} + +static bool GetDisplayname(CComPtr<IShellFolder>& spDrives, CComHeapPtr<ITEMIDLIST>& pidl, CComHeapPtr<WCHAR>& DisplayName) +{ + STRRET StrRet; + HRESULT hr; + winetest_ok_hr(hr = spDrives->GetDisplayNameOf(pidl, SHGDN_INFOLDER | SHGDN_FORPARSING | SHGDN_FORADDRESSBAR, &StrRet), S_OK); + if (!SUCCEEDED(hr)) + return false; + + winetest_ok_hr(hr = StrRetToStrW(&StrRet, NULL, &DisplayName), S_OK); + if (!SUCCEEDED(hr)) + return false; + return true; +} + +enum ExpectOptions +{ + None = 0, + IgnoreRoot = 1, + CheckLast = 2, + IgnoreHidden = 4, + IgnoreFiles = 8, +}; + +// wtf c++ +ExpectOptions operator | (const ExpectOptions& left, const ExpectOptions& right) +{ + return static_cast<ExpectOptions>(static_cast<int>(left) | static_cast<int>(right)); +} + + +static void +test_ExpectFolders_imp(CComPtr<IEnumString>& EnumStr, LPITEMIDLIST pidlTarget, const WCHAR* Root, ExpectOptions options) +{ + CComPtr<IShellFolder> spDesktop; + HRESULT hr = SHGetDesktopFolder(&spDesktop); + + CComPtr<IShellFolder> spTarget; + if (pidlTarget) + { + winetest_ok_hr(hr = spDesktop->BindToObject(pidlTarget, NULL, IID_PPV_ARG(IShellFolder, &spTarget)), S_OK); + if (!SUCCEEDED(hr)) + return; + } + else + { + spTarget = spDesktop; + } + + SHCONTF EnumFlags = SHCONTF_FOLDERS | SHCONTF_INIT_ON_FIRST_NEXT; + if (g_ShowHidden && !(options & IgnoreHidden)) + EnumFlags |= SHCONTF_INCLUDEHIDDEN; + if (!(options & IgnoreFiles)) + EnumFlags |= SHCONTF_NONFOLDERS; + + CComPtr<IEnumIDList> spEnumIDList; + winetest_ok_hr(hr = spTarget->EnumObjects(NULL, EnumFlags, &spEnumIDList), S_OK); + if (!SUCCEEDED(hr)) + return; + + WCHAR Buffer[512]; + CComHeapPtr<ITEMIDLIST> pidl; + INT Count = 0; + while (spEnumIDList->Next(1, &pidl, NULL) == S_OK) + { + CComHeapPtr<WCHAR> DisplayName; + if (!GetDisplayname(spTarget, pidl, DisplayName)) + break; + + CComHeapPtr<OLECHAR> Result; + ULONG Fetched; + hr = EnumStr->Next(1, &Result, &Fetched); + winetest_ok_hr(hr, S_OK); + + + if (hr != S_OK) + break; + + + StringCchPrintfW(Buffer, _ARRAYSIZE(Buffer), L"%s%s", (options & IgnoreRoot) ? L"" : Root, (WCHAR*)DisplayName); + + winetest_ok(!wcscmp(Buffer, Result), "Expected %s, got %s\n", wine_dbgstr_w(Buffer), wine_dbgstr_w(Result)); + + pidl.Free(); + Count++; + } + if (options & CheckLast) + { + test_at_end_imp(EnumStr); + } +} + +static void +test_ExpectDrives_imp(CComPtr<IEnumString>& EnumStr, CComHeapPtr<ITEMIDLIST>& pidlTarget) +{ + test_ExpectFolders_imp(EnumStr, pidlTarget, NULL, IgnoreRoot | CheckLast); +} + +static void +test_ACListISF_NONE() +{ + CComPtr<IEnumString> EnumStr; + HRESULT hr = CoCreateInstance(CLSID_ACListISF, NULL, CLSCTX_ALL, IID_PPV_ARG(IEnumString, &EnumStr)); + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + CComPtr<IACList2> ACList; + ok_hr(hr = EnumStr->QueryInterface(IID_IACList2, (void**)&ACList), S_OK); + if (!SUCCEEDED(hr)) + return; + + ok_hr(hr = ACList->SetOptions(ACLO_NONE), S_OK); + test_at_end(EnumStr); + + + WCHAR Buffer[MAX_PATH]; + GetSystemWindowsDirectoryW(Buffer, _ARRAYSIZE(Buffer)); + Buffer[3] = '\0'; + + CComHeapPtr<ITEMIDLIST> pidlDiskRoot; + ok_hr(hr = SHParseDisplayName(Buffer, NULL, &pidlDiskRoot, NULL, NULL), S_OK); + if (!SUCCEEDED(hr)) + return; + + ok_hr(hr = ACList->Expand(Buffer), S_OK); + test_ExpectFolders(EnumStr, pidlDiskRoot, Buffer, CheckLast | IgnoreHidden); + + ok_hr(hr = EnumStr->Reset(), S_OK); + ok_hr(hr = ACList->Expand(Buffer), S_OK); + ok_hr(hr = ACList->SetOptions(ACLO_NONE), S_OK); + test_ExpectFolders(EnumStr, pidlDiskRoot, Buffer, CheckLast); +} + +static void +test_ACListISF_CURRENTDIR() +{ + CComPtr<IEnumString> EnumStr; + HRESULT hr = CoCreateInstance(CLSID_ACListISF, NULL, CLSCTX_ALL, IID_PPV_ARG(IEnumString, &EnumStr)); + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + CComPtr<IACList2> ACList; + ok_hr(hr = EnumStr->QueryInterface(IID_IACList2, (void**)&ACList), S_OK); + if (!SUCCEEDED(hr)) + return; + + CComPtr<ICurrentWorkingDirectory> CurrentWorkingDir; + ok_hr(hr = EnumStr->QueryInterface(IID_ICurrentWorkingDirectory, (void**)&CurrentWorkingDir), S_OK); + if (!SUCCEEDED(hr)) + return; + + ok_hr(hr = ACList->SetOptions(ACLO_CURRENTDIR), S_OK); + test_at_end(EnumStr); + + + WCHAR Buffer[MAX_PATH] = { 1, 1, 1, 1, 1, 0 }, Buffer2[MAX_PATH]; + if (g_WinVersion < WINVER_VISTA) + ok_hr(hr = CurrentWorkingDir->GetDirectory(Buffer, _ARRAYSIZE(Buffer)), E_NOTIMPL); + else + ok_hr(hr = CurrentWorkingDir->GetDirectory(Buffer, _ARRAYSIZE(Buffer)), E_UNEXPECTED); + ok(!wcscmp(L"\x1\x1\x1\x1\x1", Buffer), "Expected %s, got %s\n", wine_dbgstr_w(L"\x1\x1\x1\x1\x1"), wine_dbgstr_w(Buffer)); + + GetSystemWindowsDirectoryW(Buffer2, _ARRAYSIZE(Buffer2)); + // Windows 2k3 does not parse it without the trailing '\\' + Buffer2[3] = '\0'; + CComHeapPtr<ITEMIDLIST> pidlDiskRoot; + ok_hr(hr = SHParseDisplayName(Buffer2, NULL, &pidlDiskRoot, NULL, NULL), S_OK); + if (!SUCCEEDED(hr)) + return; + + ok_hr(hr = CurrentWorkingDir->SetDirectory(Buffer2), S_OK); + test_at_end(EnumStr); + + Buffer[0] = '\0'; + if (g_WinVersion < WINVER_VISTA) + { + ok_hr(hr = CurrentWorkingDir->GetDirectory(Buffer, _ARRAYSIZE(Buffer)), E_NOTIMPL); + } + else + { + ok_hr(hr = CurrentWorkingDir->GetDirectory(Buffer, _ARRAYSIZE(Buffer)), S_OK); + ok(!wcscmp(Buffer2, Buffer), "Expected %s, got %s\n", wine_dbgstr_w(Buffer2), wine_dbgstr_w(Buffer)); + } + + Buffer2[2] = '\0'; + ok_hr(hr = CurrentWorkingDir->SetDirectory(Buffer2), S_OK); + test_at_end(EnumStr); + + Buffer[0] = '\0'; + Buffer2[2] = '\\'; + if (g_WinVersion < WINVER_VISTA) + { + ok_hr(hr = CurrentWorkingDir->GetDirectory(Buffer, _ARRAYSIZE(Buffer)), E_NOTIMPL); + } + else + { + ok_hr(hr = CurrentWorkingDir->GetDirectory(Buffer, _ARRAYSIZE(Buffer)), S_OK); + ok(!wcscmp(Buffer2, Buffer), "Expected %s, got %s\n", wine_dbgstr_w(Buffer2), wine_dbgstr_w(Buffer)); + } + + ok_hr(hr = ACList->Expand(Buffer2), S_OK); + // The first set of results are absolute paths, without hidden files?! + test_ExpectFolders(EnumStr, pidlDiskRoot, Buffer2, IgnoreHidden); + test_ExpectFolders(EnumStr, pidlDiskRoot, Buffer2, IgnoreHidden | IgnoreRoot | CheckLast); +} + +static void +test_ACListISF_MYCOMPUTER() +{ + CComPtr<IACList2> ACList; + HRESULT hr = CoCreateInstance(CLSID_ACListISF, NULL, CLSCTX_ALL, IID_PPV_ARG(IACList2, &ACList)); + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + // Check the default + DWORD CurrentOption = 0xdeadbeef; + ok_hr(ACList->GetOptions(&CurrentOption), S_OK); + ok(CurrentOption == (ACLO_CURRENTDIR|ACLO_MYCOMPUTER), "Expected the default to be %x, was %lx\n", + (ACLO_CURRENTDIR|ACLO_MYCOMPUTER), CurrentOption); + + + CComPtr<IEnumString> EnumStr; + ok_hr(hr = ACList->QueryInterface(IID_IEnumString, (void**)&EnumStr), S_OK); + if (!SUCCEEDED(hr)) + return; + + CComPtr<IPersistFolder> PersistFolder; + ok_hr(hr = EnumStr->QueryInterface(IID_IPersistFolder, (void**)&PersistFolder), S_OK); + if (!SUCCEEDED(hr)) + return; + + CComHeapPtr<ITEMIDLIST> pidlMyComputer; + ok_hr(hr = SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlMyComputer), S_OK); + if (!SUCCEEDED(hr)) + return; + + + hr = EnumStr->Reset(); + if (g_WinVersion < WINVER_VISTA) + ok_hr(hr, S_FALSE); + else + ok_hr(hr, S_OK); + test_ExpectDrives(EnumStr, pidlMyComputer); + + ok_hr(hr = ACList->SetOptions(ACLO_MYCOMPUTER), S_OK); + ok_hr(EnumStr->Reset(), S_OK); + test_ExpectDrives(EnumStr, pidlMyComputer); + + WCHAR Buffer[MAX_PATH]; + GetSystemWindowsDirectoryW(Buffer, _ARRAYSIZE(Buffer)); + // Windows 2k3 does not parse it without the trailing '\\' + Buffer[3] = '\0'; + CComHeapPtr<ITEMIDLIST> pidlDiskRoot; + ok_hr(hr = SHParseDisplayName(Buffer, NULL, &pidlDiskRoot, NULL, NULL), S_OK); + if (!SUCCEEDED(hr)) + return; + Buffer[2] = '\0'; + + ok_hr(hr = ACList->Expand(Buffer), S_OK); + test_ExpectFolders(EnumStr, pidlDiskRoot, Buffer, None); + test_ExpectDrives(EnumStr, pidlMyComputer); + + ok_hr(hr = ACList->Expand(Buffer), S_OK); + ok_hr(EnumStr->Reset(), S_OK); + // Pre vista does not remove the expanded data from the enumeration, it changes it to relative paths??? + if (g_WinVersion < WINVER_VISTA) + test_ExpectFolders(EnumStr, pidlDiskRoot, Buffer, IgnoreRoot); + test_ExpectDrives(EnumStr, pidlMyComputer); + + ok_hr(EnumStr->Reset(), S_OK); + ok_hr(hr = ACList->Expand(Buffer), S_OK); + test_ExpectFolders(EnumStr, pidlDiskRoot, Buffer, None); + test_ExpectDrives(EnumStr, pidlMyComputer); +} + +static void +test_ACListISF_DESKTOP() +{ + CComPtr<IEnumString> EnumStr; + HRESULT hr = CoCreateInstance(CLSID_ACListISF, NULL, CLSCTX_ALL, IID_PPV_ARG(IEnumString, &EnumStr)); + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + CComPtr<IACList2> ACList; + ok_hr(hr = EnumStr->QueryInterface(IID_IACList2, (void**)&ACList), S_OK); + if (!SUCCEEDED(hr)) + return; + + ok_hr(hr = ACList->SetOptions(ACLO_DESKTOP), S_OK); + test_ExpectFolders(EnumStr, NULL, NULL, IgnoreRoot | CheckLast | IgnoreHidden); +} + +static void +test_ACListISF_FAVORITES() +{ + CComPtr<IEnumString> EnumStr; + HRESULT hr = CoCreateInstance(CLSID_ACListISF, NULL, CLSCTX_ALL, IID_PPV_ARG(IEnumString, &EnumStr)); + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + CComPtr<IACList2> ACList; + ok_hr(hr = EnumStr->QueryInterface(IID_IACList2, (void**)&ACList), S_OK); + if (!SUCCEEDED(hr)) + return; + + CComHeapPtr<ITEMIDLIST> pidlFavorites; + ok_hr(hr = SHGetSpecialFolderLocation(NULL, CSIDL_FAVORITES, &pidlFavorites), S_OK); + if (!SUCCEEDED(hr)) + return; + + ok_hr(hr = ACList->SetOptions(ACLO_FAVORITES), S_OK); + test_ExpectFolders(EnumStr, pidlFavorites, NULL, IgnoreRoot | CheckLast | IgnoreHidden); +} + +static void +test_ACListISF_FILESYSONLY() +{ + CComPtr<IEnumString> EnumStr; + HRESULT hr = CoCreateInstance(CLSID_ACListISF, NULL, CLSCTX_ALL, IID_PPV_ARG(IEnumString, &EnumStr)); + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + CComPtr<IACList2> ACList; + ok_hr(hr = EnumStr->QueryInterface(IID_IACList2, (void**)&ACList), S_OK); + if (!SUCCEEDED(hr)) + return; + + WCHAR Buffer[MAX_PATH]; + GetSystemWindowsDirectoryW(Buffer, _ARRAYSIZE(Buffer)); + // Windows 2k3 does not parse it without the trailing '\\' + Buffer[3] = '\0'; + CComHeapPtr<ITEMIDLIST> pidlDiskRoot; + ok_hr(hr = SHParseDisplayName(Buffer, NULL, &pidlDiskRoot, NULL, NULL), S_OK); + if (!SUCCEEDED(hr)) + return; + + ok_hr(hr = ACList->SetOptions(ACLO_FILESYSONLY), S_OK); + test_at_end(EnumStr); + + ok_hr(hr = ACList->Expand(Buffer), S_OK); + test_ExpectFolders(EnumStr, pidlDiskRoot, Buffer, CheckLast | IgnoreHidden); +} + +static void +test_ACListISF_FILESYSDIRS() +{ + CComPtr<IEnumString> EnumStr; + HRESULT hr = CoCreateInstance(CLSID_ACListISF, NULL, CLSCTX_ALL, IID_PPV_ARG(IEnumString, &EnumStr)); + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + CComPtr<IACList2> ACList; + ok_hr(hr = EnumStr->QueryInterface(IID_IACList2, (void**)&ACList), S_OK); + if (!SUCCEEDED(hr)) + return; + + WCHAR Buffer[MAX_PATH]; + GetSystemWindowsDirectoryW(Buffer, _ARRAYSIZE(Buffer)); + // Windows 2k3 does not parse it without the trailing '\\' + Buffer[3] = '\0'; + CComHeapPtr<ITEMIDLIST> pidlDiskRoot; + ok_hr(hr = SHParseDisplayName(Buffer, NULL, &pidlDiskRoot, NULL, NULL), S_OK); + if (!SUCCEEDED(hr)) + return; + + ok_hr(hr = ACList->SetOptions(ACLO_FILESYSDIRS), S_OK); + test_at_end(EnumStr); + + ok_hr(hr = ACList->Expand(Buffer), S_OK); + test_ExpectFolders(EnumStr, pidlDiskRoot, Buffer, CheckLast | IgnoreFiles | IgnoreHidden); +} + +static void GetEnvStatus() +{ + RTL_OSVERSIONINFOEXW rtlinfo = {0}; + void (__stdcall* pRtlGetVersion)(RTL_OSVERSIONINFOEXW*); + pRtlGetVersion = (void (__stdcall*)(RTL_OSVERSIONINFOEXW*))GetProcAddress(GetModuleHandleA("ntdll"), "RtlGetVersion"); + + rtlinfo.dwOSVersionInfoSize = sizeof(rtlinfo); + pRtlGetVersion(&rtlinfo); + g_WinVersion = (rtlinfo.dwMajorVersion << 8) | rtlinfo.dwMinorVersion; + + SHELLFLAGSTATE sfs = {0}; + SHGetSettings(&sfs, SSF_SHOWALLOBJECTS); + g_ShowHidden = !!sfs.fShowAllObjects; + trace("Show hidden folders: %s\n", g_ShowHidden ? "yes" : "no"); +} + +struct CCoInit +{ + CCoInit() { hres = CoInitialize(NULL); } + ~CCoInit() { if (SUCCEEDED(hres)) { CoUninitialize(); } } + HRESULT hres; +}; + +START_TEST(ACListISF) +{ + GetEnvStatus(); + CCoInit init; + ok_hr(init.hres, S_OK); + if (!SUCCEEDED(init.hres)) + return; + + test_ACListISF_NONE(); + test_ACListISF_CURRENTDIR(); + test_ACListISF_MYCOMPUTER(); + test_ACListISF_DESKTOP(); + test_ACListISF_FAVORITES(); + test_ACListISF_FILESYSONLY(); + test_ACListISF_FILESYSDIRS(); +} Propchange: trunk/rostests/apitests/browseui/ACListISF.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/browseui/CMakeLi… ============================================================================== --- trunk/rostests/apitests/browseui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/browseui/CMakeLists.txt [iso-8859-1] Mon May 16 18:03:09 2016 @@ -1,10 +1,21 @@ + +set_cpp(WITH_RTTI WITH_RUNTIME WITH_EXCEPTIONS) +if(NOT MSVC) + # HACK: this should be enabled globally! + add_compile_flags_language("-std=c++11" "CXX") +endif() + +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/lib/atl + includes) list(APPEND SOURCE + ACListISF.cpp SHExplorerParseCmdLine.c testlist.c) add_executable(browseui_apitest ${SOURCE}) -target_link_libraries(browseui_apitest wine) +target_link_libraries(browseui_apitest uuid wine) set_module_type(browseui_apitest win32cui) -add_importlibs(browseui_apitest browseui shell32 msvcrt kernel32 ntdll) +add_importlibs(browseui_apitest shell32 ole32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET browseui_apitest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/browseui/SHExplo… ============================================================================== --- trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c [iso-8859-1] Mon May 16 18:03:09 2016 @@ -35,10 +35,7 @@ ULONG Padding[PADDING_SIZE]; } EXPLORER_INFO, *PEXPLORER_INFO; -UINT -WINAPI -SHExplorerParseCmdLine( -_Out_ PEXPLORER_INFO Info); +UINT (WINAPI *SHExplorerParseCmdLine)(_Out_ PEXPLORER_INFO Info); #define PIDL_IS_UNTOUCHED -1 #define PIDL_IS_NULL -2 @@ -346,6 +343,14 @@ UINT maxWrite = 0; FILE * ff; + HMODULE browseui = LoadLibraryA("browseui.dll"); + SHExplorerParseCmdLine = (UINT (__stdcall *)(PEXPLORER_INFO))GetProcAddress(browseui, MAKEINTRESOURCEA(107)); + if (!SHExplorerParseCmdLine) + { + skip("SHExplorerParseCmdLine not found, NT 6.0?\n"); + return; + } + CommandLine = GetCommandLineW(); StringCbCopyW(OriginalCommandLine, sizeof(OriginalCommandLine), CommandLine); Modified: trunk/rostests/apitests/browseui/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/browseui/testlis… ============================================================================== --- trunk/rostests/apitests/browseui/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/browseui/testlist.c [iso-8859-1] Mon May 16 18:03:09 2016 @@ -3,10 +3,12 @@ #define STANDALONE #include <apitest.h> +extern void func_ACListISF(void); extern void func_SHExplorerParseCmdLine(void); const struct test winetest_testlist[] = { + { "ACListISF", func_ACListISF }, { "SHExplorerParseCmdLine", func_SHExplorerParseCmdLine }, { 0, 0 }

1 0

[mjansen] 71344: [PSDK] Add missing definitions for IACList2 Options. CORE-9281
by mjansen＠svn.reactos.org 16 May '16

16 May '16

Author: mjansen Date: Mon May 16 17:59:10 2016 New Revision: 71344 URL: http://svn.reactos.org/svn/reactos?rev=71344&view=rev Log: [PSDK] Add missing definitions for IACList2 Options. CORE-9281 Modified: trunk/reactos/sdk/include/psdk/shlobj.h Modified: trunk/reactos/sdk/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/shlobj.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/shlobj.h [iso-8859-1] Mon May 16 17:59:10 2016 @@ -691,6 +691,15 @@ #endif /* IACList2 interface */ + +#define ACLO_NONE 0x00000000 +#define ACLO_CURRENTDIR 0x00000001 +#define ACLO_MYCOMPUTER 0x00000002 +#define ACLO_DESKTOP 0x00000004 +#define ACLO_FAVORITES 0x00000008 +#define ACLO_FILESYSONLY 0x00000010 +#define ACLO_FILESYSDIRS 0x00000020 + #define INTERFACE IACList2 DECLARE_INTERFACE_(IACList2,IACList) {

1 0

[rnaumann] 71343: [SHELL32] - Implement a skeleton DlgProc for the folder options general dialog - show icons depending on button states in folder options general dialog
by rnaumann＠svn.reactos.org 16 May '16

16 May '16

Author: rnaumann Date: Mon May 16 11:58:31 2016 New Revision: 71343 URL: http://svn.reactos.org/svn/reactos?rev=71343&view=rev Log: [SHELL32] - Implement a skeleton DlgProc for the folder options general dialog - show icons depending on button states in folder options general dialog Modified: trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp [iso-8859-1] Mon May 16 11:58:31 2016 @@ -84,6 +84,123 @@ EXTERN_C HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, IDataObject *pDataObj); +static VOID +UpdateGeneralIcons(HWND hDlg) +{ + HWND hwndTaskIcon, hwndFolderIcon, hwndClickIcon; + HICON hTaskIcon = NULL, hFolderIcon = NULL, hClickIcon = NULL; + LPTSTR lpTaskIconName = NULL, lpFolderIconName = NULL, lpClickIconName = NULL; + + // show task setting icon + if(IsDlgButtonChecked(hDlg, IDC_FOLDER_OPTIONS_COMMONTASKS) == BST_CHECKED) + lpTaskIconName = MAKEINTRESOURCE(IDI_SHELL_SHOW_COMMON_TASKS); + else if(IsDlgButtonChecked(hDlg, IDC_FOLDER_OPTIONS_CLASSICFOLDERS) == BST_CHECKED) + lpTaskIconName = MAKEINTRESOURCE(IDI_SHELL_CLASSIC_FOLDERS); + + if (lpTaskIconName) + { + if (hTaskIcon) + { + DeleteObject(hTaskIcon); + } + + hTaskIcon = (HICON)LoadImage(shell32_hInstance, + lpTaskIconName, + IMAGE_ICON, + 0, + 0, + LR_DEFAULTCOLOR); + if (hTaskIcon) + { + hwndTaskIcon = GetDlgItem(hDlg, + IDC_FOLDER_OPTIONS_TASKICON); + if (hwndTaskIcon) + { + SendMessage(hwndTaskIcon, + STM_SETIMAGE, + IMAGE_ICON, + (LPARAM)hTaskIcon); + } + } + } + + // show Folder setting icons + if(IsDlgButtonChecked(hDlg, IDC_FOLDER_OPTIONS_SAMEWINDOW) == BST_CHECKED) + lpFolderIconName = MAKEINTRESOURCE(IDI_SHELL_OPEN_IN_SOME_WINDOW); + else if(IsDlgButtonChecked(hDlg, IDC_FOLDER_OPTIONS_OWNWINDOW) == BST_CHECKED) + lpFolderIconName = MAKEINTRESOURCE(IDI_SHELL_OPEN_IN_NEW_WINDOW); + + if (lpFolderIconName) + { + if (hFolderIcon) + { + DeleteObject(hFolderIcon); + } + + hFolderIcon = (HICON)LoadImage(shell32_hInstance, + lpFolderIconName, + IMAGE_ICON, + 0, + 0, + LR_DEFAULTCOLOR); + if (hFolderIcon) + { + hwndFolderIcon = GetDlgItem(hDlg, + IDC_FOLDER_OPTIONS_FOLDERICON); + if (hwndFolderIcon) + { + SendMessage(hwndFolderIcon, + STM_SETIMAGE, + IMAGE_ICON, + (LPARAM)hFolderIcon); + } + } + } + + // Show click setting icon + if(IsDlgButtonChecked(hDlg, IDC_FOLDER_OPTIONS_SINGLECLICK) == BST_CHECKED) + lpClickIconName = MAKEINTRESOURCE(IDI_SHELL_SINGLE_CLICK_TO_OPEN); + else if(IsDlgButtonChecked(hDlg, IDC_FOLDER_OPTIONS_DOUBLECLICK) == BST_CHECKED) + lpClickIconName = MAKEINTRESOURCE(IDI_SHELL_DOUBLE_CLICK_TO_OPEN); + + if (lpClickIconName) + { + if (hClickIcon) + { + DeleteObject(hClickIcon); + } + + hClickIcon = (HICON)LoadImage(shell32_hInstance, + lpClickIconName, + IMAGE_ICON, + 0, + 0, + LR_DEFAULTCOLOR); + if (hClickIcon) + { + hwndClickIcon = GetDlgItem(hDlg, + IDC_FOLDER_OPTIONS_CLICKICON); + if (hwndClickIcon) + { + SendMessage(hwndClickIcon, + STM_SETIMAGE, + IMAGE_ICON, + (LPARAM)hClickIcon); + } + } + } + + // Clean up + if(hTaskIcon) + DeleteObject(hTaskIcon); + if(hFolderIcon) + DeleteObject(hFolderIcon); + if(hClickIcon) + DeleteObject(hClickIcon); + + return; +} + INT_PTR CALLBACK FolderOptionsGeneralDlg( @@ -93,6 +210,53 @@ LPARAM lParam ) { + switch(uMsg) + { + case WM_INITDIALOG: + // FIXME + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_FOLDER_OPTIONS_COMMONTASKS: + case IDC_FOLDER_OPTIONS_CLASSICFOLDERS: + case IDC_FOLDER_OPTIONS_SAMEWINDOW: + case IDC_FOLDER_OPTIONS_OWNWINDOW: + case IDC_FOLDER_OPTIONS_SINGLECLICK: + case IDC_FOLDER_OPTIONS_DOUBLECLICK: + if (HIWORD(wParam) == BN_CLICKED) + { + UpdateGeneralIcons(hwndDlg); + + /* Enable the 'Apply' button */ + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + break; + + case WM_NOTIFY: + { + LPNMHDR pnmh = (LPNMHDR)lParam; + + switch (pnmh->code) + { + case PSN_SETACTIVE: + break; + + case PSN_APPLY: + break; + } + break; + } + + case WM_DESTROY: + break; + + default: + return FALSE; + } return FALSE; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs