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

use INT_PTR as return type for dialog callbacks as documented in favor of portability

Browse source 
svn path=/trunk/; revision=11276
This commit is contained in:
Thomas Bluemel 2004-10-11 21:08:06 +00:00
parent c104ab305d
commit fe8243b96a
54 changed files with 155 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/apps/tests/capclock/capclock.c
View file

@ -1,4 +1,4 @@
/* $Id: capclock.c,v 1.3 2003/11/14 17:13:16 weiden Exp $ /* $Id: capclock.c,v 1.4 2004/10/11 21:08:03 weiden Exp $
* *
* DESCRIPTION: Simple Win32 Caption Clock * DESCRIPTION: Simple Win32 Caption Clock
* PROJECT : ReactOS (test applications) * PROJECT : ReactOS (test applications)
@ -27,7 +27,7 @@ INT STDCALL WinMain (HINSTANCE hinst, HINSTANCE hinstPrev, LPSTR lpCmdLine, INT
wc.hbrBackground = (HBRUSH) (COLOR_WINDOW + 1); wc.hbrBackground = (HBRUSH) (COLOR_WINDOW + 1);
wc.lpszClassName = "CapClock"; wc.lpszClassName = "CapClock";
RegisterClass (& wc); RegisterClass (& wc);
return DialogBox(hinst, MAKEINTRESOURCE(2), NULL, (DLGPROC) DialogFunc); return DialogBox(hinst, MAKEINTRESOURCE(2), NULL, DialogFunc);
} }
static int InitializeApp (HWND hDlg,WPARAM wParam, LPARAM lParam) static int InitializeApp (HWND hDlg,WPARAM wParam, LPARAM lParam)
@ -36,7 +36,7 @@ static int InitializeApp (HWND hDlg,WPARAM wParam, LPARAM lParam)
TimerProc (hDlg,0,0,0); TimerProc (hDlg,0,0,0);
return 1; return 1;
} }
static BOOL CALLBACK DialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) static INT_PTR CALLBACK DialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
switch (msg) switch (msg)
{ {

2
reactos/apps/tests/dirdlg/dirdlg.c
View file

@ -6,7 +6,7 @@
static char selected[MAX_PATH + 1]; static char selected[MAX_PATH + 1];
BOOL INT_PTR
CALLBACK CALLBACK
DlgMainProc( DlgMainProc(
HWND hwndDlg, HWND hwndDlg,

6
reactos/apps/utils/infinst/.cvsignore Normal file
View file

@ -0,0 +1,6 @@
*.o
*.d
*.exe
*.coff
*.sym
*.map

12
reactos/lib/cpl/access/access.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: access.c,v 1.2 2004/07/10 22:06:39 kuehng Exp $ /* $Id: access.c,v 1.3 2004/10/11 21:08:03 weiden Exp $
* *
* PROJECT: ReactOS System Control Panel * PROJECT: ReactOS System Control Panel
* FILE: lib/cpl/system/sysdm.c * FILE: lib/cpl/system/sysdm.c
@ -37,11 +37,11 @@
#define NUM_APPLETS (1) #define NUM_APPLETS (1)
LONG CALLBACK SystemApplet(VOID); LONG CALLBACK SystemApplet(VOID);
BOOL CALLBACK DisplayPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK DisplayPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK KeyboardPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK KeyboardPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK MousePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK MousePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK SoundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK SoundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
HINSTANCE hApplet = 0; HINSTANCE hApplet = 0;
/* Applets */ /* Applets */

