Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 12:26:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EXPLORER] A DLGPROC returns INT_PTR, not BOOL.

Browse source 
[DDK] Fix invalid syntax in fltkernel.h

svn path=/trunk/; revision=70276
This commit is contained in:
Timo Kreuzer 2015-12-05 18:29:33 +00:00
parent 658ef83c7f
commit 667a3ce15c
2 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
reactos/base/shell/explorer/startmnucust.cpp
View file

@ -18,14 +18,14 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "precomp.h" #include "precomp.h"
VOID OnAddStartmenuItems(HWND hDlg) VOID OnAddStartmenuItems(HWND hDlg)
{ {
WCHAR szPath[MAX_PATH]; 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 "; WCHAR szCommand[MAX_PATH] = L"appwiz.cpl,NewLinkHere ";
if(SUCCEEDED(StringCchCatW(szCommand, MAX_PATH, szPath))) if(SUCCEEDED(StringCchCatW(szCommand, MAX_PATH, szPath)))
@ -37,7 +37,7 @@ VOID OnAdvancedStartMenuItems()
{ {
WCHAR szPath[MAX_PATH]; 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); ShellExecuteW(NULL, L"explore", szPath, NULL, NULL, SW_SHOWNORMAL);
} }
@ -49,7 +49,7 @@ VOID OnClearRecentItems()
WIN32_FIND_DATA info; WIN32_FIND_DATA info;
HANDLE hPath; 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); StringCchPrintf(szFile,MAX_PATH, L"%s\\*.*", szPath);
hPath = FindFirstFileW(szFile, &info); hPath = FindFirstFileW(szFile, &info);
@ -57,14 +57,14 @@ VOID OnClearRecentItems()
{ {
StringCchPrintf(szFile,MAX_PATH, L"%s\\%s", szPath, info.cFileName); StringCchPrintf(szFile,MAX_PATH, L"%s\\%s", szPath, info.cFileName);
DeleteFileW(szFile); DeleteFileW(szFile);
}while(FindNextFileW(hPath, &info)); }while(FindNextFileW(hPath, &info));
FindClose(hPath); FindClose(hPath);
/* FIXME: Disable the button*/ /* 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) switch(Message)
{ {
@ -96,8 +96,8 @@ BOOL CALLBACK CustomizeClassicProc(HWND hwnd, UINT Message, WPARAM wParam, LPARA
} }
return TRUE; return TRUE;
} }
VOID ShowCustomizeClassic(HINSTANCE hInst, HWND hExplorer) VOID ShowCustomizeClassic(HINSTANCE hInst, HWND hExplorer)
{ {
DialogBox(hInst, MAKEINTRESOURCE(IDD_CLASSICSTART_CUSTOMIZE), hExplorer, CustomizeClassicProc); DialogBox(hInst, MAKEINTRESOURCE(IDD_CLASSICSTART_CUSTOMIZE), hExplorer, CustomizeClassicProc);
} }

6
reactos/include/ddk/fltkernel.h
View file

@ -478,7 +478,8 @@ typedef struct _FLT_RELATED_OBJECTS {
PFLT_INSTANCE CONST Instance; PFLT_INSTANCE CONST Instance;
PFILE_OBJECT CONST FileObject; PFILE_OBJECT CONST FileObject;
PKTRANSACTION CONST Transaction; 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 { typedef struct _FLT_RELATED_CONTEXTS {
PFLT_CONTEXT VolumeContext; PFLT_CONTEXT VolumeContext;
@ -520,7 +521,8 @@ typedef struct _FLT_CONTEXT_REGISTRATION {
PFLT_CONTEXT_ALLOCATE_CALLBACK ContextAllocateCallback; PFLT_CONTEXT_ALLOCATE_CALLBACK ContextAllocateCallback;
PFLT_CONTEXT_FREE_CALLBACK ContextFreeCallback; PFLT_CONTEXT_FREE_CALLBACK ContextFreeCallback;
PVOID Reserved1; 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; typedef ULONG FLT_INSTANCE_SETUP_FLAGS;