[ros-diffs] [mjansen] 71347: [PSDK] now the ICurrentWorkingDirectory interface is actually an interface.
Author: mjansen Date: Mon May 16 18:50:14 2016 New Revision: 71347 URL: http://svn.reactos.org/svn/reactos?rev=71347=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?rev=71347=71346=71347=diff == --- 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
[ros-diffs] [ekohl] 71346: [NETAPI32] Add NetGetAnyDCName stub. CORE-11261 #comment Please test again!
Author: ekohl
Date: Mon May 16 18:34:52 2016
New Revision: 71346
URL: http://svn.reactos.org/svn/reactos?rev=71346=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.c?rev=71346=71345=71346=diff
==
--- 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/netapi32.spec?rev=71346=71345=71346=diff
==
--- 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)
[ros-diffs] [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 GetProcAd
Author: mjansen
Date: Mon May 16 18:03:09 2016
New Revision: 71345
URL: http://svn.reactos.org/svn/reactos?rev=71345=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/ACListISF.cpp?rev=71345
==
--- 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
+#include
+#include
+#include //
+#include // These 3 includes only exist here to make gcc happy
about (unused) templates..
+#include //
+
+// Yes, gcc at it again, let's validate everything found inside unused
templates!
+ULONG DbgPrint(PCH Format,...);
+
+#include
+#include
+#include
+
+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& EnumStr)
+{
+CComHeapPtr Result;
+ULONG Fetched = 12345;
+HRESULT hr = EnumStr->Next(1, , );
+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& spDrives,
CComHeapPtr& pidl, CComHeapPtr& DisplayName)
+{
+STRRET StrRet;
+HRESULT hr;
+winetest_ok_hr(hr = spDrives->GetDisplayNameOf(pidl, SHGDN_INFOLDER |
SHGDN_FORPARSING | SHGDN_FORADDRESSBAR, ), S_OK);
+if (!SUCCEEDED(hr))
+return false;
+
+winetest_ok_hr(hr = StrRetToStrW(, NULL, ), 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(static_cast(left) |
static_cast(right));
+}
+
+
+static void
+test_ExpectFolders_imp(CComPtr& EnumStr, LPITEMIDLIST pidlTarget,
const WCHAR* Root, ExpectOptions options)
+{
+CComPtr spDesktop;
+HRESULT hr = SHGetDesktopFolder();
+
+CComPtr spTarget;
+if (pidlTarget)
+{
+winetest_ok_hr(hr = spDesktop->BindToObject(pidlTarget, NULL,
IID_PPV_ARG(IShellFolder, )), 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 spEnumIDList;
+winetest_ok_hr(hr = spTarget->EnumObjects(NULL, EnumFlags, ),
S_OK);
+if (!SUCCEEDED(hr))
+return;
+
+WCHAR Buffer[512];
+CComHeapPtr pidl;
+INT Count = 0;
+while (spEnumIDList->Next(1, , NULL) == S_OK)
+{
+CComHeapPtr DisplayName;
+if (!GetDisplayname(spTarget, pidl, DisplayName))
+break;
+
+CComHeapPtr Result;
+ULONG Fetched;
+hr = EnumStr->Next(1, , );
+winetest_ok_hr(hr, S_OK);
+
+
+if (hr != S_OK)
+break;
+
+
+StringCchPrintfW(Buffer,
[ros-diffs] [mjansen] 71344: [PSDK] Add missing definitions for IACList2 Options. CORE-9281
Author: mjansen
Date: Mon May 16 17:59:10 2016
New Revision: 71344
URL: http://svn.reactos.org/svn/reactos?rev=71344=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?rev=71344=71343=71344=diff
==
--- 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 0x
+#define ACLO_CURRENTDIR 0x0001
+#define ACLO_MYCOMPUTER 0x0002
+#define ACLO_DESKTOP0x0004
+#define ACLO_FAVORITES 0x0008
+#define ACLO_FILESYSONLY0x0010
+#define ACLO_FILESYSDIRS0x0020
+
#define INTERFACE IACList2
DECLARE_INTERFACE_(IACList2,IACList)
{
[ros-diffs] [rnaumann] 71343: [SHELL32] - Implement a skeleton DlgProc for the folder options general dialog - show icons depending on button states in folder options general dialog
Author: rnaumann
Date: Mon May 16 11:58:31 2016
New Revision: 71343
URL: http://svn.reactos.org/svn/reactos?rev=71343=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/folder_options.cpp?rev=71343=71342=71343=diff
==
--- 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)
+
[ros-diffs] [dreimer] 71342: [BOOTDATA] Fix autorun.inf on LiveCD and HybridCD linking to a non existent welcome.exe. HybridCD now links to the correct folder to welcome.exe and LiveCD just opens the
Author: dreimer
Date: Mon May 16 11:11:22 2016
New Revision: 71342
URL: http://svn.reactos.org/svn/reactos?rev=71342=rev
Log:
[BOOTDATA]
Fix autorun.inf on LiveCD and HybridCD linking to a non existent welcome.exe.
HybridCD now links to the correct folder to welcome.exe and LiveCD just opens
the readme.txt
https://www.reactos.org/forum/viewtopic.php?f=2=15406
Added:
trunk/reactos/boot/bootdata/autorun-bootcd.inf
- copied unchanged from r71341, trunk/reactos/boot/bootdata/autorun.inf
trunk/reactos/boot/bootdata/autorun-hybridcd.inf (with props)
trunk/reactos/boot/bootdata/autorun-livecd.inf (with props)
Removed:
trunk/reactos/boot/bootdata/autorun.inf
Modified:
trunk/reactos/boot/bootdata/CMakeLists.txt
Modified: trunk/reactos/boot/bootdata/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.txt?rev=71342=71341=71342=diff
==
--- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Mon May 16
11:11:22 2016
@@ -18,7 +18,9 @@
add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/regtest.cmd
DESTINATION reactos/bin FOR all)
#autorun.inf
-add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/autorun.inf DESTINATION root
NO_CAB NOT_IN_HYBRIDCD FOR all hybridcd)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/autorun-bootcd.inf DESTINATION
root NO_CAB NOT_IN_HYBRIDCD NAME_ON_CD autorun.inf FOR bootcd)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/autorun-livecd.inf DESTINATION
root NO_CAB NOT_IN_HYBRIDCD NAME_ON_CD autorun.inf FOR livecd)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/autorun-hybridcd.inf DESTINATION
root NO_CAB NOT_IN_HYBRIDCD NAME_ON_CD autorun.inf FOR hybridcd)
#icon.ico
add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/icon.ico DESTINATION root NO_CAB
NOT_IN_HYBRIDCD FOR all hybridcd)
Added: trunk/reactos/boot/bootdata/autorun-hybridcd.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/autorun-hybridcd.inf?rev=71342
==
--- trunk/reactos/boot/bootdata/autorun-hybridcd.inf(added)
+++ trunk/reactos/boot/bootdata/autorun-hybridcd.inf[iso-8859-1] Mon May 16
11:11:22 2016
@@ -0,0 +1,3 @@
+[autorun]
+open=bootcd\reactos\welcome.exe
+icon=icon.ico
Propchange: trunk/reactos/boot/bootdata/autorun-hybridcd.inf
--
svn:eol-style = CRLF
Added: trunk/reactos/boot/bootdata/autorun-livecd.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/autorun-livecd.inf?rev=71342
==
--- trunk/reactos/boot/bootdata/autorun-livecd.inf (added)
+++ trunk/reactos/boot/bootdata/autorun-livecd.inf [iso-8859-1] Mon May 16
11:11:22 2016
@@ -0,0 +1,3 @@
+[autorun]
+open=readme.txt
+icon=icon.ico
Propchange: trunk/reactos/boot/bootdata/autorun-livecd.inf
--
svn:eol-style = CRLF
Removed: trunk/reactos/boot/bootdata/autorun.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/autorun.inf?rev=71341
==
--- trunk/reactos/boot/bootdata/autorun.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/autorun.inf (removed)
@@ -1,3 +0,0 @@
-[autorun]
-open=reactos\welcome.exe
-icon=icon.ico
[ros-diffs] [tthompson] 71341: [ext2] Removed MainResourceAcquired from Ext2GetReparsePoint() to make MSVC happy. This boolean was unused and unneeded; the function does not acquire the main resource.
Author: tthompson Date: Mon May 16 08:32:58 2016 New Revision: 71341 URL: http://svn.reactos.org/svn/reactos?rev=71341=rev Log: [ext2] Removed MainResourceAcquired from Ext2GetReparsePoint() to make MSVC happy. This boolean was unused and unneeded; the function does not acquire the main resource. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ext2/src/fsctl.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ext2/src/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesystems/ext2/src/fsctl.c?rev=71341=71340=71341=diff == --- branches/GSoC_2016/NTFS/drivers/filesystems/ext2/src/fsctl.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ext2/src/fsctl.c [iso-8859-1] Mon May 16 08:32:58 2016 @@ -1396,7 +1396,6 @@ PEXT2_MCB Mcb = NULL; NTSTATUSStatus = STATUS_UNSUCCESSFUL; -BOOLEAN MainResourceAcquired = FALSE; PVOID OutputBuffer; ULONG OutputBufferLength;
[ros-diffs] [cwittich] 71340: [REGSRV32] accept '-' as command line delimiter symbol as well
Author: cwittich
Date: Mon May 16 07:17:45 2016
New Revision: 71340
URL: http://svn.reactos.org/svn/reactos?rev=71340=rev
Log:
[REGSRV32] accept '-' as command line delimiter symbol as well
Modified:
trunk/reactos/base/system/regsvr32/regsvr32.c
Modified: trunk/reactos/base/system/regsvr32/regsvr32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/regsvr32.c?rev=71340=71339=71340=diff
==
--- trunk/reactos/base/system/regsvr32/regsvr32.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/regsvr32/regsvr32.c [iso-8859-1] Mon May 16
07:17:45 2016
@@ -292,7 +292,7 @@
// Find all arguments starting with a slash (/)
for (i = 1; i < argc; i++) {
- if (*argv[i] == _T('/')) {
+ if (*argv[i] == _T('/') || *argv[i] == '-') {
switch (argv[i][1]) {
case _T('u'):
case _T('U'):
