Author: tkreuzer
Date: Sat Dec 5 18:29:33 2015
New Revision: 70276
URL:
http://svn.reactos.org/svn/reactos?rev=70276&view=rev
Log:
[EXPLORER] A DLGPROC returns INT_PTR, not BOOL.
[DDK] Fix invalid syntax in fltkernel.h
Modified:
trunk/reactos/base/shell/explorer/startmnucust.cpp
trunk/reactos/include/ddk/fltkernel.h
Modified: trunk/reactos/base/shell/explorer/startmnucust.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/startm…
==============================================================================
--- trunk/reactos/base/shell/explorer/startmnucust.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/startmnucust.cpp [iso-8859-1] Sat Dec 5 18:29:33
2015
@@ -18,14 +18,14 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
+
#include "precomp.h"
VOID OnAddStartmenuItems(HWND hDlg)
{
WCHAR szPath[MAX_PATH];
- if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_STARTMENU, NULL, 0, szPath)))
+ if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_STARTMENU, NULL, 0, szPath)))
{
WCHAR szCommand[MAX_PATH] = L"appwiz.cpl,NewLinkHere ";
if(SUCCEEDED(StringCchCatW(szCommand, MAX_PATH, szPath)))
@@ -37,7 +37,7 @@
{
WCHAR szPath[MAX_PATH];
- if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_STARTMENU, NULL, 0, szPath)))
+ if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_STARTMENU, NULL, 0, szPath)))
{
ShellExecuteW(NULL, L"explore", szPath, NULL, NULL, SW_SHOWNORMAL);
}
@@ -49,7 +49,7 @@
WIN32_FIND_DATA info;
HANDLE hPath;
- if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_RECENT, NULL, 0, szPath)))
+ if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_RECENT, NULL, 0, szPath)))
{
StringCchPrintf(szFile,MAX_PATH, L"%s\\*.*", szPath);
hPath = FindFirstFileW(szFile, &info);
@@ -57,14 +57,14 @@
{
StringCchPrintf(szFile,MAX_PATH, L"%s\\%s", szPath,
info.cFileName);
DeleteFileW(szFile);
-
- }while(FindNextFileW(hPath, &info));
+
+ }while(FindNextFileW(hPath, &info));
FindClose(hPath);
/* FIXME: Disable the button*/
- }
+ }
}
-BOOL CALLBACK CustomizeClassicProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM
lParam)
+INT_PTR CALLBACK CustomizeClassicProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM
lParam)
{
switch(Message)
{
@@ -96,8 +96,8 @@
}
return TRUE;
}
-
+
VOID ShowCustomizeClassic(HINSTANCE hInst, HWND hExplorer)
- {
+{
DialogBox(hInst, MAKEINTRESOURCE(IDD_CLASSICSTART_CUSTOMIZE), hExplorer,
CustomizeClassicProc);
- }
+}
Modified: trunk/reactos/include/ddk/fltkernel.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/fltkernel.h?re…
==============================================================================
--- trunk/reactos/include/ddk/fltkernel.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/fltkernel.h [iso-8859-1] Sat Dec 5 18:29:33 2015
@@ -478,7 +478,8 @@
PFLT_INSTANCE CONST Instance;
PFILE_OBJECT CONST FileObject;
PKTRANSACTION CONST Transaction;
-} FLT_RELATED_OBJECTS, *PFLT_RELATED_OBJECTS, const *PCFLT_RELATED_OBJECTS;
+} FLT_RELATED_OBJECTS, *PFLT_RELATED_OBJECTS;
+typedef const struct _FLT_RELATED_OBJECTS *PCFLT_RELATED_OBJECTS;
typedef struct _FLT_RELATED_CONTEXTS {
PFLT_CONTEXT VolumeContext;
@@ -520,7 +521,8 @@
PFLT_CONTEXT_ALLOCATE_CALLBACK ContextAllocateCallback;
PFLT_CONTEXT_FREE_CALLBACK ContextFreeCallback;
PVOID Reserved1;
-} FLT_CONTEXT_REGISTRATION, *PFLT_CONTEXT_REGISTRATION, const
*PCFLT_CONTEXT_REGISTRATION;
+} FLT_CONTEXT_REGISTRATION, *PFLT_CONTEXT_REGISTRATION;
+typedef const struct _FLT_CONTEXT_REGISTRATION *PCFLT_CONTEXT_REGISTRATION;
typedef ULONG FLT_INSTANCE_SETUP_FLAGS;