4
reactos/lib/cpl/access/display.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: display.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $ /* $Id: display.c,v 1.2 2004/10/11 21:08:03 weiden Exp $
* *
* PROJECT: ReactOS System Control Panel * PROJECT: ReactOS System Control Panel
* FILE: lib/cpl/system/advanced.c * FILE: lib/cpl/system/advanced.c
@ -31,7 +31,7 @@
#include "access.h" #include "access.h"
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
DisplayPageProc( DisplayPageProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,

4
reactos/lib/cpl/access/general.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: general.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $ /* $Id: general.c,v 1.2 2004/10/11 21:08:03 weiden Exp $
* *
* PROJECT: ReactOS System Control Panel * PROJECT: ReactOS System Control Panel
* FILE: lib/cpl/system/advanced.c * FILE: lib/cpl/system/advanced.c
@ -31,7 +31,7 @@
#include "access.h" #include "access.h"
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
GeneralPageProc( GeneralPageProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,

4
reactos/lib/cpl/access/keyboard.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: keyboard.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $ /* $Id: keyboard.c,v 1.2 2004/10/11 21:08:03 weiden Exp $
* *
* PROJECT: ReactOS System Control Panel * PROJECT: ReactOS System Control Panel
* FILE: lib/cpl/system/advanced.c * FILE: lib/cpl/system/advanced.c
@ -31,7 +31,7 @@
#include "access.h" #include "access.h"
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
KeyboardPageProc( KeyboardPageProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,

4
reactos/lib/cpl/access/mouse.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: mouse.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $ /* $Id: mouse.c,v 1.2 2004/10/11 21:08:03 weiden Exp $
* *
* PROJECT: ReactOS System Control Panel * PROJECT: ReactOS System Control Panel
* FILE: lib/cpl/system/advanced.c * FILE: lib/cpl/system/advanced.c
@ -31,7 +31,7 @@
#include "access.h" #include "access.h"
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
MousePageProc( MousePageProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,

4
reactos/lib/cpl/access/sound.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: sound.c,v 1.1 2004/06/30 12:16:27 ekohl Exp $ /* $Id: sound.c,v 1.2 2004/10/11 21:08:03 weiden Exp $
* *
* PROJECT: ReactOS System Control Panel * PROJECT: ReactOS System Control Panel
* FILE: lib/cpl/system/advanced.c * FILE: lib/cpl/system/advanced.c
@ -31,7 +31,7 @@
#include "access.h" #include "access.h"
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
SoundPageProc( SoundPageProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,

10
reactos/lib/cpl/appwiz/appwiz.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: appwiz.c,v 1.3 2004/07/10 22:06:39 kuehng Exp $ /* $Id: appwiz.c,v 1.4 2004/10/11 21:08:04 weiden Exp $
* *
* PROJECT: ReactOS Software Control Panel * PROJECT: ReactOS Software Control Panel
* FILE: lib/cpl/system/appwiz.c * FILE: lib/cpl/system/appwiz.c
@ -42,8 +42,8 @@
#define NUM_APPLETS (1) #define NUM_APPLETS (1)
LONG CALLBACK SystemApplet(VOID); LONG CALLBACK SystemApplet(VOID);
BOOL CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK ComputerPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ComputerPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
HINSTANCE hApplet = 0; HINSTANCE hApplet = 0;
/* Applets */ /* Applets */
@ -106,7 +106,7 @@ CallUninstall(HWND hwndDlg)
/* Property page dialog callback */ /* Property page dialog callback */
static BOOL CALLBACK static INT_PTR CALLBACK
InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
{ {
TCHAR pszName[MAX_PATH]; TCHAR pszName[MAX_PATH];
@ -183,7 +183,7 @@ InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
/* Property page dialog callback */ /* Property page dialog callback */
static BOOL CALLBACK static INT_PTR CALLBACK
RosPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) RosPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
{ {
switch(uMsg) switch(uMsg)

8
reactos/lib/cpl/cplsample/cplsample.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: cplsample.c,v 1.3 2004/07/10 22:06:40 kuehng Exp $ /* $Id: cplsample.c,v 1.4 2004/10/11 21:08:04 weiden Exp $
* *
* PROJECT: ReactOS Sample Control Panel * PROJECT: ReactOS Sample Control Panel
* FILE: lib/cpl/cplsample/cplsample.c * FILE: lib/cpl/cplsample/cplsample.c
@ -53,7 +53,7 @@ InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
} }
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
Page1Proc( Page1Proc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,
@ -70,7 +70,7 @@ Page1Proc(
} }
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
Page2Proc( Page2Proc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,
@ -87,7 +87,7 @@ Page2Proc(
} }
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
Page3Proc( Page3Proc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,

22
reactos/lib/cpl/desk/desk.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: desk.c,v 1.1 2004/08/07 00:05:23 kuehng Exp $ /* $Id: desk.c,v 1.2 2004/10/11 21:08:04 weiden Exp $
* *
* PROJECT: ReactOS Display Control Panel * PROJECT: ReactOS Display Control Panel
* FILE: lib/cpl/desk/desk.c * FILE: lib/cpl/desk/desk.c
@ -49,10 +49,10 @@
#define NUM_APPLETS (1) #define NUM_APPLETS (1)
LONG CALLBACK DisplayApplet(VOID); LONG CALLBACK DisplayApplet(VOID);
BOOL CALLBACK BackgroundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK BackgroundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK ScreenSaverPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ScreenSaverPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
HINSTANCE hApplet = 0; HINSTANCE hApplet = 0;
/* Applets */ /* Applets */
@ -64,7 +64,8 @@ APPLET Applets[NUM_APPLETS] =
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK BackgroundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
BackgroundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
switch(uMsg) switch(uMsg)
{ {
@ -76,7 +77,8 @@ BOOL CALLBACK BackgroundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
return FALSE; return FALSE;
} }
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK ScreenSaverPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
ScreenSaverPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
switch(uMsg) switch(uMsg)
{ {
@ -88,7 +90,8 @@ BOOL CALLBACK ScreenSaverPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
return FALSE; return FALSE;
} }
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
switch(uMsg) switch(uMsg)
{ {
@ -100,7 +103,8 @@ BOOL CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
return FALSE; return FALSE;
} }
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
switch(uMsg) switch(uMsg)
{ {

13
reactos/lib/cpl/ncpa/ncpa.c
View file

@ -15,7 +15,7 @@
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/* $Id: ncpa.c,v 1.3 2004/09/26 15:55:52 weiden Exp $ /* $Id: ncpa.c,v 1.4 2004/10/11 21:08:04 weiden Exp $
* *
* PROJECT: ReactOS Network Control Panel * PROJECT: ReactOS Network Control Panel
* FILE: lib/cpl/system/ncpa.c * FILE: lib/cpl/system/ncpa.c
@ -129,7 +129,7 @@ void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc,LPARAM lP
LONG CALLBACK DisplayApplet(VOID); LONG CALLBACK DisplayApplet(VOID);
BOOL CALLBACK NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
void DisplayTCPIPProperties(HWND hParent,IP_ADAPTER_INFO *pInfo); void DisplayTCPIPProperties(HWND hParent,IP_ADAPTER_INFO *pInfo);
HINSTANCE hApplet = 0; HINSTANCE hApplet = 0;
@ -240,7 +240,8 @@ void NICPropertyProtocolCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey)
BOOL CALLBACK NICPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
NICPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA); PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA);
switch(uMsg) switch(uMsg)
@ -426,7 +427,8 @@ void DisplayNICProperties(HWND hParent,TCHAR *tpszCfgInstanceID)
BOOL CALLBACK NICStatusPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
NICStatusPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
switch(uMsg) switch(uMsg)
{ {
@ -608,7 +610,8 @@ void EnumAdapters(HWND hwndDlg)
} }
BOOL CALLBACK NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
NMHDR* pnmh; NMHDR* pnmh;
int nIndex; int nIndex;

5
reactos/lib/cpl/ncpa/tcpip_properties.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: tcpip_properties.c,v 1.2 2004/09/26 15:55:52 weiden Exp $ /* $Id: tcpip_properties.c,v 1.3 2004/10/11 21:08:04 weiden Exp $
* *
* PROJECT: ReactOS Network Control Panel * PROJECT: ReactOS Network Control Panel
* FILE: lib/cpl/system/tcpip_properties.c * FILE: lib/cpl/system/tcpip_properties.c
@ -52,7 +52,8 @@
extern void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc); extern void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc);
BOOL CALLBACK TCPIPPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
TCPIPPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA); PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA);
IP_ADAPTER_INFO *pInfo = NULL; IP_ADAPTER_INFO *pInfo = NULL;

4
reactos/lib/cpl/sysdm/advanced.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: advanced.c,v 1.3 2004/07/02 20:28:00 ekohl Exp $ /* $Id: advanced.c,v 1.4 2004/10/11 21:08:04 weiden Exp $
* *
* PROJECT: ReactOS System Control Panel * PROJECT: ReactOS System Control Panel
* FILE: lib/cpl/system/advanced.c * FILE: lib/cpl/system/advanced.c
@ -33,7 +33,7 @@
#include "sysdm.h" #include "sysdm.h"
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
AdvancedPageProc( AdvancedPageProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,

4
reactos/lib/cpl/sysdm/computer.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: computer.c,v 1.1 2004/03/08 14:24:47 weiden Exp $ /* $Id: computer.c,v 1.2 2004/10/11 21:08:04 weiden Exp $
* *
* PROJECT: ReactOS System Control Panel * PROJECT: ReactOS System Control Panel
* FILE: lib/cpl/system/computer.c * FILE: lib/cpl/system/computer.c
@ -31,7 +31,7 @@
#include "sysdm.h" #include "sysdm.h"
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
ComputerPageProc( ComputerPageProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,

6
reactos/lib/cpl/sysdm/environment.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: environment.c,v 1.4 2004/09/26 15:55:53 weiden Exp $ /* $Id: environment.c,v 1.5 2004/10/11 21:08:04 weiden Exp $
* *
* PROJECT: ReactOS System Control Panel * PROJECT: ReactOS System Control Panel
* FILE: lib/cpl/sysdm/environment.c * FILE: lib/cpl/sysdm/environment.c
@ -42,7 +42,7 @@ typedef struct _VARIABLE_DATA
BOOL CALLBACK INT_PTR CALLBACK
EditVariableDlgProc(HWND hwndDlg, EditVariableDlgProc(HWND hwndDlg,
UINT uMsg, UINT uMsg,
WPARAM wParam, WPARAM wParam,
@ -475,7 +475,7 @@ ReleaseListViewItems(HWND hwndDlg,
/* Environment dialog procedure */ /* Environment dialog procedure */
BOOL CALLBACK INT_PTR CALLBACK
EnvironmentDlgProc(HWND hwndDlg, EnvironmentDlgProc(HWND hwndDlg,
UINT uMsg, UINT uMsg,
WPARAM wParam, WPARAM wParam,

4
reactos/lib/cpl/sysdm/general.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: general.c,v 1.2 2004/06/30 10:53:05 ekohl Exp $ /* $Id: general.c,v 1.3 2004/10/11 21:08:04 weiden Exp $
* *
* PROJECT: ReactOS System Control Panel * PROJECT: ReactOS System Control Panel
* FILE: lib/cpl/system/general.c * FILE: lib/cpl/system/general.c
@ -90,7 +90,7 @@ ObtainSystemInformationThread(POSITINFO posit)
} }
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
GeneralPageProc( GeneralPageProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,

4
reactos/lib/cpl/sysdm/hardware.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: hardware.c,v 1.2 2004/06/30 10:53:05 ekohl Exp $ /* $Id: hardware.c,v 1.3 2004/10/11 21:08:04 weiden Exp $
* *
* PROJECT: ReactOS System Control Panel * PROJECT: ReactOS System Control Panel
* FILE: lib/cpl/system/hardware.c * FILE: lib/cpl/system/hardware.c
@ -55,7 +55,7 @@ BOOL LaunchDeviceManager(HWND hWndParent)
} }
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
HardwarePageProc( HardwarePageProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,

12
reactos/lib/cpl/sysdm/sysdm.h
View file

@ -15,14 +15,14 @@ extern HINSTANCE hApplet;
void ShowLastWin32Error(HWND hWndOwner); void ShowLastWin32Error(HWND hWndOwner);
BOOL CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK ComputerPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ComputerPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK HardwarePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK HardwarePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK UserProfilePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK UserProfilePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
/* environment.c */ /* environment.c */
BOOL CALLBACK EnvironmentDlgProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK EnvironmentDlgProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
#endif /* __CPL_SYSDM_H */ #endif /* __CPL_SYSDM_H */

4
reactos/lib/cpl/sysdm/userprofile.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: userprofile.c,v 1.1 2004/06/30 10:53:05 ekohl Exp $ /* $Id: userprofile.c,v 1.2 2004/10/11 21:08:04 weiden Exp $
* *
* PROJECT: ReactOS System Control Panel * PROJECT: ReactOS System Control Panel
* FILE: lib/cpl/system/computer.c * FILE: lib/cpl/system/computer.c
@ -31,7 +31,7 @@
#include "sysdm.h" #include "sysdm.h"
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
UserProfilePageProc( UserProfilePageProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,

4
reactos/lib/devmgr/devmgr.c
View file

@ -16,7 +16,7 @@
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
/* $Id: devmgr.c,v 1.2 2004/09/28 16:04:15 weiden Exp $ /* $Id: devmgr.c,v 1.3 2004/10/11 21:08:04 weiden Exp $
* *
* PROJECT: ReactOS devmgr.dll * PROJECT: ReactOS devmgr.dll
* FILE: lib/devmgr/devmgr.c * FILE: lib/devmgr/devmgr.c
@ -29,7 +29,7 @@
#include "devmgr.h" #include "devmgr.h"
#include "resource.h" #include "resource.h"
extern HINSTANCE hDllInstance; HINSTANCE hDllInstance;
BOOL STDCALL BOOL STDCALL

2
reactos/lib/devmgr/devmgr.h
View file

@ -1,7 +1,7 @@
#ifndef __DEVMGR_H #ifndef __DEVMGR_H
#define __DEVMGR_H #define __DEVMGR_H
HINSTANCE hDllInstance; extern HINSTANCE hDllInstance;
WINBOOL WINBOOL
WINAPI WINAPI

4
reactos/lib/msgina/msgina.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: msgina.c,v 1.9 2004/03/28 12:19:07 weiden Exp $ /* $Id: msgina.c,v 1.10 2004/10/11 21:08:04 weiden Exp $
* *
* PROJECT: ReactOS msgina.dll * PROJECT: ReactOS msgina.dll
* FILE: lib/msgina/msgina.c * FILE: lib/msgina/msgina.c
@ -42,7 +42,7 @@ typedef struct _DISPLAYSTATUSMSG
HANDLE StartupEvent; HANDLE StartupEvent;
} DISPLAYSTATUSMSG, *PDISPLAYSTATUSMSG; } DISPLAYSTATUSMSG, *PDISPLAYSTATUSMSG;
BOOL CALLBACK INT_PTR CALLBACK
LoggedOnDlgProc( LoggedOnDlgProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,

14
reactos/lib/syssetup/wizard.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: wizard.c,v 1.8 2004/09/26 15:55:53 weiden Exp $ /* $Id: wizard.c,v 1.9 2004/10/11 21:08:04 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -98,7 +98,7 @@ CreateTitleFont(VOID)
} }
BOOL CALLBACK INT_PTR CALLBACK
WelcomeDlgProc(HWND hwndDlg, WelcomeDlgProc(HWND hwndDlg,
UINT uMsg, UINT uMsg,
WPARAM wParam, WPARAM wParam,
@ -164,7 +164,7 @@ WelcomeDlgProc(HWND hwndDlg,
} }
BOOL CALLBACK INT_PTR CALLBACK
OwnerPageDlgProc(HWND hwndDlg, OwnerPageDlgProc(HWND hwndDlg,
UINT uMsg, UINT uMsg,
WPARAM wParam, WPARAM wParam,
@ -254,7 +254,7 @@ OwnerPageDlgProc(HWND hwndDlg,
} }
BOOL CALLBACK INT_PTR CALLBACK
ComputerPageDlgProc(HWND hwndDlg, ComputerPageDlgProc(HWND hwndDlg,
UINT uMsg, UINT uMsg,
WPARAM wParam, WPARAM wParam,
@ -355,7 +355,7 @@ ComputerPageDlgProc(HWND hwndDlg,
} }
BOOL CALLBACK INT_PTR CALLBACK
LocalePageDlgProc(HWND hwndDlg, LocalePageDlgProc(HWND hwndDlg,
UINT uMsg, UINT uMsg,
WPARAM wParam, WPARAM wParam,
@ -406,7 +406,7 @@ LocalePageDlgProc(HWND hwndDlg,
} }
BOOL CALLBACK INT_PTR CALLBACK
ProcessPageDlgProc(HWND hwndDlg, ProcessPageDlgProc(HWND hwndDlg,
UINT uMsg, UINT uMsg,
WPARAM wParam, WPARAM wParam,
@ -481,7 +481,7 @@ ProcessPageDlgProc(HWND hwndDlg,
BOOL CALLBACK INT_PTR CALLBACK
FinishDlgProc(HWND hwndDlg, FinishDlgProc(HWND hwndDlg,
UINT uMsg, UINT uMsg,
WPARAM wParam, WPARAM wParam,

2
reactos/subsys/system/explorer/shell/filechild.cpp
View file

@ -93,7 +93,7 @@ WebChildWndInfo::WebChildWndInfo(HWND hmdiclient, LPCTSTR url)
} }
BOOL CALLBACK ExecuteDialog::WndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) INT_PTR CALLBACK ExecuteDialog::WndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam)
{ {
static struct ExecuteDialog* dlg; static struct ExecuteDialog* dlg;

2
reactos/subsys/system/explorer/shell/filechild.h
View file

@ -132,5 +132,5 @@ struct ExecuteDialog { ///@todo use class Dialog
TCHAR cmd[MAX_PATH]; TCHAR cmd[MAX_PATH];
int cmdshow; int cmdshow;
static BOOL CALLBACK WndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam); static INT_PTR CALLBACK WndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam);
}; };

3
reactos/subsys/system/regedit/childwnd.c
View file

@ -131,7 +131,8 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
* WM_DESTROY - post a quit message and return * WM_DESTROY - post a quit message and return
* *
*/ */
LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
static short last_split; static short last_split;
BOOL Result; BOOL Result;

3
reactos/subsys/system/regedit/framewnd.c
View file

@ -642,7 +642,8 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
* *
*/ */
LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
switch (message) { switch (message) {
case WM_CREATE: case WM_CREATE:

5
reactos/subsys/system/regedit/hexedit.c
View file

@ -60,7 +60,7 @@ typedef struct
#define HEHT_ASCIIDUMP (0x6) #define HEHT_ASCIIDUMP (0x6)
#define HEHT_RIGHTMARGIN (0x7) #define HEHT_RIGHTMARGIN (0x7)
LRESULT WINAPI HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
ATOM ATOM
STDCALL STDCALL
@ -858,8 +858,7 @@ HEXEDIT_WM_SIZE(PHEXEDIT_DATA hed, DWORD sType, WORD NewWidth, WORD NewHeight)
return 0; return 0;
} }
LRESULT INT_PTR CALLBACK
WINAPI
HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
PHEXEDIT_DATA hed; PHEXEDIT_DATA hed;

4
reactos/subsys/system/regedit/main.h
View file

@ -80,10 +80,10 @@ extern TCHAR szChildClass[];
extern void ShowAboutBox(HWND hWnd); extern void ShowAboutBox(HWND hWnd);
/* childwnd.c */ /* childwnd.c */
extern LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM); extern INT_PTR CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM);
/* framewnd.c */ /* framewnd.c */
extern LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM); extern INT_PTR CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM);
extern void SetupStatusBar(HWND hWnd, BOOL bResize); extern void SetupStatusBar(HWND hWnd, BOOL bResize);
extern void UpdateStatusBar(void); extern void UpdateStatusBar(void);

5
reactos/subsys/system/taskmgr/about.c
View file

@ -30,14 +30,15 @@
#include "about.h" #include "about.h"
LRESULT CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
void OnAbout(void) void OnAbout(void)
{ {
DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hMainWnd, (DLGPROC)AboutDialogWndProc); DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hMainWnd, (DLGPROC)AboutDialogWndProc);
} }
LRESULT CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
HWND hLicenseEditWnd; HWND hLicenseEditWnd;
TCHAR strLicense[0x1000]; TCHAR strLicense[0x1000];

5
reactos/subsys/system/taskmgr/affinity.c
View file

@ -35,7 +35,7 @@
HANDLE hProcessAffinityHandle; HANDLE hProcessAffinityHandle;
LRESULT CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
void ProcessPage_OnSetAffinity(void) void ProcessPage_OnSetAffinity(void)
{ {
@ -69,7 +69,8 @@ void ProcessPage_OnSetAffinity(void)
} }
} }
LRESULT CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
DWORD dwProcessAffinityMask = 0; DWORD dwProcessAffinityMask = 0;
DWORD dwSystemAffinityMask = 0; DWORD dwSystemAffinityMask = 0;

3
reactos/subsys/system/taskmgr/applpage.c
View file

@ -64,7 +64,8 @@ BOOL bRestore /* Restore the window if it is minimized */
); );
#endif #endif
LRESULT CALLBACK ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
RECT rc; RECT rc;
int nXDifference; int nXDifference;

2
reactos/subsys/system/taskmgr/applpage.h
View file

@ -30,7 +30,7 @@ extern HWND hApplicationPageEndTaskButton; /* Application End Task
extern HWND hApplicationPageSwitchToButton; /* Application Switch To button */ extern HWND hApplicationPageSwitchToButton; /* Application Switch To button */
extern HWND hApplicationPageNewTaskButton; /* Application New Task button */ extern HWND hApplicationPageNewTaskButton; /* Application New Task button */
LRESULT CALLBACK ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
void RefreshApplicationPage(void); void RefreshApplicationPage(void);
void UpdateApplicationListControlViewSetting(void); void UpdateApplicationListControlViewSetting(void);

5
reactos/subsys/system/taskmgr/column.c
View file

@ -34,7 +34,7 @@
UINT ColumnDataHints[25]; UINT ColumnDataHints[25];
int InsertColumn(int nCol, LPCTSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem); int InsertColumn(int nCol, LPCTSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem);
LRESULT CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
void AddColumns(void) void AddColumns(void)
{ {
@ -368,7 +368,8 @@ void ProcessPage_OnViewSelectColumns(void)
} }
} }
LRESULT CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
switch (message) switch (message)

4
reactos/subsys/system/taskmgr/dbgchnl.c
View file

@ -397,7 +397,7 @@ static void DebugChannels_OnNotify(HWND hDlg, LPARAM lParam)
} }
} }
static LRESULT CALLBACK DebugChannelsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) static INT_PTR CALLBACK DebugChannelsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
switch (message) switch (message)
{ {
@ -419,5 +419,5 @@ static LRESULT CALLBACK DebugChannelsDlgProc(HWND hDlg, UINT message, WPARAM wPa
void ProcessPage_OnDebugChannels(void) void ProcessPage_OnDebugChannels(void)
{ {
DialogBox(hInst, (LPCTSTR)IDD_DEBUG_CHANNELS_DIALOG, hMainWnd, (DLGPROC)DebugChannelsDlgProc); DialogBox(hInst, (LPCTSTR)IDD_DEBUG_CHANNELS_DIALOG, hMainWnd, DebugChannelsDlgProc);
} }

3
reactos/subsys/system/taskmgr/graph.c
View file

@ -40,7 +40,8 @@ void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd);
void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd); void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd);
void Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd); void Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd);
LRESULT CALLBACK Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
HDC hdc; HDC hdc;
PAINTSTRUCT ps; PAINTSTRUCT ps;

2
reactos/subsys/system/taskmgr/graph.h
View file

@ -34,7 +34,7 @@ extern "C" {
extern LONG OldGraphWndProc; extern LONG OldGraphWndProc;
LRESULT CALLBACK Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
#ifdef __cplusplus #ifdef __cplusplus

3
reactos/subsys/system/taskmgr/graphctl.c
View file

@ -530,7 +530,8 @@ extern TGraphCtrl PerformancePageMemUsageHistoryGraph;
extern HWND hPerformancePageCpuUsageHistoryGraph; extern HWND hPerformancePageCpuUsageHistoryGraph;
extern HWND hPerformancePageMemUsageHistoryGraph; extern HWND hPerformancePageMemUsageHistoryGraph;
LRESULT CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
RECT rcClient; RECT rcClient;
HDC hdc; HDC hdc;

2
reactos/subsys/system/taskmgr/graphctl.h
View file

@ -104,7 +104,7 @@ color);
void GraphCtrl_SetRange(TGraphCtrl* this, double dLower, double void GraphCtrl_SetRange(TGraphCtrl* this, double dLower, double
dUpper, int nDecimalPlaces); dUpper, int nDecimalPlaces);
LRESULT CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
#ifdef __cplusplus #ifdef __cplusplus
} }

3
reactos/subsys/system/taskmgr/perfpage.c
View file

@ -117,7 +117,8 @@ void AdjustCntrlPos(int ctrl_id, HWND hDlg, int nXDifference, int nYDifference)
AdjustFrameSize(GetDlgItem(hDlg, ctrl_id), hDlg, nXDifference, nYDifference, 0); AdjustFrameSize(GetDlgItem(hDlg, ctrl_id), hDlg, nXDifference, nYDifference, 0);
} }
LRESULT CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
RECT rc; RECT rc;
int nXDifference; int nXDifference;

