9 May
2009
9 May
'09
12:18 p.m.
Author: dchapyshev
Date: Sat May 9 16:18:13 2009
New Revision: 40863
URL: http://svn.reactos.org/svn/reactos?rev=40863&view=rev
Log:
- SetWindowLong -> SetWindowLongPtr, GetWindowLong -> GetWindowLongPtr (for 64-bit
compatible, see note in MSDN)
Part 3/x
Modified:
trunk/reactos/base/applications/calc/winmain.c
trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp
trunk/reactos/base/applications/mscutils/servman/listview.c
trunk/reactos/base/applications/mstsc/win32.c
trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp
trunk/reactos/base/applications/regedit/find.c
trunk/reactos/base/applications/regedit/hexedit.c
trunk/reactos/base/applications/taskmgr/applpage.c
trunk/reactos/base/applications/taskmgr/graph.c
trunk/reactos/base/applications/taskmgr/optnmenu.c
trunk/reactos/base/applications/taskmgr/taskmgr.c
trunk/reactos/base/setup/reactos/reactos.c
trunk/reactos/base/setup/vmwinst/vmwinst.c
trunk/reactos/base/setup/welcome/welcome.c
trunk/reactos/base/shell/explorer-new/explorer.c
trunk/reactos/base/shell/explorer-new/taskswnd.c
trunk/reactos/base/shell/explorer-new/trayntfy.c
trunk/reactos/base/shell/explorer-new/traywnd.c
trunk/reactos/base/shell/explorer/dialogs/settings.cpp
trunk/reactos/base/shell/explorer/utility/utility.h
trunk/reactos/base/shell/explorer/utility/window.cpp
Modified: trunk/reactos/base/applications/calc/winmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win…
==============================================================================
--- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Sat May 9 16:18:13 2009
@@ -302,7 +302,7 @@
return 1;
if (!_tcscmp(ClassName, TEXT("Button"))) {
- DWORD dwStyle = GetWindowLong(hCtlWnd, GWL_STYLE) & 0xF;
+ DWORD dwStyle = GetWindowLongPtr(hCtlWnd, GWL_STYLE) & 0xF;
/* Set states for press/release, but only for push buttons */
if (dwStyle == BS_PUSHBUTTON || dwStyle == BS_DEFPUSHBUTTON || dwStyle ==
BS_OWNERDRAW) {
@@ -1136,7 +1136,7 @@
popup.rcMargins.bottom = -1;
popup.rcMargins.left = -1;
popup.rcMargins.right = -1;
- popup.idString = GetWindowLong((HWND)wp, GWL_ID);
+ popup.idString = GetWindowLongPtr((HWND)wp, GWL_ID);
HtmlHelp((HWND)wp, HTMLHELP_PATH("/popups.txt"), HH_DISPLAY_TEXT_POPUP,
(DWORD_PTR)&popup);
}
#endif
Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp [iso-8859-1]
Sat May 9 16:18:13 2009
@@ -275,7 +275,7 @@
//
LRESULT CALLBACK CardWindow::CardWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM
lParam)
{
- CardWindow *cw = (CardWindow *)GetWindowLong(hwnd, 0);
+ CardWindow *cw = (CardWindow *)GetWindowLongPtr(hwnd, 0);
return cw->WndProc(hwnd, iMsg, wParam, lParam);
}
@@ -366,7 +366,7 @@
//
// associate this class with the window
//
- SetWindowLong(hwnd, 0, (LONG_PTR)cs->lpCreateParams);
+ SetWindowLongPtr(hwnd, 0, (LONG_PTR)cs->lpCreateParams);
return 1;
Modified: trunk/reactos/base/applications/mscutils/servman/listview.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/listview.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/servman/listview.c [iso-8859-1] Sat May 9
16:18:13 2009
@@ -14,13 +14,13 @@
SetListViewStyle(HWND hListView,
DWORD View)
{
- DWORD Style = GetWindowLong(hListView, GWL_STYLE);
+ DWORD Style = GetWindowLongPtr(hListView, GWL_STYLE);
if ((Style & LVS_TYPEMASK) != View)
{
- SetWindowLong(hListView,
- GWL_STYLE,
- (Style & ~LVS_TYPEMASK) | View);
+ SetWindowLongPtr(hListView,
+ GWL_STYLE,
+ (Style & ~LVS_TYPEMASK) | View);
}
}
Modified: trunk/reactos/base/applications/mstsc/win32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi…
==============================================================================
--- trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] Sat May 9 16:18:13 2009
@@ -520,11 +520,11 @@
height = (prect->bottom - prect->top) - (g_yoff + g_xoff);
if (height < g_height || width < g_width)
{
- style = GetWindowLong(g_Wnd, GWL_STYLE);
+ style = GetWindowLongPtr(g_Wnd, GWL_STYLE);
if (!(style & WS_HSCROLL))
{
style |= WS_HSCROLL | WS_VSCROLL;
- SetWindowLong(g_Wnd, GWL_STYLE, style);
+ SetWindowLongPtr(g_Wnd, GWL_STYLE, style);
g_xscroll = 0;
g_yscroll = 0;
SetScrollPos(g_Wnd, SB_HORZ, g_xscroll, 1);
@@ -533,12 +533,12 @@
}
else if (height >= g_height && width >= g_width)
{
- style = GetWindowLong(g_Wnd, GWL_STYLE);
+ style = GetWindowLongPtr(g_Wnd, GWL_STYLE);
if (style & WS_HSCROLL)
{
style &= ~WS_HSCROLL;
style &= ~WS_VSCROLL;
- SetWindowLong(g_Wnd, GWL_STYLE, style);
+ SetWindowLongPtr(g_Wnd, GWL_STYLE, style);
g_xscroll = 0;
g_yscroll = 0;
}
Modified: trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp [iso-8859-1] Sat May 9
16:18:13 2009
@@ -152,7 +152,7 @@
#else
// load the icon from the resource file -crn(a)ozemail.com.au 16/12/98
if(!hIcon) {
- hIcon = LoadIcon ((HANDLE)GetWindowLong(hConsoleWindow,
+ hIcon = LoadIcon ((HANDLE)GetWindowLongPtr(hConsoleWindow,
GWL_HINSTANCE), "TELNETICON");
}
#endif
Modified: trunk/reactos/base/applications/regedit/find.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/…
==============================================================================
--- trunk/reactos/base/applications/regedit/find.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/find.c [iso-8859-1] Sat May 9 16:18:13 2009
@@ -192,16 +192,16 @@
hControl = GetDlgItem(hDlg, IDC_LOOKAT_VALUES);
if (hControl)
{
- lStyle = GetWindowLong(hControl, GWL_STYLE);
- SetWindowLong(hControl, GWL_STYLE, lStyle | WS_DISABLED);
+ lStyle = GetWindowLongPtr(hControl, GWL_STYLE);
+ SetWindowLongPtr(hControl, GWL_STYLE, lStyle | WS_DISABLED);
}
/* Looking at data is not yet implemented */
hControl = GetDlgItem(hDlg, IDC_LOOKAT_DATA);
if (hControl)
{
- lStyle = GetWindowLong(hControl, GWL_STYLE);
- SetWindowLong(hControl, GWL_STYLE, lStyle | WS_DISABLED);
+ lStyle = GetWindowLongPtr(hControl, GWL_STYLE);
+ SetWindowLongPtr(hControl, GWL_STYLE, lStyle | WS_DISABLED);
}
/* Match whole string */
@@ -278,12 +278,12 @@
hControl = GetDlgItem(hDlg, IDOK);
if (hControl)
{
- lStyle = GetWindowLong(hControl, GWL_STYLE);
+ lStyle = GetWindowLongPtr(hControl, GWL_STYLE);
if (s_szSavedFindValue[0])
lStyle &= ~WS_DISABLED;
else
lStyle |= WS_DISABLED;
- SetWindowLong(hControl, GWL_STYLE, lStyle);
+ SetWindowLongPtr(hControl, GWL_STYLE, lStyle);
RedrawWindow(hControl, NULL, NULL, RDW_INVALIDATE);
}
break;
Modified: trunk/reactos/base/applications/regedit/hexedit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/…
==============================================================================
--- trunk/reactos/base/applications/regedit/hexedit.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/hexedit.c [iso-8859-1] Sat May 9 16:18:13
2009
@@ -126,7 +126,7 @@
INT bufsize, cvislines;
GetClientRect(hed->hWndSelf, &rcClient);
- hed->style = GetWindowLong(hed->hWndSelf, GWL_STYLE);
+ hed->style = GetWindowLongPtr(hed->hWndSelf, GWL_STYLE);
bufsize = (hed->hBuffer ? (INT) LocalSize(hed->hBuffer) : 0);
hed->nLines = max(bufsize / hed->ColumnsPerLine, 1);
Modified: trunk/reactos/base/applications/taskmgr/applpage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] Sat May 9 16:18:13
2009
@@ -220,7 +220,7 @@
void UpdateApplicationListControlViewSetting(void)
{
- DWORD dwStyle = GetWindowLongW(hApplicationPageListCtrl, GWL_STYLE);
+ DWORD dwStyle = GetWindowLongPtrW(hApplicationPageListCtrl, GWL_STYLE);
dwStyle &= ~(LVS_REPORT | LVS_ICON | LVS_LIST | LVS_SMALLICON);
@@ -229,7 +229,7 @@
case ID_VIEW_SMALL: dwStyle |= LVS_SMALLICON; break;
case ID_VIEW_DETAILS: dwStyle |= LVS_REPORT; break;
}
- SetWindowLongW(hApplicationPageListCtrl, GWL_STYLE, dwStyle);
+ SetWindowLongPtrW(hApplicationPageListCtrl, GWL_STYLE, dwStyle);
RefreshApplicationPage();
}
@@ -298,7 +298,7 @@
!IsWindowVisible(hWnd) ||
(GetParent(hWnd) != NULL) ||
(GetWindow(hWnd, GW_OWNER) != NULL) ||
- (GetWindowLongW(hWnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW))
+ (GetWindowLongPtrW(hWnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW))
{
return TRUE; /* Skip this window */
}
@@ -422,7 +422,7 @@
!IsWindowVisible(pAPLI->hWnd) ||
(GetParent(pAPLI->hWnd) != NULL) ||
(GetWindow(pAPLI->hWnd, GW_OWNER) != NULL) ||
- (GetWindowLongW(hWnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW))
+ (GetWindowLongPtrW(hWnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW))
{
ImageList_Remove(hImageListLarge, item.iItem);
ImageList_Remove(hImageListSmall, item.iItem);
Modified: trunk/reactos/base/applications/taskmgr/graph.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/graph.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/graph.c [iso-8859-1] Sat May 9 16:18:13 2009
@@ -102,7 +102,7 @@
hdc = BeginPaint(hWnd, &ps);
- WindowId = GetWindowLongW(hWnd, GWL_ID);
+ WindowId = GetWindowLongPtrW(hWnd, GWL_ID);
switch (WindowId)
{
Modified: trunk/reactos/base/applications/taskmgr/optnmenu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/optnmenu.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/optnmenu.c [iso-8859-1] Sat May 9 16:18:13
2009
@@ -40,7 +40,7 @@
* Check or uncheck the always on top menu item
* and update main window.
*/
- if ((GetWindowLongW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0)
+ if ((GetWindowLongPtrW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0)
{
CheckMenuItem(hOptionsMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND|MF_UNCHECKED);
TaskManagerSettings.AlwaysOnTop = FALSE;
Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Sat May 9 16:18:13
2009
@@ -250,7 +250,7 @@
GetCursorPos(&pt);
- OnTop = ((GetWindowLongW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0);
+ OnTop = ((GetWindowLongPtrW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) !=
0);
hMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(IDR_TRAY_POPUP));
hPopupMenu = GetSubMenu(hMenu, 0);
@@ -758,7 +758,7 @@
hMenu = GetMenu(hMainWnd);
hOptionsMenu = GetSubMenu(hMenu, OPTIONS_MENU_INDEX);
- OnTop = ((GetWindowLongW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0);
+ OnTop = ((GetWindowLongPtrW(hMainWnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0);
OpenIcon(hMainWnd);
SetForegroundWindow(hMainWnd);
Modified: trunk/reactos/base/setup/reactos/reactos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos…
==============================================================================
--- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Sat May 9 16:18:13 2009
@@ -194,8 +194,8 @@
/* Center the wizard window */
CenterWindow (hwndControl);
- dwStyle = GetWindowLong(hwndControl, GWL_STYLE);
- SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
+ dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
+ SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
/* Hide and disable the 'Cancel' button at the moment,
* we use this button to cancel the setup process
@@ -259,8 +259,8 @@
hwndControl = GetParent(hwndDlg);
- dwStyle = GetWindowLong(hwndControl, GWL_STYLE);
- SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
+ dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
+ SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL);
ShowWindow (hwndControl, SW_SHOW);
@@ -349,9 +349,9 @@
break;
case PSN_QUERYCANCEL:
- SetWindowLong(hwndDlg,
- DWL_MSGRESULT,
- MessageBox(GetParent(hwndDlg),
+ SetWindowLongPtr(hwndDlg,
+ DWL_MSGRESULT,
+ MessageBox(GetParent(hwndDlg),
abort_msg,
abort_title,
MB_YESNO | MB_ICONQUESTION) != IDYES);
@@ -408,8 +408,8 @@
hwndControl = GetParent(hwndDlg);
- dwStyle = GetWindowLong(hwndControl, GWL_STYLE);
- SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
+ dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
+ SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
CheckDlgButton(hwndDlg, IDC_INSTALL, BST_CHECKED);
@@ -433,9 +433,9 @@
break;
case PSN_QUERYCANCEL:
- SetWindowLong(hwndDlg,
- DWL_MSGRESULT,
- MessageBox(GetParent(hwndDlg),
+ SetWindowLongPtr(hwndDlg,
+ DWL_MSGRESULT,
+ MessageBox(GetParent(hwndDlg),
abort_msg,
abort_title,
MB_YESNO | MB_ICONQUESTION) != IDYES);
@@ -480,8 +480,8 @@
hwndControl = GetParent(hwndDlg);
- dwStyle = GetWindowLong(hwndControl, GWL_STYLE);
- SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
+ dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
+ SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
/* Set title font */
/*SendDlgItemMessage(hwndDlg,
@@ -530,9 +530,9 @@
break;
case PSN_QUERYCANCEL:
- SetWindowLong(hwndDlg,
- DWL_MSGRESULT,
- MessageBox(GetParent(hwndDlg),
+ SetWindowLongPtr(hwndDlg,
+ DWL_MSGRESULT,
+ MessageBox(GetParent(hwndDlg),
abort_msg,
abort_title,
MB_YESNO | MB_ICONQUESTION) != IDYES);
@@ -680,8 +680,8 @@
hwndControl = GetParent(hwndDlg);
- dwStyle = GetWindowLong(hwndControl, GWL_STYLE);
- SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
+ dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
+ SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
/* Set title font */
/*SendDlgItemMessage(hwndDlg,
@@ -762,9 +762,9 @@
break;
case PSN_QUERYCANCEL:
- SetWindowLong(hwndDlg,
- DWL_MSGRESULT,
- MessageBox(GetParent(hwndDlg),
+ SetWindowLongPtr(hwndDlg,
+ DWL_MSGRESULT,
+ MessageBox(GetParent(hwndDlg),
abort_msg,
abort_title,
MB_YESNO | MB_ICONQUESTION) != IDYES);
@@ -799,8 +799,8 @@
hwndControl = GetParent(hwndDlg);
- dwStyle = GetWindowLong(hwndControl, GWL_STYLE);
- SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
+ dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
+ SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL);
ShowWindow(hwndControl, SW_HIDE);
@@ -853,8 +853,8 @@
hwndControl = GetParent(hwndDlg);
- dwStyle = GetWindowLong(hwndControl, GWL_STYLE);
- SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
+ dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
+ SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL);
ShowWindow(hwndControl, SW_HIDE);
@@ -910,8 +910,8 @@
hwndControl = GetParent(hwndDlg);
- dwStyle = GetWindowLong(hwndControl, GWL_STYLE);
- SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
+ dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
+ SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
/* Set title font */
/*SendDlgItemMessage(hwndDlg,
Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst…
==============================================================================
--- trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Sat May 9 16:18:13 2009
@@ -389,7 +389,7 @@
{
if(DriverFilesFound)
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CONFIG);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_CONFIG);
return TRUE;
}
break;
@@ -421,7 +421,7 @@
PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
break;
case PSN_WIZNEXT:
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_INSTALLING_VMWARE_TOOLS);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_INSTALLING_VMWARE_TOOLS);
break;
}
break;
@@ -567,13 +567,13 @@
{
PropSheet_SetWizButtons(GetParent(hwndDlg), 0);
InstTerminateInstaller(FALSE);
- SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1);
return -1;
}
else
{
SendDlgItemMessage(hwndDlg, IDC_INSTALLINGPROGRESS, PBM_SETMARQUEE,
FALSE, 0);
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_INSERT_VMWARE_TOOLS);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_INSERT_VMWARE_TOOLS);
}
break;
}
@@ -713,12 +713,12 @@
{
if(StartVMwConfigWizard)
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION);
return TRUE;
}
if(DriverFilesFound)
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_WELCOMEPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_WELCOMEPAGE);
return TRUE;
}
break;
@@ -797,7 +797,7 @@
break;
case PSN_WIZBACK:
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION);
return TRUE;
}
case PSN_WIZNEXT:
@@ -815,7 +815,7 @@
UninstallDriver = (i == IDC_UNINSTALL);
- SetWindowLong(hwndDlg, DWL_MSGRESULT, SelPage[i -
IDC_CONFIGSETTINGS]);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, SelPage[i -
IDC_CONFIGSETTINGS]);
return TRUE;
}
}
@@ -849,7 +849,7 @@
break;
case PSN_WIZBACK:
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION);
return TRUE;
}
case PSN_WIZNEXT:
@@ -876,7 +876,7 @@
WCHAR Msg[1024];
LoadString(hAppInstance, (ActivateVBE ? IDS_FAILEDTOSELVBEDRIVER
: IDS_FAILEDTOSELVGADRIVER), Msg, sizeof(Msg) / sizeof(WCHAR));
MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING);
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTDRIVER);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_SELECTDRIVER);
return TRUE;
}
break;
@@ -925,7 +925,7 @@
WCHAR Msg[1024];
LoadString(hAppInstance, (ActivateVBE ?
IDS_FAILEDTOSELVBEDRIVER : IDS_FAILEDTOSELVGADRIVER), Msg, sizeof(Msg) / sizeof(WCHAR));
MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING);
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTDRIVER);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_SELECTDRIVER);
return TRUE;
}
ShowUninstNotice(GetParent(hwndDlg));
Modified: trunk/reactos/base/setup/welcome/welcome.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome…
==============================================================================
--- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Sat May 9 16:18:13 2009
@@ -222,7 +222,7 @@
if (uMsg == WM_MOUSEMOVE)
{
- i = GetWindowLong(hWnd, GWL_ID);
+ i = GetWindowLongPtr(hWnd, GWL_ID);
if (nTopic != i)
{
nTopic = i;
Modified: trunk/reactos/base/shell/explorer-new/explorer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex…
==============================================================================
--- trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] Sat May 9 16:18:13
2009
@@ -38,17 +38,17 @@
ASSERT((~dwStyleMask & dwStyle) == 0);
- PrevStyle = GetWindowLong(hWnd,
- GWL_STYLE);
+ PrevStyle = GetWindowLongPtr(hWnd,
+ GWL_STYLE);
if (PrevStyle != 0 &&
(PrevStyle & dwStyleMask) != dwStyle)
{
Style = PrevStyle & ~dwStyleMask;
Style |= dwStyle;
- PrevStyle = SetWindowLong(hWnd,
- GWL_STYLE,
- Style);
+ PrevStyle = SetWindowLongPtr(hWnd,
+ GWL_STYLE,
+ Style);
}
return PrevStyle;
@@ -63,17 +63,17 @@
ASSERT((~dwStyleMask & dwStyle) == 0);
- PrevStyle = GetWindowLong(hWnd,
- GWL_EXSTYLE);
+ PrevStyle = GetWindowLongPtr(hWnd,
+ GWL_EXSTYLE);
if (PrevStyle != 0 &&
(PrevStyle & dwStyleMask) != dwStyle)
{
Style = PrevStyle & ~dwStyleMask;
Style |= dwStyle;
- PrevStyle = SetWindowLong(hWnd,
- GWL_EXSTYLE,
- Style);
+ PrevStyle = SetWindowLongPtr(hWnd,
+ GWL_EXSTYLE,
+ Style);
}
return PrevStyle;
Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta…
==============================================================================
--- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Sat May 9 16:18:13
2009
@@ -1326,8 +1326,8 @@
/* Don't list popup windows and also no tool windows */
if (GetWindow(hWnd,
GW_OWNER) == NULL &&
- !(GetWindowLong(hWnd,
- GWL_EXSTYLE) & WS_EX_TOOLWINDOW))
+ !(GetWindowLongPtr(hWnd,
+ GWL_EXSTYLE) & WS_EX_TOOLWINDOW))
{
TaskSwitchWnd_AddTask(This,
hWnd);
Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr…
==============================================================================
--- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Sat May 9 16:18:13
2009
@@ -269,8 +269,8 @@
NMHDR nmh;
nmh.hwndFrom = This->hWnd;
- nmh.idFrom = GetWindowLong(This->hWnd,
- GWL_ID);
+ nmh.idFrom = GetWindowLongPtr(This->hWnd,
+ GWL_ID);
nmh.code = NTNWM_REALIGN;
SendMessage(This->hWndNotify,
@@ -716,11 +716,11 @@
RECT rcClient = { 0, 0, 0, 0 };
if (AdjustWindowRectEx(&rcClient,
- GetWindowLong(This->hWnd,
- GWL_STYLE),
+ GetWindowLongPtr(This->hWnd,
+ GWL_STYLE),
FALSE,
- GetWindowLong(This->hWnd,
- GWL_EXSTYLE)))
+ GetWindowLongPtr(This->hWnd,
+ GWL_EXSTYLE)))
{
This->szNonClient.cx = rcClient.right - rcClient.left;
This->szNonClient.cy = rcClient.bottom - rcClient.top;
Modified: trunk/reactos/base/shell/explorer-new/traywnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr…
==============================================================================
--- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Sat May 9 16:18:13 2009
@@ -362,11 +362,11 @@
RECT rcMin = {0};
AdjustWindowRectEx(&rcMin,
- GetWindowLong(This->hWnd,
- GWL_STYLE),
+ GetWindowLongPtr(This->hWnd,
+ GWL_STYLE),
FALSE,
- GetWindowLong(This->hWnd,
- GWL_EXSTYLE));
+ GetWindowLongPtr(This->hWnd,
+ GWL_EXSTYLE));
*pRect = rcMin;
}
Modified: trunk/reactos/base/shell/explorer/dialogs/settings.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/dialog…
==============================================================================
--- trunk/reactos/base/shell/explorer/dialogs/settings.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/dialogs/settings.cpp [iso-8859-1] Sat May 9
16:18:13 2009
@@ -104,7 +104,7 @@
{
switch(pnmh->code) {
case PSN_QUERYINITIALFOCUS:
- SetWindowLong(_hwnd, DWL_MSGRESULT, (LPARAM)GetDlgItem(_hwnd,
IDC_ICON_ALIGN_0+_alignment_cur));
+ SetWindowLongPtr(_hwnd, DWL_MSGRESULT, (LPARAM)GetDlgItem(_hwnd,
IDC_ICON_ALIGN_0+_alignment_cur));
break;
case PSN_APPLY:
Modified: trunk/reactos/base/shell/explorer/utility/utility.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit…
==============================================================================
--- trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] Sat May 9 16:18:13
2009
@@ -143,9 +143,9 @@
#endif
-#define SetDlgCtrlID(hwnd, id) SetWindowLong(hwnd, GWL_ID, id)
-#define SetWindowStyle(hwnd, val) (DWORD)SetWindowLong(hwnd, GWL_STYLE, val)
-#define SetWindowExStyle(h, val) (DWORD)SetWindowLong(hwnd, GWL_EXSTYLE, val)
+#define SetDlgCtrlID(hwnd, id) SetWindowLongPtr(hwnd, GWL_ID, id)
+#define SetWindowStyle(hwnd, val) (DWORD)SetWindowLongPtr(hwnd, GWL_STYLE, val)
+#define SetWindowExStyle(h, val) (DWORD)SetWindowLongPtr(hwnd, GWL_EXSTYLE, val)
#define Window_SetIcon(hwnd, type, hicon) (HICON)SendMessage(hwnd, WM_SETICON, type,
(LPARAM)(hicon))
Modified: trunk/reactos/base/shell/explorer/utility/window.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit…
==============================================================================
--- trunk/reactos/base/shell/explorer/utility/window.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/utility/window.cpp [iso-8859-1] Sat May 9 16:18:13
2009
@@ -732,7 +732,7 @@
return TRUE; // message has been processed
case WM_NOTIFYFORMAT:
- SetWindowLong(hwnd, DWLP_MSGRESULT, NFR_CURRENT); // set return value NFR_CURRENT
+ SetWindowLongPtr(hwnd, DWLP_MSGRESULT, NFR_CURRENT); // set return value NFR_CURRENT
return TRUE; // message has been processed
case WM_NCDESTROY:
@@ -1418,7 +1418,7 @@
return TRUE; // message has been processed
case WM_NOTIFYFORMAT:
- SetWindowLong(hwnd, DWLP_MSGRESULT, NFR_CURRENT); // set return value NFR_CURRENT
+ SetWindowLongPtr(hwnd, DWLP_MSGRESULT, NFR_CURRENT); // set return value NFR_CURRENT
return TRUE; // message has been processed
case WM_NCDESTROY: