17 modified files
reactos/include
diff -u -r1.62 -r1.63
--- funcs.h 19 Sep 2004 14:36:46 -0000 1.62
+++ funcs.h 26 Sep 2004 15:55:52 -0000 1.63
@@ -107,6 +107,8 @@
#define MessageBoxIndirect MessageBoxIndirectW
#define GetWindowLong GetWindowLongW
#define SetWindowLong SetWindowLongW
+#define GetWindowLongPtr GetWindowLongW
+#define SetWindowLongPtr SetWindowLongW
#define GetClassLong GetClassLongW
#define SetClassLong SetClassLongW
#define FindWindow FindWindowW
reactos/lib/aclui
diff -u -r1.6 -r1.7
--- aclui.c 14 Aug 2004 11:50:25 -0000 1.6
+++ aclui.c 26 Sep 2004 15:55:52 -0000 1.7
@@ -16,7 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: aclui.c,v 1.6 2004/08/14 11:50:25 weiden Exp $
+/* $Id: aclui.c,v 1.7 2004/09/26 15:55:52 weiden Exp $
*
* PROJECT: ReactOS Access Control List Editor
* FILE: lib/aclui/aclui.c
@@ -96,7 +96,7 @@
sp->hiUsrs = ImageList_LoadBitmap(hDllInstance, MAKEINTRESOURCE(IDB_USRGRPIMAGES), 16, 3, 0);
/* save the pointer to the structure */
- SetWindowLong(hwndDlg, DWL_USER, (LONG)sp);
+ SetWindowLongPtr(hwndDlg, DWL_USER, (DWORD_PTR)sp);
GetClientRect(sp->hWndUsrList, &rcLvClient);
reactos/lib/cpl/ncpa
diff -u -r1.2 -r1.3
--- ncpa.c 15 Aug 2004 16:50:30 -0000 1.2
+++ ncpa.c 26 Sep 2004 15:55:52 -0000 1.3
@@ -15,7 +15,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: ncpa.c,v 1.2 2004/08/15 16:50:30 kuehng Exp $
+/* $Id: ncpa.c,v 1.3 2004/09/26 15:55:52 weiden Exp $
*
* PROJECT: ReactOS Network Control Panel
* FILE: lib/cpl/system/ncpa.c
@@ -242,7 +242,7 @@
BOOL CALLBACK NICPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLong(hwndDlg,GWL_USERDATA);
+ PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA);
switch(uMsg)
{
case WM_INITDIALOG:
@@ -272,7 +272,7 @@
EnableWindow(GetDlgItem(hwndDlg,IDC_CONFIGURE),FALSE);
- SetWindowLong(hwndDlg,GWL_USERDATA,lParam);
+ SetWindowLongPtr(hwndDlg,GWL_USERDATA,(DWORD_PTR)lParam);
//SetDlgItemTextA(hwndDlg,IDC_NETCARDNAME,Info[pPage->lParam].Description);
EnumRegKeys(NICPropertyProtocolCallback,hwndDlg,HKEY_LOCAL_MACHINE,_T("System\\CurrentControlSet\\Control\\Network\\{4D36E975-E325-11CE-BFC1-08002BE10318}"));
@@ -434,7 +434,7 @@
{
PROPSHEETPAGE *psp= (PROPSHEETPAGE *)lParam;
EnableWindow(GetDlgItem(hwndDlg,IDC_ENDISABLE),FALSE);
- SetWindowLong(hwndDlg,DWL_USER,psp->lParam);
+ SetWindowLongPtr(hwndDlg,DWL_USER,(DWORD_PTR)psp->lParam);
}
break;
case WM_COMMAND:
reactos/lib/cpl/ncpa
diff -u -r1.1 -r1.2
--- tcpip_properties.c 15 Aug 2004 16:50:30 -0000 1.1
+++ tcpip_properties.c 26 Sep 2004 15:55:52 -0000 1.2
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: tcpip_properties.c,v 1.1 2004/08/15 16:50:30 kuehng Exp $
+/* $Id: tcpip_properties.c,v 1.2 2004/09/26 15:55:52 weiden Exp $
*
* PROJECT: ReactOS Network Control Panel
* FILE: lib/cpl/system/tcpip_properties.c
@@ -54,7 +54,7 @@
BOOL CALLBACK TCPIPPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLong(hwndDlg,GWL_USERDATA);
+ PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA);
IP_ADAPTER_INFO *pInfo = NULL;
if(pPage)
pInfo = (IP_ADAPTER_INFO *)pPage->lParam;
@@ -65,7 +65,7 @@
pPage = (PROPSHEETPAGE *)lParam;
pInfo = (IP_ADAPTER_INFO *)pPage->lParam;
EnableWindow(GetDlgItem(hwndDlg,IDC_ADVANCED),FALSE);
- SetWindowLong(hwndDlg,GWL_USERDATA,pPage->lParam);
+ SetWindowLongPtr(hwndDlg,GWL_USERDATA,(DWORD_PTR)pPage->lParam);
if(pInfo->DhcpEnabled) {
CheckDlgButton(hwndDlg,IDC_USEDHCP,BST_CHECKED);
reactos/lib/cpl/sysdm
diff -u -r1.3 -r1.4
--- environment.c 7 Jul 2004 09:42:58 -0000 1.3
+++ environment.c 26 Sep 2004 15:55:53 -0000 1.4
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: environment.c,v 1.3 2004/07/07 09:42:58 ekohl Exp $
+/* $Id: environment.c,v 1.4 2004/09/26 15:55:53 weiden Exp $
*
* PROJECT: ReactOS System Control Panel
* FILE: lib/cpl/sysdm/environment.c
@@ -52,12 +52,12 @@
DWORD dwNameLength;
DWORD dwValueLength;
- VarData = (PVARIABLE_DATA)GetWindowLong(hwndDlg, GWL_USERDATA);
+ VarData = (PVARIABLE_DATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA);
switch (uMsg)
{
case WM_INITDIALOG:
- SetWindowLong(hwndDlg, GWL_USERDATA, (LONG)lParam);
+ SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)lParam);
VarData = (PVARIABLE_DATA)lParam;
if (VarData->lpName != NULL)
reactos/lib/rosky/libskygi
diff -u -r1.11 -r1.12
--- libskygi.c 14 Aug 2004 10:47:19 -0000 1.11
+++ libskygi.c 26 Sep 2004 15:55:53 -0000 1.12
@@ -16,7 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: libskygi.c,v 1.11 2004/08/14 10:47:19 weiden Exp $
+/* $Id: libskygi.c,v 1.12 2004/09/26 15:55:53 weiden Exp $
*
* PROJECT: SkyOS GI library
* FILE: lib/libskygi/libskygi.c
@@ -481,7 +481,7 @@
/* loop until we found a message that a sky app would handle, too */
RtlZeroMemory(m, sizeof(s_gi_msg));
- if(Msg.hwnd != NULL && (msgwnd = (PSKY_WINDOW)GetWindowLongW(Msg.hwnd, GWL_USERDATA)))
+ if(Msg.hwnd != NULL && (msgwnd = (PSKY_WINDOW)GetWindowLongPtrW(Msg.hwnd, GWL_USERDATA)))
{
SkyMessage = IntIsSkyMessage(msgwnd, &Msg, m);
}
reactos/lib/syssetup
diff -u -r1.7 -r1.8
--- wizard.c 24 Sep 2004 18:51:52 -0000 1.7
+++ wizard.c 26 Sep 2004 15:55:53 -0000 1.8
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: wizard.c,v 1.7 2004/09/24 18:51:52 ekohl Exp $
+/* $Id: wizard.c,v 1.8 2004/09/26 15:55:53 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@@ -364,7 +364,7 @@
PSETUPDATA SetupData;
/* Retrieve pointer to the global setup data */
- SetupData = (PSETUPDATA)GetWindowLong (hwndDlg, GWL_USERDATA);
+ SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
switch (uMsg)
{
@@ -372,7 +372,7 @@
{
/* Save pointer to the global setup data */
SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
- SetWindowLong(hwndDlg, GWL_USERDATA, (LONG)SetupData);
+ SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData);
}
break;
@@ -415,7 +415,7 @@
PSETUPDATA SetupData;
/* Retrieve pointer to the global setup data */
- SetupData = (PSETUPDATA)GetWindowLong (hwndDlg, GWL_USERDATA);
+ SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
switch (uMsg)
{
@@ -423,7 +423,7 @@
{
/* Save pointer to the global setup data */
SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
- SetWindowLong(hwndDlg, GWL_USERDATA, (LONG)SetupData);
+ SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData);
}
break;
reactos/subsys/csrss/win32csr
diff -u -r1.20 -r1.21
--- guiconsole.c 10 Sep 2004 22:14:52 -0000 1.20
+++ guiconsole.c 26 Sep 2004 15:55:53 -0000 1.21
@@ -1,4 +1,4 @@
-/* $Id: guiconsole.c,v 1.20 2004/09/10 22:14:52 gvg Exp $
+/* $Id: guiconsole.c,v 1.21 2004/09/26 15:55:53 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@@ -53,7 +53,7 @@
static VOID FASTCALL
GuiConsoleGetDataPointers(HWND hWnd, PCSRSS_CONSOLE *Console, PGUI_CONSOLE_DATA *GuiData)
{
- *Console = (PCSRSS_CONSOLE) GetWindowLongW(hWnd, GWL_USERDATA);
+ *Console = (PCSRSS_CONSOLE) GetWindowLongPtrW(hWnd, GWL_USERDATA);
*GuiData = (NULL == *Console ? NULL : (*Console)->PrivateData);
}
@@ -140,7 +140,7 @@
GuiData->Selection.left = -1;
Console->PrivateData = GuiData;
- SetWindowLongW(hWnd, GWL_USERDATA, (LONG) Console);
+ SetWindowLongPtrW(hWnd, GWL_USERDATA, (DWORD_PTR) Console);
GetWindowRect(hWnd, &Rect);
Rect.right = Rect.left + Console->Size.X * GuiData->CharWidth +
reactos/subsys/system/regedit
diff -u -r1.14 -r1.15
--- edit.c 25 Jun 2004 23:47:04 -0000 1.14
+++ edit.c 26 Sep 2004 15:55:53 -0000 1.15
@@ -231,7 +231,7 @@
{
WNDPROC oldwndproc;
- oldwndproc = (WNDPROC)GetWindowLong(hwnd, GWL_USERDATA);
+ oldwndproc = (WNDPROC)GetWindowLongPtr(hwnd, GWL_USERDATA);
switch (uMsg)
{
@@ -285,9 +285,9 @@
/* subclass the edit control */
hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA);
- oldproc = (WNDPROC)GetWindowLong(hwndValue, GWL_WNDPROC);
- SetWindowLong(hwndValue, GWL_USERDATA, (LONG)oldproc);
- SetWindowLong(hwndValue, GWL_WNDPROC, (LONG)DwordEditSubclassProc);
+ oldproc = (WNDPROC)GetWindowLongPtr(hwndValue, GWL_WNDPROC);
+ SetWindowLongPtr(hwndValue, GWL_USERDATA, (DWORD_PTR)oldproc);
+ SetWindowLongPtr(hwndValue, GWL_WNDPROC, (DWORD_PTR)DwordEditSubclassProc);
if(editValueName && _tcscmp(editValueName, _T("")))
{
reactos/subsys/system/regedit
diff -u -r1.12 -r1.13
--- hexedit.c 9 Jul 2004 15:53:34 -0000 1.12
+++ hexedit.c 26 Sep 2004 15:55:53 -0000 1.13
@@ -502,7 +502,7 @@
hed->SplitSpacing = 2;
hed->EditingField = TRUE; /* in hexdump field */
- SetWindowLong(hWnd, 0, (LONG)hed);
+ SetWindowLongPtr(hWnd, 0, (DWORD_PTR)hed);
HEXEDIT_Update(hed);
return TRUE;
@@ -522,7 +522,7 @@
DeleteObject(hed->hFont);
}
- SetWindowLong(hed->hWndSelf, 0, 0);
+ SetWindowLongPtr(hed->hWndSelf, 0, (DWORD_PTR)0);
HeapFree(GetProcessHeap(), 0, hed);
return 0;
@@ -864,7 +864,7 @@
{
PHEXEDIT_DATA hed;
- hed = (PHEXEDIT_DATA)GetWindowLong(hWnd, 0);
+ hed = (PHEXEDIT_DATA)GetWindowLongPtr(hWnd, (DWORD_PTR)0);
switch(uMsg)
{
case WM_ERASEBKGND:
reactos/subsys/system/taskmgr
diff -u -r1.4 -r1.5
--- perfpage.c 22 Sep 2004 19:53:14 -0000 1.4
+++ perfpage.c 26 Sep 2004 15:55:53 -0000 1.5
@@ -198,10 +198,10 @@
/*
* Subclass graph buttons
*/
- OldGraphWndProc = SetWindowLong(hPerformancePageCpuUsageGraph, GWL_WNDPROC, (LONG)Graph_WndProc);
- SetWindowLong(hPerformancePageMemUsageGraph, GWL_WNDPROC, (LONG)Graph_WndProc);
- OldGraphCtrlWndProc = SetWindowLong(hPerformancePageMemUsageHistoryGraph, GWL_WNDPROC, (LONG)GraphCtrl_WndProc);
- SetWindowLong(hPerformancePageCpuUsageHistoryGraph, GWL_WNDPROC, (LONG)GraphCtrl_WndProc);
+ OldGraphWndProc = SetWindowLongPtr(hPerformancePageCpuUsageGraph, GWL_WNDPROC, (DWORD_PTR)Graph_WndProc);
+ SetWindowLongPtr(hPerformancePageMemUsageGraph, GWL_WNDPROC, (DWORD_PTR)Graph_WndProc);
+ OldGraphCtrlWndProc = SetWindowLongPtr(hPerformancePageMemUsageHistoryGraph, GWL_WNDPROC, (DWORD_PTR)GraphCtrl_WndProc);
+ SetWindowLongPtr(hPerformancePageCpuUsageHistoryGraph, GWL_WNDPROC, (DWORD_PTR)GraphCtrl_WndProc);
return TRUE;
case WM_COMMAND:
reactos/subsys/system/taskmgr
diff -u -r1.2 -r1.3
--- proclist.c 15 Aug 2004 22:40:34 -0000 1.2
+++ proclist.c 26 Sep 2004 15:55:53 -0000 1.3
@@ -36,7 +36,7 @@
LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
-LONG OldProcessListWndProc;
+WNDPROC OldProcessListWndProc;
LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
reactos/subsys/system/taskmgr
diff -u -r1.1 -r1.2
--- proclist.h 10 Jan 2004 02:14:13 -0000 1.1
+++ proclist.h 26 Sep 2004 15:55:53 -0000 1.2
@@ -25,6 +25,6 @@
LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
-extern LONG OldProcessListWndProc;
+extern WNDPROC OldProcessListWndProc;
#endif /* __PROCLIST_H */
reactos/subsys/system/taskmgr
diff -u -r1.4 -r1.5
--- procpage.c 15 Aug 2004 22:40:34 -0000 1.4
+++ procpage.c 26 Sep 2004 15:55:53 -0000 1.5
@@ -92,7 +92,7 @@
/*
* Subclass the process list control so we can intercept WM_ERASEBKGND
*/
- OldProcessListWndProc = SetWindowLong(hProcessPageListCtrl, GWL_WNDPROC, (LONG)ProcessListWndProc);
+ OldProcessListWndProc = (WNDPROC)SetWindowLongPtr(hProcessPageListCtrl, GWL_WNDPROC, (DWORD_PTR)ProcessListWndProc);
/* Start our refresh thread */
CreateThread(NULL, 0, ProcessPageRefreshThread, NULL, 0, NULL);
reactos/subsys/system/welcome
diff -u -r1.5 -r1.6
--- Makefile 21 Dec 2003 14:38:25 -0000 1.5
+++ Makefile 26 Sep 2004 15:55:53 -0000 1.6
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 2003/12/21 14:38:25 ekohl Exp $
+# $Id: Makefile,v 1.6 2004/09/26 15:55:53 weiden Exp $
PATH_TO_TOP = ../../..
@@ -10,7 +10,7 @@
TARGET_INSTALLDIR = system32
-TARGET_CFLAGS = -Wall -Werror
+TARGET_CFLAGS = -Wall -Werror -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -D__USE_W32API
TARGET_SDKLIBS = kernel32.a gdi32.a user32.a
reactos/subsys/system/welcome
diff -u -r1.5 -r1.6
--- welcome.c 21 Dec 2003 16:24:19 -0000 1.5
+++ welcome.c 26 Sep 2004 15:55:53 -0000 1.6
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: welcome.c,v 1.5 2003/12/21 16:24:19 weiden Exp $
+/* $Id: welcome.c,v 1.6 2004/09/26 15:55:53 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS welcome/autorun application
@@ -278,7 +278,7 @@
static VOID
SubclassButton(HWND hWnd)
{
- fnOldBtn = (WNDPROC)SetWindowLong(hWnd, GWL_WNDPROC, (LPARAM)ButtonSubclassWndProc);
+ fnOldBtn = (WNDPROC)SetWindowLongPtr(hWnd, GWL_WNDPROC, (DWORD_PTR)ButtonSubclassWndProc);
}
reactos/subsys/system/winlogon
diff -u -r1.2 -r1.3
--- sas.c 12 Jul 2004 20:09:35 -0000 1.2
+++ sas.c 26 Sep 2004 15:55:53 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Id: sas.c,v 1.2 2004/07/12 20:09:35 gvg Exp $
+/* $Id: sas.c,v 1.3 2004/09/26 15:55:53 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -158,7 +158,7 @@
LRESULT CALLBACK
SASProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- PWLSESSION Session = (PWLSESSION)GetWindowLong(hwnd, GWL_USERDATA);
+ PWLSESSION Session = (PWLSESSION)GetWindowLongPtr(hwnd, GWL_USERDATA);
if(!Session)
{
return DefWindowProc(hwnd, uMsg, wParam, lParam);
@@ -231,7 +231,7 @@
}
/* Save the Session pointer so the window proc can access it */
- SetWindowLong(Session->SASWindow, GWL_USERDATA, (LONG)Session);
+ SetWindowLongPtr(Session->SASWindow, GWL_USERDATA, (DWORD_PTR)Session);
/* Register SAS window to receive SAS notifications */
if(!SetLogonNotifyWindow(Session->SASWindow, Session->InteractiveWindowStation))
CVSspam 0.2.8