2
reactos/subsys/system/taskmgr/perfpage.h
View file

@ -28,7 +28,7 @@ extern "C" {
#endif #endif
extern HWND hPerformancePage; /* Performance Property Page */ extern HWND hPerformancePage; /* Performance Property Page */
LRESULT CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
void RefreshPerformancePage(void); void RefreshPerformancePage(void);
void PerformancePage_OnViewShowKernelTimes(void); void PerformancePage_OnViewShowKernelTimes(void);
void PerformancePage_OnViewCPUHistoryOneGraphAll(void); void PerformancePage_OnViewCPUHistoryOneGraphAll(void);

7
reactos/subsys/system/taskmgr/proclist.c
View file

@ -34,12 +34,13 @@
#include "perfdata.h" #include "perfdata.h"
LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
WNDPROC OldProcessListWndProc; WNDPROC OldProcessListWndProc;
LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
HBRUSH hbrBackground; HBRUSH hbrBackground;
RECT rcItem; RECT rcItem;
@ -116,5 +117,5 @@ LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
/* /*
* We pass on all messages except WM_ERASEBKGND * We pass on all messages except WM_ERASEBKGND
*/ */
return CallWindowProc((WNDPROC)OldProcessListWndProc, hWnd, message, wParam, lParam); return CallWindowProc(OldProcessListWndProc, hWnd, message, wParam, lParam);
} }

2
reactos/subsys/system/taskmgr/proclist.h
View file

@ -23,7 +23,7 @@
#ifndef __PROCLIST_H #ifndef __PROCLIST_H
#define __PROCLIST_H #define __PROCLIST_H
LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
extern WNDPROC OldProcessListWndProc; extern WNDPROC OldProcessListWndProc;

3
reactos/subsys/system/taskmgr/procpage.c
View file

@ -53,7 +53,8 @@ void CommaSeparateNumberString(LPTSTR strNumber, int nMaxCount);
void ProcessPageShowContextMenu(DWORD dwProcessId); void ProcessPageShowContextMenu(DWORD dwProcessId);
DWORD WINAPI ProcessPageRefreshThread(void *lpParameter); DWORD WINAPI ProcessPageRefreshThread(void *lpParameter);
LRESULT CALLBACK ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
RECT rc; RECT rc;
int nXDifference; int nXDifference;

2
reactos/subsys/system/taskmgr/procpage.h
View file

@ -29,7 +29,7 @@ extern HWND hProcessPageHeaderCtrl; /* Process Header Control */
extern HWND hProcessPageEndProcessButton; /* Process End Process button */ extern HWND hProcessPageEndProcessButton; /* Process End Process button */
extern HWND hProcessPageShowAllProcessesButton; /* Process Show All Processes checkbox */ extern HWND hProcessPageShowAllProcessesButton; /* Process Show All Processes checkbox */
LRESULT CALLBACK ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
void RefreshProcessPage(void); void RefreshProcessPage(void);
#endif /* __PROCESSPAGE_H */ #endif /* __PROCESSPAGE_H */

5
reactos/subsys/system/taskmgr/taskmgr.c
View file

@ -106,7 +106,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
return -1; return -1;
} }
DialogBox(hInst, (LPCTSTR)IDD_TASKMGR_DIALOG, NULL, (DLGPROC)TaskManagerWndProc); DialogBox(hInst, (LPCTSTR)IDD_TASKMGR_DIALOG, NULL, TaskManagerWndProc);
/* Save our settings to the registry */ /* Save our settings to the registry */
SaveSettings(); SaveSettings();
@ -115,7 +115,8 @@ int APIENTRY WinMain(HINSTANCE hInstance,
} }
/* Message handler for dialog box. */ /* Message handler for dialog box. */
LRESULT CALLBACK TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK
TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
HDC hdc; HDC hdc;
PAINTSTRUCT ps; PAINTSTRUCT ps;

2
reactos/subsys/system/taskmgr/taskmgr.h
View file

@ -125,7 +125,7 @@ extern int nOldHeight; /* Holds the previous client area height */
extern TASKMANAGER_SETTINGS TaskManagerSettings; extern TASKMANAGER_SETTINGS TaskManagerSettings;
/* Foward declarations of functions included in this code module: */ /* Foward declarations of functions included in this code module: */
LRESULT CALLBACK TaskManagerWndProc(HWND, UINT, WPARAM, LPARAM); INT_PTR CALLBACK TaskManagerWndProc(HWND, UINT, WPARAM, LPARAM);
BOOL OnCreate(HWND hWnd); BOOL OnCreate(HWND hWnd);
void OnSize(UINT nType, int cx, int cy); void OnSize(UINT nType, int cx, int cy);
void OnMove(UINT nType, int cx, int cy); void OnMove(UINT nType, int cx, int cy);

18
reactos/subsys/system/vmwinst/vmwinst.c
View file

@ -18,7 +18,7 @@
* *
* VMware is a registered trademark of VMware, Inc. * VMware is a registered trademark of VMware, Inc.
*/ */
/* $Id: vmwinst.c,v 1.11 2004/09/24 20:20:46 weiden Exp $ /* $Id: vmwinst.c,v 1.12 2004/10/11 21:08:05 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS VMware(r) driver installation utility * PROJECT: ReactOS VMware(r) driver installation utility
@ -369,7 +369,7 @@ InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DWORD Flags, DLGPROC DlgProc)
} }
/* Property page dialog callback */ /* Property page dialog callback */
int CALLBACK INT_PTR CALLBACK
PageWelcomeProc( PageWelcomeProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,
@ -414,7 +414,7 @@ PageWelcomeProc(
} }
/* Property page dialog callback */ /* Property page dialog callback */
int CALLBACK INT_PTR CALLBACK
PageInsertDiscProc( PageInsertDiscProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,
@ -569,7 +569,7 @@ InstStartInstallationThread(HWND hwndNotify)
} }
/* Property page dialog callback */ /* Property page dialog callback */
int CALLBACK INT_PTR CALLBACK
PageInstallingProc( PageInstallingProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,
@ -638,7 +638,7 @@ PageInstallingProc(
} }
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
PageInstallFailedProc( PageInstallFailedProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,
@ -686,7 +686,7 @@ typedef struct
} MAPCTLRES; } MAPCTLRES;
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
PageConfigProc( PageConfigProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,
@ -799,7 +799,7 @@ PageConfigProc(
} }
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
PageChooseActionProc( PageChooseActionProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,
@ -851,7 +851,7 @@ PageChooseActionProc(
} }
/* Property page dialog callback */ /* Property page dialog callback */
BOOL CALLBACK INT_PTR CALLBACK
PageSelectDriverProc( PageSelectDriverProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,
@ -921,7 +921,7 @@ ShowUninstNotice(HWND Owner)
MessageBox(Owner, Msg, NULL, MB_ICONINFORMATION); MessageBox(Owner, Msg, NULL, MB_ICONINFORMATION);
} }
BOOL CALLBACK INT_PTR CALLBACK
PageDoUninstallProc( PageDoUninstallProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,

8
reactos/subsys/system/welcome/welcome.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: welcome.c,v 1.6 2004/09/26 15:55:53 weiden Exp $ /* $Id: welcome.c,v 1.7 2004/10/11 21:08:05 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS welcome/autorun application * PROJECT: ReactOS welcome/autorun application
@ -89,7 +89,7 @@ RECT rcRightPanel;
WNDPROC fnOldBtn; WNDPROC fnOldBtn;
LRESULT CALLBACK INT_PTR CALLBACK
MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
@ -211,7 +211,7 @@ WinMain(HINSTANCE hInst,
} }
LRESULT CALLBACK INT_PTR CALLBACK
ButtonSubclassWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ButtonSubclassWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
LONG i; LONG i;
@ -783,7 +783,7 @@ OnDestroy(HWND hWnd, WPARAM wParam, LPARAM lParam)
} }
LRESULT CALLBACK INT_PTR CALLBACK
MainWndProc(HWND hWnd, MainWndProc(HWND hWnd,
UINT uMsg, UINT uMsg,
WPARAM wParam, WPARAM wParam,

4
reactos/subsys/system/winefile/winefile.c
View file

@ -1601,7 +1601,7 @@ struct ExecuteDialog {
}; };
static BOOL CALLBACK ExecuteDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) static INT_PTR CALLBACK ExecuteDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam)
{ {
static struct ExecuteDialog* dlg; static struct ExecuteDialog* dlg;
@ -1627,7 +1627,7 @@ static BOOL CALLBACK ExecuteDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, L
return 0; return 0;
} }
static BOOL CALLBACK DestinationDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) static INT_PTR CALLBACK DestinationDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam)
{ {
TCHAR b1[BUFFER_LEN], b2[BUFFER_LEN]; TCHAR b1[BUFFER_LEN], b2[BUFFER_LEN];

4
reactos/subsys/system/winlogon/winlogon.c
View file

@ -1,4 +1,4 @@
/* $Id: winlogon.c,v 1.34 2004/07/12 20:09:35 gvg Exp $ /* $Id: winlogon.c,v 1.35 2004/10/11 21:08:05 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -65,7 +65,7 @@ PrintString (WCHAR* fmt,...)
} }
BOOL CALLBACK INT_PTR CALLBACK
ShutdownComputerProc (HWND hwndDlg, ShutdownComputerProc (HWND hwndDlg,
UINT uMsg, UINT uMsg,
WPARAM wParam, WPARAM wParam,

5
reactos/subsys/system/winlogon/wlx.c
View file

@ -1,4 +1,4 @@
/* $Id: wlx.c,v 1.5 2004/07/12 20:09:35 gvg Exp $ /* $Id: wlx.c,v 1.6 2004/10/11 21:08:05 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -521,8 +521,7 @@ GetMsGinaPath(WCHAR *path)
RegCloseKey(hKey); RegCloseKey(hKey);
} }
BOOL INT_PTR CALLBACK
CALLBACK
GinaLoadFailedProc( GinaLoadFailedProc(
HWND hwndDlg, HWND hwndDlg,
UINT uMsg, UINT uMsg,