9 May
2009
9 May
'09
12:27 p.m.
Author: dchapyshev
Date: Sat May 9 16:27:40 2009
New Revision: 40864
URL: http://svn.reactos.org/svn/reactos?rev=40864&view=rev
Log:
- SetWindowLong -> SetWindowLongPtr, GetWindowLong -> GetWindowLongPtr (for 64-bit
compatible, see note in MSDN)
Part 4/x
Modified:
trunk/reactos/dll/cpl/access/display.c
trunk/reactos/dll/cpl/access/mouse.c
trunk/reactos/dll/cpl/appwiz/createlink.c
trunk/reactos/dll/cpl/appwiz/remove.c
trunk/reactos/dll/cpl/console/colors.c
trunk/reactos/dll/cpl/console/console.c
trunk/reactos/dll/cpl/console/options.c
trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c
trunk/reactos/dll/cpl/timedate/timezone.c
trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c
trunk/reactos/dll/shellext/deskadp/deskadp.c
trunk/reactos/dll/shellext/deskmon/deskmon.c
trunk/reactos/dll/win32/browseui/bandsite.c
trunk/reactos/dll/win32/netshell/lanstatusui.c
trunk/reactos/dll/win32/newdev/wizard.c
trunk/reactos/dll/win32/shell32/dialogs.c
trunk/reactos/dll/win32/shell32/drive.c
trunk/reactos/dll/win32/shell32/folder_options.c
trunk/reactos/dll/win32/shell32/fprop.c
trunk/reactos/dll/win32/shell32/she_ocmenu.c
trunk/reactos/dll/win32/shell32/shelllink.c
trunk/reactos/dll/win32/shell32/shellole.c
trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c
trunk/reactos/dll/win32/shell32/shlview.c
trunk/reactos/dll/win32/shimgvw/shimgvw.c
trunk/reactos/dll/win32/shlwapi/ordinal.c
trunk/reactos/dll/win32/syssetup/wizard.c
trunk/reactos/dll/win32/user32/controls/button.c
trunk/reactos/dll/win32/user32/controls/combo.c
trunk/reactos/dll/win32/user32/controls/edit.c
trunk/reactos/dll/win32/user32/controls/icontitle.c
trunk/reactos/dll/win32/user32/controls/listbox.c
trunk/reactos/dll/win32/user32/controls/scrollbar.c
trunk/reactos/dll/win32/user32/controls/static.c
trunk/reactos/dll/win32/user32/windows/defwnd.c
trunk/reactos/dll/win32/user32/windows/dialog.c
trunk/reactos/dll/win32/user32/windows/input.c
trunk/reactos/dll/win32/user32/windows/mdi.c
trunk/reactos/dll/win32/user32/windows/menu.c
trunk/reactos/dll/win32/user32/windows/message.c
trunk/reactos/dll/win32/user32/windows/nonclient.c
trunk/reactos/dll/win32/user32/windows/window.c
trunk/reactos/dll/win32/user32/windows/winpos.c
Modified: trunk/reactos/dll/cpl/access/display.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/display.c?r…
==============================================================================
--- trunk/reactos/dll/cpl/access/display.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/access/display.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -197,7 +197,7 @@
break;
case WM_HSCROLL:
- switch (GetWindowLong((HWND) lParam, GWL_ID))
+ switch (GetWindowLongPtr((HWND) lParam, GWL_ID))
{
case IDC_CURSOR_BLINK_TRACK:
i = SendDlgItemMessage(hwndDlg, IDC_CURSOR_BLINK_TRACK, TBM_GETPOS,
0, 0);
Modified: trunk/reactos/dll/cpl/access/mouse.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev…
==============================================================================
--- trunk/reactos/dll/cpl/access/mouse.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/access/mouse.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -88,7 +88,7 @@
break;
case WM_HSCROLL:
- switch (GetWindowLong((HWND) lParam, GWL_ID))
+ switch (GetWindowLongPtr((HWND) lParam, GWL_ID))
{
case IDC_MOUSEKEYS_SPEED_TRACK:
i = SendDlgItemMessage(hwndDlg, IDC_MOUSEKEYS_SPEED_TRACK,
TBM_GETPOS, 0, 0);
Modified: trunk/reactos/dll/cpl/appwiz/createlink.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -138,7 +138,7 @@
}
SendDlgItemMessage(hwndDlg, IDC_SHORTCUT_LOCATION, EM_SETSEL, 0,
-1);
SetFocus(GetDlgItem(hwndDlg, IDC_SHORTCUT_LOCATION));
- SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT,
PSNRET_INVALID_NOCHANGEPAGE);
return -1;
}
else
Modified: trunk/reactos/dll/cpl/appwiz/remove.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/remove.c?re…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/remove.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/remove.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -449,16 +449,16 @@
switch (nCurrSel)
{
case 0:
- SetWindowLong(GetDlgItem(hwndDlg, ListControl),
- GWL_STYLE, LVS_ICON | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL |
WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP);
+ SetWindowLongPtr(GetDlgItem(hwndDlg, ListControl),
+ GWL_STYLE, LVS_ICON | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL |
WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP);
break;
case 1:
- SetWindowLong(GetDlgItem(hwndDlg, ListControl),
- GWL_STYLE,LVS_LIST | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL |
WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP);
+ SetWindowLongPtr(GetDlgItem(hwndDlg, ListControl),
+ GWL_STYLE,LVS_LIST | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL |
WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP);
break;
case 2:
- SetWindowLong(GetDlgItem(hwndDlg, ListControl),
- GWL_STYLE,LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL |
WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP);
+ SetWindowLongPtr(GetDlgItem(hwndDlg, ListControl),
+ GWL_STYLE,LVS_REPORT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL |
WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP);
break;
}
}
Modified: trunk/reactos/dll/cpl/console/colors.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/colors.c?r…
==============================================================================
--- trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -93,7 +93,7 @@
else
{
/* options have already been applied */
- SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
return TRUE;
}
return TRUE;
Modified: trunk/reactos/dll/cpl/console/console.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.c?…
==============================================================================
--- trunk/reactos/dll/cpl/console/console.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/console.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -143,18 +143,18 @@
if (res == IDCANCEL)
{
/* dont destroy when user presses cancel */
- SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE);
}
else if ( res == IDC_RADIO_APPLY_ALL )
{
pConInfo->AppliedConfig = TRUE;
- SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
SendMessage(pConInfo->hConsoleWindow, PM_APPLY_CONSOLE_INFO, (WPARAM)pConInfo,
(LPARAM)TRUE);
}
else if ( res == IDC_RADIO_APPLY_CURRENT )
{
pConInfo->AppliedConfig = TRUE;
- SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
SendMessage(pConInfo->hConsoleWindow, PM_APPLY_CONSOLE_INFO, (WPARAM)pConInfo,
(LPARAM)TRUE);
}
}
Modified: trunk/reactos/dll/cpl/console/options.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/options.c?…
==============================================================================
--- trunk/reactos/dll/cpl/console/options.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/options.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -62,7 +62,7 @@
else
{
/* options have already been applied */
- SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
return TRUE;
}
return TRUE;
Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re…
==============================================================================
--- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -172,9 +172,9 @@
case PSN_WIZNEXT:
{
if (SendDlgItemMessage(hwndDlg, IDC_NOTCONNECTED, BM_GETCHECK, 0, 0)
== BST_CHECKED)
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_NOTCONNECTEDPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_NOTCONNECTEDPAGE);
else
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_PROBELISTPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_PROBELISTPAGE);
return TRUE;
}
@@ -244,7 +244,7 @@
case PSN_WIZBACK:
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_ISCONNECTEDPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_ISCONNECTEDPAGE);
return TRUE;
}
}
@@ -429,7 +429,7 @@
if (Index == 0)
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTWAYPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_SELECTWAYPAGE);
}
else
{
@@ -443,7 +443,7 @@
pts = (PWSTR) Item.lParam;
wcscpy(pDeviceStatusText, pts);
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_HWSTATUSPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_HWSTATUSPAGE);
}
return TRUE;
}
@@ -499,9 +499,9 @@
case PSN_WIZNEXT:
{
if (SendDlgItemMessage(hwndDlg, IDC_AUTOINSTALL, BM_GETCHECK, 0, 0)
== BST_CHECKED)
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_PROGRESSPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_PROGRESSPAGE);
else
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_HWTYPESPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_HWTYPESPAGE);
return TRUE;
}
@@ -542,7 +542,7 @@
case PSN_WIZBACK:
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_PROBELISTPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_PROBELISTPAGE);
return TRUE;
}
}
@@ -735,7 +735,7 @@
case PSN_WIZBACK:
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTWAYPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_SELECTWAYPAGE);
return TRUE;
}
}
@@ -765,7 +765,7 @@
case PSN_WIZBACK:
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTWAYPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_SELECTWAYPAGE);
return TRUE;
}
}
Modified: trunk/reactos/dll/cpl/timedate/timezone.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timezone.…
==============================================================================
--- trunk/reactos/dll/cpl/timedate/timezone.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/timedate/timezone.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -454,7 +454,7 @@
{
SetAutoDaylightInfo(GetDlgItem(hwndDlg, IDC_AUTODAYLIGHT));
SetLocalTimeZone(GetDlgItem(hwndDlg, IDC_TIMEZONELIST));
- SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
return TRUE;
}
Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c [iso-8859-1]
(original)
+++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c [iso-8859-1] Sat May
9 16:27:40 2009
@@ -102,7 +102,7 @@
_SEH2_LEAVE;
}
- if( (GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD) )
+ if( (GetWindowLongPtr(hwnd, GWL_STYLE) & WS_CHILD) )
{
retVal = DDERR_INVALIDPARAMS;
_SEH2_LEAVE;
Modified: trunk/reactos/dll/shellext/deskadp/deskadp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/deska…
==============================================================================
--- trunk/reactos/dll/shellext/deskadp/deskadp.c [iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/deskadp/deskadp.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -421,9 +421,9 @@
{
case PSN_APPLY:
{
- SetWindowLong(hwndDlg,
- DWL_MSGRESULT,
- ApplyDisplayAdapterChanges(This));
+ SetWindowLongPtr(hwndDlg,
+ DWL_MSGRESULT,
+ ApplyDisplayAdapterChanges(This));
break;
}
Modified: trunk/reactos/dll/shellext/deskmon/deskmon.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/deskm…
==============================================================================
--- trunk/reactos/dll/shellext/deskmon/deskmon.c [iso-8859-1] (original)
+++ trunk/reactos/dll/shellext/deskmon/deskmon.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -530,9 +530,9 @@
{
case PSN_APPLY:
{
- SetWindowLong(hwndDlg,
- DWL_MSGRESULT,
- ApplyMonitorChanges(This));
+ SetWindowLongPtr(hwndDlg,
+ DWL_MSGRESULT,
+ ApplyMonitorChanges(This));
break;
}
Modified: trunk/reactos/dll/win32/browseui/bandsite.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit…
==============================================================================
--- trunk/reactos/dll/win32/browseui/bandsite.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/bandsite.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -129,8 +129,8 @@
DWORD dwStyle;
/* FIXME: What about DBIF_VIEWMODE_FLOATING and DBIF_VIEWMODE_TRANSPARENT? */
- dwStyle = GetWindowLong(This->hWndRebar,
- GWL_STYLE);
+ dwStyle = GetWindowLongPtr(This->hWndRebar,
+ GWL_STYLE);
if (dwStyle & CCS_VERT)
return DBIF_VIEWMODE_VERTICAL;
@@ -988,8 +988,8 @@
if (This->hWndRebar == NULL)
return E_FAIL;
- dwStyle = dwPrevStyle = GetWindowLong(This->hWndRebar,
- GWL_STYLE);
+ dwStyle = dwPrevStyle = GetWindowLongPtr(This->hWndRebar,
+ GWL_STYLE);
if (dwMode & DBIF_VIEWMODE_VERTICAL)
dwStyle |= CCS_VERT;
@@ -998,9 +998,9 @@
if (dwStyle != dwPrevStyle)
{
- SetWindowLong(This->hWndRebar,
- GWL_STYLE,
- dwPrevStyle);
+ SetWindowLongPtr(This->hWndRebar,
+ GWL_STYLE,
+ dwPrevStyle);
}
return S_OK;
Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat…
==============================================================================
--- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -750,7 +750,7 @@
if (lppsn->hdr.code == PSN_APPLY || lppsn->hdr.code == PSN_RESET)
{
pContext = (LANSTATUSUI_CONTEXT*)GetWindowLongPtr(hwndDlg, DWLP_USER);
- SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);
pContext->hwndDlg = NULL;
return TRUE;
}
Modified: trunk/reactos/dll/win32/newdev/wizard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?…
==============================================================================
--- trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -443,8 +443,8 @@
CenterWindow(hwndControl);
/* Hide the system menu */
- 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(
@@ -549,8 +549,8 @@
CenterWindow(hwndControl);
/* Hide the system menu */
- dwStyle = GetWindowLong(hwndControl, GWL_STYLE);
- SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
+ dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
+ SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
PopulateCustomPathCombo(GetDlgItem(hwndDlg, IDC_COMBO_PATH));
@@ -706,8 +706,8 @@
(LPARAM)DevInstData->buffer);
/* Hide the system menu */
- dwStyle = GetWindowLong(hwndControl, GWL_STYLE);
- SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
+ dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
+ SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
break;
}
@@ -741,7 +741,7 @@
case PSN_KILLACTIVE:
if (hThread != 0)
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, TRUE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, TRUE);
return TRUE;
}
break;
@@ -801,8 +801,8 @@
(LPARAM)DevInstData->drvInfoData.Description);
/* Hide the system menu */
- dwStyle = GetWindowLong(hwndControl, GWL_STYLE);
- SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
+ dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE);
+ SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU);
break;
}
@@ -847,7 +847,7 @@
case PSN_KILLACTIVE:
if (hThread != 0)
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, TRUE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, TRUE);
return TRUE;
}
break;
Modified: trunk/reactos/dll/win32/shell32/dialogs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -109,13 +109,13 @@
WCHAR szText[MAX_PATH], szTitle[100], szFilter[100];
OPENFILENAMEW ofn = {0};
- PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)GetWindowLong(hwndDlg,
DWLP_USER);
+ PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)GetWindowLongPtr(hwndDlg,
DWLP_USER);
switch(uMsg)
{
case WM_INITDIALOG:
pIconContext = (PPICK_ICON_CONTEXT)lParam;
- SetWindowLong(hwndDlg, DWLP_USER, (LONG)pIconContext);
+ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)pIconContext);
pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST);
EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc,
(LPARAM)pIconContext);
if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH))
Modified: trunk/reactos/dll/win32/shell32/drive.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?…
==============================================================================
--- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -514,13 +514,13 @@
}
if (lppsn->hdr.code == PSN_APPLY)
{
- lpstr = (LPWSTR)GetWindowLong(hwndDlg, DWLP_USER);
+ lpstr = (LPWSTR)GetWindowLongPtr(hwndDlg, DWLP_USER);
if (lpstr && SendDlgItemMessageW(hwndDlg, 14000, WM_GETTEXT,
sizeof(szPath)/sizeof(WCHAR), (LPARAM)szPath))
{
szPath[(sizeof(szPath)/sizeof(WCHAR))-1] = L'\0';
SetVolumeLabelW(lpstr, szPath);
}
- SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR );
+ SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR );
return TRUE;
}
break;
Modified: trunk/reactos/dll/win32/shell32/folder_options.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folder_o…
==============================================================================
--- trunk/reactos/dll/win32/shell32/folder_options.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/folder_options.c [iso-8859-1] Sat May 9 16:27:40
2009
@@ -513,11 +513,11 @@
}
break;
case WM_DESTROY:
- pContext = (PFOLDER_PROPERTIES_CONTEXT)GetWindowLong(hwndDlg, DWL_USER);
+ pContext = (PFOLDER_PROPERTIES_CONTEXT)GetWindowLongPtr(hwndDlg, DWL_USER);
SHFree((LPVOID)pContext);
break;
case WM_NOTIFY:
- pContext = (PFOLDER_PROPERTIES_CONTEXT)GetWindowLong(hwndDlg, DWL_USER);
+ pContext = (PFOLDER_PROPERTIES_CONTEXT)GetWindowLongPtr(hwndDlg, DWL_USER);
lppsn = (LPPSHNOTIFY) lParam;
if (lppsn->hdr.code == PSN_APPLY)
{
@@ -540,7 +540,7 @@
SetFileAttributesW(pContext->szFolderPath, Attribute);
}
- SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR );
+ SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR );
return TRUE;
}
break;
Modified: trunk/reactos/dll/win32/shell32/fprop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?…
==============================================================================
--- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -536,7 +536,7 @@
SH_FileVersionQuerySetListText(hwndDlg, pBuf, wOriginalFilename, &str, lang,
code);
SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductName, &str, lang, code);
SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductVersion, &str, lang,
code);
- SetWindowLong(hwndDlg, DWL_USER, (LONG)pBuf);
+ SetWindowLongPtr(hwndDlg, DWL_USER, (LONG)pBuf);
/* select first item */
hDlgCtrl = GetDlgItem(hwndDlg, 14009);
@@ -610,7 +610,7 @@
break;
case WM_DESTROY:
- buf = (LPVOID) GetWindowLong(hwndDlg, DWL_USER);
+ buf = (LPVOID) GetWindowLongPtr(hwndDlg, DWL_USER);
HeapFree(GetProcessHeap(), 0, buf);
break;
Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme…
==============================================================================
--- trunk/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/she_ocmenu.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -636,12 +636,12 @@
LONG YOffset;
OPEN_WITH_CONTEXT Context;
- poainfo = (OPENASINFO*) GetWindowLong(hwndDlg, DWLP_USER);
+ poainfo = (OPENASINFO*) GetWindowLongPtr(hwndDlg, DWLP_USER);
switch(uMsg)
{
case WM_INITDIALOG:
- SetWindowLong(hwndDlg, DWLP_USER, (LONG)lParam);
+ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)lParam);
poainfo = (OPENASINFO*)lParam;
if (!(poainfo->oaifInFlags & OAIF_ALLOW_REGISTRATION))
EnableWindow(GetDlgItem(hwndDlg, 14003), FALSE);
Modified: trunk/reactos/dll/win32/shell32/shelllink.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -2633,7 +2633,7 @@
{
//FIXME load localized error msg
MessageBoxW( hwndDlg, L"file not existing", szBuffer, MB_OK );
- SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE );
+ SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE );
return TRUE;
}
ptr = wcsrchr(szBuffer, L'.');
@@ -2641,7 +2641,7 @@
{
// FIXME load localized error msg
MessageBoxW( hwndDlg, L"You cannot create a link to a
shortcut", L"Error", MB_ICONERROR );
- SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE );
+ SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE );
return TRUE;
}
@@ -2649,7 +2649,7 @@
TRACE("This %p sLinkPath %S\n", This, This->sLinkPath);
IPersistFile_fnSave( (IPersistFile*)&This->lpvtblPersistFile,
This->sLinkPath, TRUE );
- SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR );
+ SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR );
return TRUE;
}
break;
Modified: trunk/reactos/dll/win32/shell32/shellole.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellole.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellole.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -522,12 +522,12 @@
LONG exstyle;
if( !IsWindow(hWnd) ) return;
- exstyle = GetWindowLongA(hWnd,GWL_EXSTYLE);
+ exstyle = GetWindowLongPtrA(hWnd,GWL_EXSTYLE);
if (b)
exstyle |= WS_EX_ACCEPTFILES;
else
exstyle &= ~WS_EX_ACCEPTFILES;
- SetWindowLongA(hWnd,GWL_EXSTYLE,exstyle);
+ SetWindowLongPtrA(hWnd,GWL_EXSTYLE,exstyle);
}
/*************************************************************************
Modified: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_r…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c [iso-8859-1] Sat May 9 16:27:40
2009
@@ -1437,7 +1437,7 @@
}
if (StoreDriveSettings(hwndDlg))
{
- SetWindowLong( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR );
+ SetWindowLongPtr( hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR );
return TRUE;
}
}
Modified: trunk/reactos/dll/win32/shell32/shlview.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -267,8 +267,8 @@
TRACE("(%p)\n", This);
- tmpstyle = GetWindowLongW(This->hWndList, GWL_STYLE);
- SetWindowLongW(This->hWndList, GWL_STYLE, dwAdd | (tmpstyle & ~dwRemove));
+ tmpstyle = GetWindowLongPtrW(This->hWndList, GWL_STYLE);
+ SetWindowLongPtrW(This->hWndList, GWL_STYLE, dwAdd | (tmpstyle & ~dwRemove));
}
/**********************************************************
Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.…
==============================================================================
--- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -293,7 +293,7 @@
0, 0, 0, 0, hwnd, NULL, hInstance, NULL);
SetClassLongPtr(hDispWnd, GCL_STYLE, CS_HREDRAW | CS_VREDRAW);
- PrevProc = (WNDPROC) SetWindowLong(hDispWnd, GWL_WNDPROC, (LPARAM)
ImageView_DispWndProc);
+ PrevProc = (WNDPROC) SetWindowLongPtr(hDispWnd, GWL_WNDPROC, (LPARAM)
ImageView_DispWndProc);
ImageView_CreateToolBar(hwnd);
}
@@ -407,7 +407,7 @@
case WM_DESTROY:
{
ImageView_SaveSettings(hwnd);
- SetWindowLong(hDispWnd, GWL_WNDPROC, (LPARAM) PrevProc);
+ SetWindowLongPtr(hDispWnd, GWL_WNDPROC, (LPARAM) PrevProc);
PostQuitMessage(0);
break;
}
Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -1081,11 +1081,11 @@
*/
LONG WINAPI SHSetWindowBits(HWND hwnd, INT offset, UINT wMask, UINT wFlags)
{
- LONG ret = GetWindowLongA(hwnd, offset);
+ LONG ret = GetWindowLongPtrA(hwnd, offset);
LONG newFlags = (wFlags & wMask) | (ret & ~wFlags);
if (newFlags != ret)
- ret = SetWindowLongA(hwnd, offset, newFlags);
+ ret = SetWindowLongPtrA(hwnd, offset, newFlags);
return ret;
}
Modified: trunk/reactos/dll/win32/syssetup/wizard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -246,8 +246,8 @@
CenterWindow (hwndControl);
/* Hide the system menu */
- 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 */
hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL);
@@ -275,7 +275,7 @@
PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT);
if (SetupData.UnattendSetup)
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_ACKPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_ACKPAGE);
return TRUE;
}
break;
@@ -376,7 +376,7 @@
PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
if (SetupData.UnattendSetup)
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_OWNERPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_OWNERPAGE);
return TRUE;
}
break;
@@ -483,7 +483,7 @@
SendMessage(GetDlgItem(hwndDlg, IDC_OWNERORGANIZATION), WM_SETTEXT,
0, (LPARAM)SetupData.OwnerOrganization);
if (WriteOwnerSettings(SetupData.OwnerName,
SetupData.OwnerOrganization))
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_COMPUTERPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_COMPUTERPAGE);
return TRUE;
}
}
@@ -504,7 +504,7 @@
MessageBoxW(hwndDlg, ErrorName, Title, MB_ICONERROR | MB_OK);
SetFocus(GetDlgItem(hwndDlg, IDC_OWNERNAME));
- SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1);
return TRUE;
}
@@ -515,7 +515,7 @@
if (!WriteOwnerSettings(OwnerName, OwnerOrganization))
{
SetFocus(GetDlgItem(hwndDlg, IDC_OWNERNAME));
- SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1);
return TRUE;
}
@@ -623,7 +623,7 @@
PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
if (SetupData.UnattendSetup &&
WriteComputerSettings(SetupData.ComputerName, hwndDlg))
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_LOCALEPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_LOCALEPAGE);
return TRUE;
}
break;
@@ -638,7 +638,7 @@
}
MessageBoxW(hwndDlg, EmptyComputerName, Title, MB_ICONERROR | MB_OK);
SetFocus(GetDlgItem(hwndDlg, IDC_COMPUTERNAME));
- SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1);
return TRUE;
}
@@ -648,7 +648,7 @@
if (!WriteComputerSettings(ComputerName, hwndDlg))
{
SetFocus(GetDlgItem(hwndDlg, IDC_COMPUTERNAME));
- SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1);
return TRUE;
}
@@ -663,7 +663,7 @@
wcscpy(EmptyPassword, L"You must enter a password !");
}
MessageBoxW(hwndDlg, EmptyPassword, Title, MB_ICONERROR | MB_OK);
- SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1);
return TRUE;
}
#else
@@ -679,7 +679,7 @@
wcscpy(NotMatchPassword, L"The passwords you entered do not
match. Please enter the desired password again.");
}
MessageBoxW(hwndDlg, NotMatchPassword, Title, MB_ICONERROR | MB_OK);
- SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1);
return TRUE;
}
@@ -695,7 +695,7 @@
wcscpy(WrongPassword, L"The password you entered contains
invalid characters. Please enter a cleaned password.");
}
MessageBoxW(hwndDlg, WrongPassword, Title, MB_ICONERROR | MB_OK);
- SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, -1);
return TRUE;
break;
}
@@ -901,7 +901,7 @@
}
RunControlPanelApplet(hwndDlg, szBuffer);
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE);
return TRUE;
}
break;
@@ -1500,7 +1500,7 @@
PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT);
if (SetupData->UnattendSetup && WriteDateTimeSettings(hwndDlg,
SetupData))
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_PROCESSPAGE);
+ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_PROCESSPAGE);
return TRUE;
}
break;
Modified: trunk/reactos/dll/win32/user32/controls/button.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] Sat May 9 16:27:40
2009
@@ -163,17 +163,17 @@
static inline LONG get_button_state( HWND hwnd )
{
- return GetWindowLongW( hwnd, STATE_GWL_OFFSET );
+ return GetWindowLongPtrW( hwnd, STATE_GWL_OFFSET );
}
static inline void set_button_state( HWND hwnd, LONG state )
{
- SetWindowLongW( hwnd, STATE_GWL_OFFSET, state );
+ SetWindowLongPtrW( hwnd, STATE_GWL_OFFSET, state );
}
static __inline void set_ui_state( HWND hwnd, LONG flags )
{
- SetWindowLongW( hwnd, UISTATE_GWL_OFFSET, flags );
+ SetWindowLongPtrW( hwnd, UISTATE_GWL_OFFSET, flags );
}
static __inline LONG get_ui_state( HWND hwnd )
@@ -254,7 +254,7 @@
{
RECT rect;
POINT pt;
- LONG style = GetWindowLongW( hWnd, GWL_STYLE );
+ LONG style = GetWindowLongPtrW( hWnd, GWL_STYLE );
UINT btn_type = get_button_type( style );
LONG state;
HANDLE oldHbitmap;
@@ -479,7 +479,7 @@
if ((wParam & 0x0f) >= MAX_BTN_TYPE) break;
btn_type = wParam & 0x0f;
style = (style & ~0x0f) | btn_type;
- SetWindowLongW( hWnd, GWL_STYLE, style );
+ SetWindowLongPtrW( hWnd, GWL_STYLE, style );
/* Only redraw if lParam flag is set.*/
if (lParam)
@@ -528,7 +528,7 @@
{
if (wParam) style |= WS_TABSTOP;
else style &= ~WS_TABSTOP;
- SetWindowLongW( hWnd, GWL_STYLE, style );
+ SetWindowLongPtrW( hWnd, GWL_STYLE, style );
}
if ((state & 3) != wParam)
{
@@ -667,8 +667,8 @@
*/
static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc)
{
- LONG style = GetWindowLongW( hwnd, GWL_STYLE );
- LONG ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE );
+ LONG style = GetWindowLongPtrW( hwnd, GWL_STYLE );
+ LONG ex_style = GetWindowLongPtrW( hwnd, GWL_EXSTYLE );
WCHAR *text;
ICONINFO iconInfo;
BITMAP bm;
@@ -786,7 +786,7 @@
HBRUSH hbr = 0;
UINT flags = IsWindowEnabled(hwnd) ? DSS_NORMAL : DSS_DISABLED;
LONG state = get_button_state( hwnd );
- LONG style = GetWindowLongW( hwnd, GWL_STYLE );
+ LONG style = GetWindowLongPtrW( hwnd, GWL_STYLE );
WCHAR *text = NULL;
/* FIXME: To draw disabled label in Win31 look-and-feel, we probably
@@ -845,7 +845,7 @@
COLORREF oldTxtColor;
HFONT hFont;
LONG state = get_button_state( hwnd );
- LONG style = GetWindowLongW( hwnd, GWL_STYLE );
+ LONG style = GetWindowLongPtrW( hwnd, GWL_STYLE );
BOOL pushedState = (state & BUTTON_HIGHLIGHTED);
HWND parent;
@@ -934,7 +934,7 @@
UINT dtFlags;
HFONT hFont;
LONG state = get_button_state( hwnd );
- LONG style = GetWindowLongW( hwnd, GWL_STYLE );
+ LONG style = GetWindowLongPtrW( hwnd, GWL_STYLE );
HWND parent;
if (style & BS_PUSHLIKE)
@@ -1069,7 +1069,7 @@
{
if (!sibling) break;
if ((hwnd != sibling) &&
- ((GetWindowLongW( sibling, GWL_STYLE) & 0x0f) == BS_AUTORADIOBUTTON))
+ ((GetWindowLongPtrW( sibling, GWL_STYLE) & 0x0f) == BS_AUTORADIOBUTTON))
SendMessageW( sibling, BM_SETCHECK, BUTTON_UNCHECKED, 0 );
sibling = GetNextDlgGroupItem( parent, sibling, FALSE );
} while (sibling != start);
@@ -1087,7 +1087,7 @@
HFONT hFont;
UINT dtFlags;
TEXTMETRICW tm;
- LONG style = GetWindowLongW( hwnd, GWL_STYLE );
+ LONG style = GetWindowLongPtrW( hwnd, GWL_STYLE );
HWND parent;
if ((hFont = get_button_font( hwnd ))) SelectObject( hDC, hFont );
Modified: trunk/reactos/dll/win32/user32/controls/combo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -158,18 +158,18 @@
/* some braindead apps do try to use scrollbar/border flags */
lphc->dwStyle = style & ~(WS_BORDER | WS_HSCROLL | WS_VSCROLL);
- SetWindowLongW( hwnd, GWL_STYLE, style & ~(WS_BORDER | WS_HSCROLL |
WS_VSCROLL) );
+ SetWindowLongPtrW( hwnd, GWL_STYLE, style & ~(WS_BORDER | WS_HSCROLL |
WS_VSCROLL) );
/*
* We also have to remove the client edge style to make sure
* we don't end-up with a non client area.
*/
- SetWindowLongW( hwnd, GWL_EXSTYLE,
- GetWindowLongW( hwnd, GWL_EXSTYLE ) & ~WS_EX_CLIENTEDGE );
+ SetWindowLongPtrW( hwnd, GWL_EXSTYLE,
+ GetWindowLongPtrW( hwnd, GWL_EXSTYLE ) & ~WS_EX_CLIENTEDGE
);
if( !(style & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) )
lphc->dwStyle |= CBS_HASSTRINGS;
- if( !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_NOPARENTNOTIFY) )
+ if( !(GetWindowLongPtrW( hwnd, GWL_EXSTYLE ) & WS_EX_NOPARENTNOTIFY) )
lphc->wState |= CBF_NOTIFY;
TRACE("[%p], style = %08x\n", lphc, lphc->dwStyle );
Modified: trunk/reactos/dll/win32/user32/controls/edit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -771,12 +771,12 @@
#endif
case EM_SETREADONLY:
if (wParam) {
- SetWindowLongW( hwnd, GWL_STYLE,
- GetWindowLongW( hwnd, GWL_STYLE ) | ES_READONLY );
+ SetWindowLongPtrW( hwnd, GWL_STYLE,
+ GetWindowLongPtrW( hwnd, GWL_STYLE ) | ES_READONLY
);
es->style |= ES_READONLY;
} else {
- SetWindowLongW( hwnd, GWL_STYLE,
- GetWindowLongW( hwnd, GWL_STYLE ) & ~ES_READONLY
);
+ SetWindowLongPtrW( hwnd, GWL_STYLE,
+ GetWindowLongPtrW( hwnd, GWL_STYLE ) &
~ES_READONLY );
es->style &= ~ES_READONLY;
}
result = 1;
@@ -3875,13 +3875,13 @@
if (es->password_char == c)
return;
- style = GetWindowLongW( es->hwndSelf, GWL_STYLE );
+ style = GetWindowLongPtrW( es->hwndSelf, GWL_STYLE );
es->password_char = c;
if (c) {
- SetWindowLongW( es->hwndSelf, GWL_STYLE, style | ES_PASSWORD );
+ SetWindowLongPtrW( es->hwndSelf, GWL_STYLE, style | ES_PASSWORD );
es->style |= ES_PASSWORD;
} else {
- SetWindowLongW( es->hwndSelf, GWL_STYLE, style & ~ES_PASSWORD );
+ SetWindowLongPtrW( es->hwndSelf, GWL_STYLE, style & ~ES_PASSWORD );
es->style &= ~ES_PASSWORD;
}
EDIT_UpdateText(es, NULL, TRUE);
@@ -4513,7 +4513,7 @@
case SB_THUMBPOSITION:
TRACE("SB_THUMBPOSITION %d\n", pos);
es->flags &= ~EF_HSCROLL_TRACK;
- if(GetWindowLongW( es->hwndSelf, GWL_STYLE ) & WS_HSCROLL)
+ if(GetWindowLongPtrW( es->hwndSelf, GWL_STYLE ) & WS_HSCROLL)
dx = pos - es->x_offset;
else
{
@@ -4546,7 +4546,7 @@
#endif
{
LRESULT ret;
- if(GetWindowLongW( es->hwndSelf, GWL_STYLE ) & WS_HSCROLL)
+ if(GetWindowLongPtrW( es->hwndSelf, GWL_STYLE ) & WS_HSCROLL)
ret = GetScrollPos(es->hwndSelf, SB_HORZ);
else
{
@@ -5008,7 +5008,7 @@
if (lpcs->dwExStyle & WS_EX_CLIENTEDGE)
es->style &= ~WS_BORDER;
else if (es->style & WS_BORDER)
- SetWindowLongW(hwnd, GWL_STYLE, es->style & ~WS_BORDER);
+ SetWindowLongPtrW(hwnd, GWL_STYLE, es->style & ~WS_BORDER);
return TRUE;
}
@@ -5475,7 +5475,7 @@
#endif
{
LRESULT ret;
- if(GetWindowLongW( es->hwndSelf, GWL_STYLE ) & WS_VSCROLL)
+ if(GetWindowLongPtrW( es->hwndSelf, GWL_STYLE ) & WS_VSCROLL)
ret = GetScrollPos(es->hwndSelf, SB_VERT);
else
{
Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] Sat May 9 16:27:40
2009
@@ -59,7 +59,7 @@
LONG style = WS_CLIPSIBLINGS;
if (!IsWindowEnabled(owner)) style |= WS_DISABLED;
- if( GetWindowLongA( owner, GWL_STYLE ) & WS_CHILD )
+ if( GetWindowLongPtrA( owner, GWL_STYLE ) & WS_CHILD )
hWnd = CreateWindowExA( 0, (LPCSTR)ICONTITLE_CLASS_ATOM, NULL,
style | WS_CHILD, 0, 0, 1, 1,
GetParent(owner), 0, instance, NULL );
@@ -68,8 +68,8 @@
style, 0, 0, 1, 1,
owner, 0, instance, NULL );
WIN_SetOwner( hWnd, owner ); /* MDI depends on this */
- SetWindowLongW( hWnd, GWL_STYLE,
- GetWindowLongW( hWnd, GWL_STYLE ) & ~(WS_CAPTION | WS_BORDER) );
+ SetWindowLongPtrW( hWnd, GWL_STYLE,
+ GetWindowLongPtrW( hWnd, GWL_STYLE ) & ~(WS_CAPTION |
WS_BORDER) );
return hWnd;
}
#endif
@@ -142,7 +142,7 @@
}
else
{
- if( GetWindowLongA( hwnd, GWL_STYLE ) & WS_CHILD )
+ if( GetWindowLongPtrA( hwnd, GWL_STYLE ) & WS_CHILD )
{
hBrush = (HBRUSH) GetClassLongPtrW(hwnd, GCLP_HBRBACKGROUND);
if( hBrush )
@@ -222,7 +222,7 @@
if (wParam) ICONTITLE_SetTitlePos( hWnd, owner );
return 0;
case WM_ERASEBKGND:
- if( GetWindowLongW( owner, GWL_STYLE ) & WS_CHILD )
+ if( GetWindowLongPtrW( owner, GWL_STYLE ) & WS_CHILD )
lParam = SendMessageW( owner, WM_ISACTIVEICON, 0, 0 );
else
lParam = (owner == GetActiveWindow());
Modified: trunk/reactos/dll/win32/user32/controls/listbox.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Sat May 9 16:27:40
2009
@@ -2159,7 +2159,7 @@
if (!descr->lphc)
{
- if (GetWindowLongW( descr->self, GWL_EXSTYLE ) & WS_EX_DRAGDETECT)
+ if (GetWindowLongPtrW( descr->self, GWL_EXSTYLE ) & WS_EX_DRAGDETECT)
{
POINT pt;
@@ -2236,7 +2236,7 @@
{
/* Check to see the NC is a scrollbar */
INT nHitTestType=0;
- LONG style = GetWindowLongW( descr->self, GWL_STYLE );
+ LONG style = GetWindowLongPtrW( descr->self, GWL_STYLE );
/* Check Vertical scroll bar */
if (style & WS_VSCROLL)
{
@@ -2557,7 +2557,7 @@
GetClientRect( hwnd, &rect );
descr->self = hwnd;
descr->owner = GetParent( descr->self );
- descr->style = GetWindowLongW( descr->self, GWL_STYLE );
+ descr->style = GetWindowLongPtrW( descr->self, GWL_STYLE );
descr->width = rect.right - rect.left;
descr->height = rect.bottom - rect.top;
descr->items = NULL;
Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Sat May 9 16:27:40
2009
@@ -336,7 +336,7 @@
break;
case SB_CTL:
- Vertical = (GetWindowLongW(Wnd, GWL_STYLE) & SBS_VERT) != 0;
+ Vertical = (GetWindowLongPtrW(Wnd, GWL_STYLE) & SBS_VERT) != 0;
break;
default:
@@ -498,7 +498,7 @@
ClientToScreen(Wnd, (LPPOINT) &ClientRect.right);
GetWindowRect(Wnd, &WindowRect);
}
- Style = GetWindowLongW(Wnd, GWL_STYLE);
+ Style = GetWindowLongPtrW(Wnd, GWL_STYLE);
switch (Bar)
{
@@ -520,7 +520,7 @@
break;
case SB_VERT:
- ExStyle = GetWindowLongW(Wnd, GWL_EXSTYLE);
+ ExStyle = GetWindowLongPtrW(Wnd, GWL_EXSTYLE);
if (0 != (ExStyle & WS_EX_LEFTSCROLLBAR))
{
Rect->left = ClientRect.left - WindowRect.left -
GetSystemMetrics(SM_CXVSCROLL);
@@ -769,7 +769,7 @@
}
SendMessageW(GetParent(Wnd),
- (0 != (GetWindowLongW(Wnd, GWL_STYLE ) & SBS_VERT) ?
+ (0 != (GetWindowLongPtrW(Wnd, GWL_STYLE ) & SBS_VERT) ?
WM_VSCROLL : WM_HSCROLL), wParam, (LPARAM) Wnd);
}
@@ -810,7 +810,7 @@
memcpy(NewInfo.rgstate, ScrollBarInfo.rgstate, (CCHILDREN_SCROLLBAR + 1) *
sizeof(DWORD));
if (SB_CTL == SBType
- && 0 != (GetWindowLongW(Wnd, GWL_STYLE) & (SBS_SIZEGRIP |
SBS_SIZEBOX)))
+ && 0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & (SBS_SIZEGRIP |
SBS_SIZEBOX)))
{
switch(Msg)
{
@@ -850,7 +850,7 @@
}
else
{
- Vertical = (0 != (GetWindowLongW(Wnd, GWL_STYLE) & SBS_VERT));
+ Vertical = (0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & SBS_VERT));
}
WndOwner = (SB_CTL == SBType) ? GetParent(Wnd) : Wnd;
WndCtl = (SB_CTL == SBType) ? Wnd : NULL;
@@ -866,7 +866,7 @@
LastMousePos = LastClickPos;
TrackThumbPos = ScrollBarInfo.xyThumbTop;
PrevPt = Pt;
- if (SB_CTL == SBType && 0 != (GetWindowLongW(Wnd, GWL_STYLE) &
WS_TABSTOP))
+ if (SB_CTL == SBType && 0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) &
WS_TABSTOP))
{
SetFocus(Wnd);
}
@@ -1376,11 +1376,11 @@
Dc = (0 != wParam ? (HDC) wParam : BeginPaint(Wnd, &Ps));
- if (GetWindowLongW(Wnd, GWL_STYLE) & SBS_SIZEGRIP)
+ if (GetWindowLongPtrW(Wnd, GWL_STYLE) & SBS_SIZEGRIP)
{
IntScrollDrawSizeGrip(Wnd, Dc);
}
- else if (0 != (GetWindowLongW(Wnd, GWL_STYLE) & SBS_SIZEBOX))
+ else if (0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & SBS_SIZEBOX))
{
RECT Rect;
GetClientRect(Wnd, &Rect);
Modified: trunk/reactos/dll/win32/user32/controls/static.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] Sat May 9 16:27:40
2009
@@ -108,7 +108,7 @@
static __inline void set_ui_state( HWND hwnd, LONG flags )
{
- SetWindowLongW( hwnd, UISTATE_GWL_OFFSET, flags );
+ SetWindowLongPtrW( hwnd, UISTATE_GWL_OFFSET, flags );
}
static __inline LONG get_ui_state( HWND hwnd )
@@ -435,7 +435,7 @@
LPARAM lParam, BOOL unicode )
{
LRESULT lResult = 0;
- LONG full_style = GetWindowLongW( hwnd, GWL_STYLE );
+ LONG full_style = GetWindowLongPtrW( hwnd, GWL_STYLE );
LONG style = full_style & SS_TYPEMASK;
switch (uMsg)
@@ -510,8 +510,8 @@
LPCWSTR textW;
if (full_style & SS_SUNKEN)
- SetWindowLongW( hwnd, GWL_EXSTYLE,
- GetWindowLongW( hwnd, GWL_EXSTYLE ) | WS_EX_STATICEDGE
);
+ SetWindowLongPtrW( hwnd, GWL_EXSTYLE,
+ GetWindowLongPtrW( hwnd, GWL_EXSTYLE ) |
WS_EX_STATICEDGE );
if(unicode)
{
Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -178,13 +178,13 @@
VOID
DefWndSetRedraw(HWND hWnd, WPARAM wParam)
{
- LONG Style = GetWindowLong(hWnd, GWL_STYLE);
+ LONG Style = GetWindowLongPtr(hWnd, GWL_STYLE);
/* Content can be redrawn after a change. */
if (wParam)
{
if (!(Style & WS_VISIBLE)) /* Not Visible */
{
- SetWindowLong(hWnd, GWL_STYLE, WS_VISIBLE);
+ SetWindowLongPtr(hWnd, GWL_STYLE, WS_VISIBLE);
}
}
else /* Content cannot be redrawn after a change. */
@@ -193,7 +193,7 @@
{
RedrawWindow( hWnd, NULL, 0, RDW_ALLCHILDREN | RDW_VALIDATE );
Style &= ~WS_VISIBLE;
- SetWindowLong(hWnd, GWL_STYLE, Style); /* clear bits */
+ SetWindowLongPtr(hWnd, GWL_STYLE, Style); /* clear bits */
}
}
return;
@@ -266,7 +266,7 @@
case HTBOTTOMLEFT:
case HTTOPRIGHT:
{
- if (GetWindowLongW(hWnd, GWL_STYLE) & WS_MAXIMIZE)
+ if (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_MAXIMIZE)
{
break;
}
@@ -840,7 +840,7 @@
DefWndHandleWindowPosChanging(HWND hWnd, WINDOWPOS* Pos)
{
POINT maxTrack, minTrack;
- LONG style = GetWindowLongA(hWnd, GWL_STYLE);
+ LONG style = GetWindowLongPtrA(hWnd, GWL_STYLE);
if (Pos->flags & SWP_NOSIZE) return 0;
if ((style & WS_THICKFRAME) || ((style & (WS_POPUP | WS_CHILD)) == 0))
@@ -872,7 +872,7 @@
RECT Rect;
GetClientRect(hWnd, &Rect);
- MapWindowPoints(hWnd, (GetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD ?
+ MapWindowPoints(hWnd, (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CHILD ?
GetParent(hWnd) : NULL), (LPPOINT) &Rect, 2);
if (! (Pos->flags & SWP_NOCLIENTMOVE))
@@ -1145,7 +1145,7 @@
case WM_CONTEXTMENU:
{
- if (GetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD)
+ if (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CHILD)
{
if (bUnicode)
{
@@ -1162,7 +1162,7 @@
DWORD Style;
LONG HitCode;
- Style = GetWindowLongW(hWnd, GWL_STYLE);
+ Style = GetWindowLongPtrW(hWnd, GWL_STYLE);
Pt.x = GET_X_LPARAM(lParam);
Pt.y = GET_Y_LPARAM(lParam);
@@ -1180,7 +1180,7 @@
if((SystemMenu = GetSystemMenu(hWnd, FALSE)))
{
- MenuInitSysMenuPopup(SystemMenu, GetWindowLongW(hWnd, GWL_STYLE),
+ MenuInitSysMenuPopup(SystemMenu, GetWindowLongPtrW(hWnd,
GWL_STYLE),
GetClassLongPtrW(hWnd, GCL_STYLE), HitCode);
if(HitCode == HTCAPTION)
@@ -1223,7 +1223,7 @@
{
HICON hIcon;
- if (GetWindowLongW(hWnd, GWL_STYLE) & WS_MINIMIZE &&
+ if (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_MINIMIZE &&
(hIcon = (HICON)GetClassLongPtrW(hWnd, GCL_HICON)) != NULL)
{
RECT ClientRect;
@@ -1268,7 +1268,7 @@
case WM_MOUSEACTIVATE:
{
- if (GetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD)
+ if (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CHILD)
{
LONG Ret;
if (bUnicode)
@@ -1293,7 +1293,7 @@
{
/* Check if the window is minimized. */
if (LOWORD(wParam) != WA_INACTIVE &&
- !(GetWindowLongW(hWnd, GWL_STYLE) & WS_MINIMIZE))
+ !(GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_MINIMIZE))
{
SetFocus(hWnd);
}
@@ -1302,7 +1302,7 @@
case WM_MOUSEWHEEL:
{
- if (GetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD)
+ if (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CHILD)
{
if (bUnicode)
{
@@ -1356,7 +1356,7 @@
case WM_SETCURSOR:
{
- ULONG Style = GetWindowLongW(hWnd, GWL_STYLE);
+ ULONG Style = GetWindowLongPtrW(hWnd, GWL_STYLE);
if (Style & WS_CHILD)
{
@@ -1457,7 +1457,7 @@
if ((HIWORD(lParam) & KEYDATA_ALT) && wParam)
{
if (wParam == '\t' || wParam == '\x1b') break;
- if (wParam == ' ' && (GetWindowLongW( hWnd, GWL_STYLE )
& WS_CHILD))
+ if (wParam == ' ' && (GetWindowLongPtrW( hWnd, GWL_STYLE
) & WS_CHILD))
SendMessageW( GetParent(hWnd), Msg, wParam, lParam );
else
SendMessageW( hWnd, WM_SYSCOMMAND, SC_KEYMENU, wParam );
@@ -1478,7 +1478,7 @@
{
iMenuSysKey = 0;
/* FIXME: Check for a desktop. */
- if (!(GetWindowLongW( hWnd, GWL_STYLE ) & WS_CHILD)) EndMenu();
+ if (!(GetWindowLongPtrW( hWnd, GWL_STYLE ) & WS_CHILD)) EndMenu();
if (GetCapture() == hWnd)
{
ReleaseCapture();
@@ -1495,7 +1495,7 @@
*/
case WM_QUERYDROPOBJECT:
{
- if (GetWindowLongW(hWnd, GWL_EXSTYLE) & WS_EX_ACCEPTFILES)
+ if (GetWindowLongPtrW(hWnd, GWL_EXSTYLE) & WS_EX_ACCEPTFILES)
{
return(1);
}
@@ -1953,7 +1953,7 @@
{
DefSetText(hWnd, (PCWSTR)lParam, TRUE);
- if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION)
+ if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION)
{
DefWndNCPaint(hWnd, (HRGN)1, -1);
}
@@ -2095,7 +2095,7 @@
{
DefSetText(hWnd, (PCWSTR)lParam, FALSE);
- if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION)
+ if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION)
{
DefWndNCPaint(hWnd, (HRGN)1, -1);
}
Modified: trunk/reactos/dll/win32/user32/windows/dialog.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -450,7 +450,7 @@
do
{
- DWORD style = GetWindowLongW( hwndControl, GWL_STYLE );
+ DWORD style = GetWindowLongPtrW( hwndControl, GWL_STYLE );
if ((style & (WS_VISIBLE | WS_DISABLED)) == WS_VISIBLE)
{
dlgCode = SendMessageA( hwndControl, WM_GETDLGCODE, 0, 0 );
@@ -539,7 +539,7 @@
ShowWindow( hwnd, SW_SHOWNORMAL );
bFirstEmpty = FALSE;
}
- if (!(GetWindowLongW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG))
+ if (!(GetWindowLongPtrW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG))
{
/* No message present -> send ENTERIDLE and wait */
SendMessageW( ownerMsg, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd
);
@@ -875,10 +875,10 @@
SetFocus( dlgInfo->hwndFocus );
}
}
- if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD))
+ if (!(GetWindowLongPtrW( hwnd, GWL_STYLE ) & WS_CHILD))
SendMessageW( hwnd, WM_CHANGEUISTATE, MAKEWPARAM(UIS_INITIALIZE, 0), 0);
- if (template.style & WS_VISIBLE && !(GetWindowLongW( hwnd, GWL_STYLE
) & WS_VISIBLE))
+ if (template.style & WS_VISIBLE && !(GetWindowLongPtrW( hwnd,
GWL_STYLE ) & WS_VISIBLE))
{
ShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */
}
@@ -962,9 +962,9 @@
break;
/* Recurse into WS_EX_CONTROLPARENT controls */
- if (GetWindowLongW( hwndChild, GWL_EXSTYLE ) & WS_EX_CONTROLPARENT)
- {
- LONG dsStyle = GetWindowLongW( hwndChild, GWL_STYLE );
+ if (GetWindowLongPtrW( hwndChild, GWL_EXSTYLE ) & WS_EX_CONTROLPARENT)
+ {
+ LONG dsStyle = GetWindowLongPtrW( hwndChild, GWL_STYLE );
if ((dsStyle & WS_VISIBLE) && !(dsStyle & WS_DISABLED)
&&
(hwndTmp = DEFDLG_FindDefButton(hwndChild)) != NULL)
return hwndTmp;
@@ -1198,8 +1198,8 @@
while(hChildFirst)
{
- dsStyle = GetWindowLongA(hChildFirst,GWL_STYLE);
- exStyle = GetWindowLongA(hChildFirst,GWL_EXSTYLE);
+ dsStyle = GetWindowLongPtrA(hChildFirst,GWL_STYLE);
+ exStyle = GetWindowLongPtrA(hChildFirst,GWL_EXSTYLE);
if( (exStyle & WS_EX_CONTROLPARENT) && (dsStyle & WS_VISIBLE)
&& !(dsStyle & WS_DISABLED))
{
HWND retWnd;
@@ -1411,7 +1411,7 @@
BOOL CALLBACK GetDlgItemEnumProc (HWND hwnd, LPARAM lParam )
{
GETDLGITEMINFO * info = (GETDLGITEMINFO *)lParam;
- if(info->nIDDlgItem == GetWindowLongW( hwnd, GWL_ID ))
+ if(info->nIDDlgItem == GetWindowLongPtrW( hwnd, GWL_ID ))
{
info->control = hwnd;
return FALSE;
@@ -2092,7 +2092,7 @@
/* MSDN is wrong. fPrevious does not result in the last child */
/* Maybe that first one is valid. If so then we don't want to skip it*/
- if ((GetWindowLongW( hCtl, GWL_STYLE ) & (WS_VISIBLE|WS_DISABLED)) ==
WS_VISIBLE)
+ if ((GetWindowLongPtrW( hCtl, GWL_STYLE ) & (WS_VISIBLE|WS_DISABLED)) ==
WS_VISIBLE)
{
return hCtl;
}
@@ -2130,8 +2130,8 @@
hwnd = hwndNext;
/* Wander down the leading edge of controlparents */
- while ( (GetWindowLongW (hwnd, GWL_EXSTYLE) & WS_EX_CONTROLPARENT)
&&
- ((GetWindowLongW (hwnd, GWL_STYLE) & (WS_VISIBLE | WS_DISABLED)) ==
WS_VISIBLE) &&
+ while ( (GetWindowLongPtrW (hwnd, GWL_EXSTYLE) & WS_EX_CONTROLPARENT)
&&
+ ((GetWindowLongPtrW (hwnd, GWL_STYLE) & (WS_VISIBLE | WS_DISABLED))
== WS_VISIBLE) &&
(hwndNext = GetWindow (hwnd, GW_CHILD)))
hwnd = hwndNext;
/* Question. If the control is a control parent but either has no
@@ -2140,7 +2140,7 @@
* I believe it doesn't count.
*/
- if ((GetWindowLongW (hwnd, GWL_STYLE) & WS_GROUP))
+ if ((GetWindowLongPtrW (hwnd, GWL_STYLE) & WS_GROUP))
{
hwndLastGroup = hwnd;
if (!fSkipping)
@@ -2160,7 +2160,7 @@
}
if (!fSkipping &&
- (GetWindowLongW (hwnd, GWL_STYLE) & (WS_VISIBLE|WS_DISABLED)) ==
+ (GetWindowLongPtrW (hwnd, GWL_STYLE) & (WS_VISIBLE|WS_DISABLED)) ==
WS_VISIBLE)
{
retvalue = hwnd;
Modified: trunk/reactos/dll/win32/user32/windows/input.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -110,7 +110,7 @@
EnableWindow(HWND hWnd,
BOOL bEnable)
{
- LONG Style = GetWindowLongW(hWnd, GWL_STYLE);
+ LONG Style = GetWindowLongPtrW(hWnd, GWL_STYLE);
/* check if updating is needed */
UINT bIsDisabled = (Style & WS_DISABLED);
if ( (bIsDisabled && bEnable) || (!bIsDisabled && !bEnable) )
Modified: trunk/reactos/dll/win32/user32/windows/mdi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -272,7 +272,7 @@
for ( ; list[i]; i++)
{
if (GetWindow( list[i], GW_OWNER )) continue;
- if ((GetWindowLongW( list[i], GWL_STYLE ) & dwStyleMask) != WS_VISIBLE)
continue;
+ if ((GetWindowLongPtrW( list[i], GWL_STYLE ) & dwStyleMask) != WS_VISIBLE)
continue;
last = list[i];
if (bNext) goto found;
}
@@ -280,7 +280,7 @@
for (i = 0; list[i] && list[i] != hWnd; i++)
{
if (GetWindow( list[i], GW_OWNER )) continue;
- if ((GetWindowLongW( list[i], GWL_STYLE ) & dwStyleMask) != WS_VISIBLE)
continue;
+ if ((GetWindowLongPtrW( list[i], GWL_STYLE ) & dwStyleMask) != WS_VISIBLE)
continue;
last = list[i];
if (bNext) goto found;
}
@@ -382,7 +382,7 @@
HMENU oldFrameMenu = ci->hFrameMenu;
ci->hFrameMenu = hmenuFrame;
- if (IsZoomed(ci->hwndActiveChild) &&
(GetWindowLongW(ci->hwndActiveChild, GWL_STYLE) & WS_VISIBLE))
+ if (IsZoomed(ci->hwndActiveChild) &&
(GetWindowLongPtrW(ci->hwndActiveChild, GWL_STYLE) & WS_VISIBLE))
MDI_AugmentFrameMenu( hwndFrame, ci->hwndActiveChild );
return (LRESULT)oldFrameMenu;
@@ -460,7 +460,7 @@
visible = 0;
for (i = 0; i < ci->nActiveChildren; i++)
{
- if (GetWindowLongW(ci->child[i], GWL_STYLE) & WS_VISIBLE)
+ if (GetWindowLongPtrW(ci->child[i], GWL_STYLE) & WS_VISIBLE)
{
id = ci->idFirstChild + visible;
@@ -510,8 +510,8 @@
RECT rect;
GetClientRect( client, &rect );
- AdjustWindowRectEx( &rect, GetWindowLongW( hwnd, GWL_STYLE ),
- 0, GetWindowLongW( hwnd, GWL_EXSTYLE ));
+ AdjustWindowRectEx( &rect, GetWindowLongPtrW( hwnd, GWL_STYLE ),
+ 0, GetWindowLongPtrW( hwnd, GWL_EXSTYLE ));
lpMinMax->ptMaxSize.x = rect.right -= rect.left;
lpMinMax->ptMaxSize.y = rect.bottom -= rect.top;
@@ -1249,7 +1249,7 @@
switch (LOWORD(wParam))
{
case WM_CREATE:
- if (GetWindowLongW((HWND)lParam, GWL_EXSTYLE) & WS_EX_MDICHILD)
+ if (GetWindowLongPtrW((HWND)lParam, GWL_EXSTYLE) & WS_EX_MDICHILD)
{
if (!ci->child)
ci->child = HeapAlloc(GetProcessHeap(), 0, sizeof(HWND));
@@ -1284,7 +1284,7 @@
case WM_SIZE:
if( IsWindow(ci->hwndActiveChild) && IsZoomed(ci->hwndActiveChild)
&&
- (GetWindowLongW(ci->hwndActiveChild, GWL_STYLE) & WS_VISIBLE) )
+ (GetWindowLongPtrW(ci->hwndActiveChild, GWL_STYLE) & WS_VISIBLE) )
{
RECT rect;
@@ -1293,8 +1293,8 @@
rect.right = LOWORD(lParam);
rect.bottom = HIWORD(lParam);
- AdjustWindowRectEx(&rect, GetWindowLongA(ci->hwndActiveChild, GWL_STYLE),
- 0, GetWindowLongA(ci->hwndActiveChild, GWL_EXSTYLE) );
+ AdjustWindowRectEx(&rect, GetWindowLongPtrA(ci->hwndActiveChild, GWL_STYLE),
+ 0, GetWindowLongPtrA(ci->hwndActiveChild, GWL_EXSTYLE)
);
MoveWindow(ci->hwndActiveChild, rect.left, rect.top,
rect.right - rect.left, rect.bottom - rect.top, 1);
}
@@ -1755,7 +1755,7 @@
int i;
for (i = 0; list[i]; i++)
{
- DWORD style = GetWindowLongW( list[i], GWL_STYLE );
+ DWORD style = GetWindowLongPtrW( list[i], GWL_STYLE );
if (style & WS_MAXIMIZE)
{
HeapFree( GetProcessHeap(), 0, list );
Modified: trunk/reactos/dll/win32/user32/windows/menu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -2215,7 +2215,7 @@
if (IS_SYSTEM_MENU(MenuInfo))
{
- MenuInitSysMenuPopup(ItemInfo.hSubMenu, GetWindowLongW(MenuInfo->Wnd,
GWL_STYLE),
+ MenuInitSysMenuPopup(ItemInfo.hSubMenu, GetWindowLongPtrW(MenuInfo->Wnd,
GWL_STYLE),
GetClassLongPtrW(MenuInfo->Wnd, GCL_STYLE), HTSYSMENU);
NcGetSysPopupPos(MenuInfo->Wnd, &Rect);
@@ -2773,7 +2773,7 @@
if (NULL == NextMenu.hmenuNext || NULL == NextMenu.hwndNext)
{
- DWORD Style = GetWindowLongW(Mt->OwnerWnd, GWL_STYLE);
+ DWORD Style = GetWindowLongPtrW(Mt->OwnerWnd, GWL_STYLE);
NewWnd = Mt->OwnerWnd;
if (IS_SYSTEM_MENU(&TopMenuInfo))
{
@@ -2811,7 +2811,7 @@
if (IsMenu(NewMenu) && IsWindow(NewWnd))
{
- DWORD Style = GetWindowLongW(NewWnd, GWL_STYLE);
+ DWORD Style = GetWindowLongPtrW(NewWnd, GWL_STYLE);
if (0 != (Style & WS_SYSMENU)
&& GetSystemMenu(NewWnd, FALSE) == NewMenu)
@@ -3585,7 +3585,7 @@
/* find window that has a menu */
- while (!((GetWindowLongW( hWnd, GWL_STYLE ) &
+ while (!((GetWindowLongPtrW( hWnd, GWL_STYLE ) &
(WS_CHILD | WS_POPUP)) != WS_CHILD))
if (!(hWnd = GetAncestor( hWnd, GA_PARENT ))) return;
@@ -3594,7 +3594,7 @@
hTrackMenu = GetMenu( hWnd );
if (!hTrackMenu || IsIconic(hWnd) || wChar == ' ' )
{
- if (!(GetWindowLongW( hWnd, GWL_STYLE ) & WS_SYSMENU)) return;
+ if (!(GetWindowLongPtrW( hWnd, GWL_STYLE ) & WS_SYSMENU)) return;
hTrackMenu = NtUserGetSystemMenu(hWnd, FALSE);
uItem = 0;
wParam |= HTSYSMENU; /* prevent item lookup */
Modified: trunk/reactos/dll/win32/user32/windows/message.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Sat May 9 16:27:40
2009
@@ -428,7 +428,7 @@
case LB_FINDSTRINGEXACT:
case LB_SELECTSTRING:
{
- DWORD dwStyle = GetWindowLongW(AnsiMsg->hwnd, GWL_STYLE);
+ DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE);
if (!(dwStyle & (LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE)) &&
(dwStyle & LBS_HASSTRINGS))
{
@@ -443,7 +443,7 @@
case CB_FINDSTRINGEXACT:
case CB_SELECTSTRING:
{
- DWORD dwStyle = GetWindowLongW(AnsiMsg->hwnd, GWL_STYLE);
+ DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE);
if (!(dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) &&
(dwStyle & CBS_HASSTRINGS))
{
@@ -550,7 +550,7 @@
case LB_FINDSTRINGEXACT:
case LB_SELECTSTRING:
{
- DWORD dwStyle = GetWindowLongW(AnsiMsg->hwnd, GWL_STYLE);
+ DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE);
if (!(dwStyle & (LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE)) &&
(dwStyle & LBS_HASSTRINGS))
{
@@ -565,7 +565,7 @@
case CB_FINDSTRINGEXACT:
case CB_SELECTSTRING:
{
- DWORD dwStyle = GetWindowLongW(AnsiMsg->hwnd, GWL_STYLE);
+ DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE);
if (!(dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) &&
(dwStyle & CBS_HASSTRINGS))
{
@@ -726,7 +726,7 @@
case LB_FINDSTRINGEXACT:
case LB_SELECTSTRING:
{
- DWORD dwStyle = GetWindowLongW(AnsiMsg->hwnd, GWL_STYLE);
+ DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE);
if (!(dwStyle & (LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE)) &&
(dwStyle & LBS_HASSTRINGS))
{
@@ -741,7 +741,7 @@
case CB_FINDSTRINGEXACT:
case CB_SELECTSTRING:
{
- DWORD dwStyle = GetWindowLongW(AnsiMsg->hwnd, GWL_STYLE);
+ DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE);
if (!(dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) &&
(dwStyle & CBS_HASSTRINGS))
{
@@ -852,7 +852,7 @@
case LB_FINDSTRINGEXACT:
case LB_SELECTSTRING:
{
- DWORD dwStyle = GetWindowLongW(AnsiMsg->hwnd, GWL_STYLE);
+ DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE);
if (!(dwStyle & (LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE)) &&
(dwStyle & LBS_HASSTRINGS))
{
@@ -867,7 +867,7 @@
case CB_FINDSTRINGEXACT:
case CB_SELECTSTRING:
{
- DWORD dwStyle = GetWindowLongW(AnsiMsg->hwnd, GWL_STYLE);
+ DWORD dwStyle = GetWindowLongPtrW(AnsiMsg->hwnd, GWL_STYLE);
if (!(dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) &&
(dwStyle & CBS_HASSTRINGS))
{
Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] Sat May 9 16:27:40
2009
@@ -251,8 +251,8 @@
WindowRect.right -= WindowRect.left;
WindowRect.bottom -= WindowRect.top;
WindowRect.left = WindowRect.top = 0;
- Style = GetWindowLongW(hWnd, GWL_STYLE);
- ExStyle = GetWindowLongW(hWnd, GWL_EXSTYLE);
+ Style = GetWindowLongPtrW(hWnd, GWL_STYLE);
+ ExStyle = GetWindowLongPtrW(hWnd, GWL_EXSTYLE);
UserGetWindowBorders(Style, ExStyle, &WindowBorder, FALSE);
InflateRect(&WindowRect, -WindowBorder.cx, -WindowBorder.cy);
UserDrawCaptionButton(&WindowRect, Style, ExStyle, hDC, bDown, Type);
@@ -281,7 +281,7 @@
if (!IsWindowVisible(hWnd))
return 0;
- Style = GetWindowLongW(hWnd, GWL_STYLE);
+ Style = GetWindowLongPtrW(hWnd, GWL_STYLE);
hDC = GetDCEx(hWnd, hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_USESTYLE |
DCX_KEEPCLIPRGN);
if (hDC == 0)
@@ -290,7 +290,7 @@
}
Parent = GetParent(hWnd);
- ExStyle = GetWindowLongW(hWnd, GWL_EXSTYLE);
+ ExStyle = GetWindowLongPtrW(hWnd, GWL_EXSTYLE);
if (Active == -1)
{
if (ExStyle & WS_EX_MDICHILD)
@@ -474,7 +474,7 @@
/* FIXME: Correct drawing of size-box with WS_EX_LEFTSCROLLBAR */
if(Parent)
GetClientRect(Parent, &ParentClientRect);
- if (HASSIZEGRIP(Style, ExStyle, GetWindowLongW(Parent, GWL_STYLE), WindowRect,
ParentClientRect))
+ if (HASSIZEGRIP(Style, ExStyle, GetWindowLongPtrW(Parent, GWL_STYLE), WindowRect,
ParentClientRect))
{
DrawFrameControl(hDC, &TempRect, DFC_SCROLL, DFCS_SCROLLSIZEGRIP);
}
@@ -523,8 +523,8 @@
Result |= WVR_VALIDRECTS;
}
- Style = GetWindowLongW(hWnd, GWL_STYLE);
- ExStyle = GetWindowLongW(hWnd, GWL_EXSTYLE);
+ Style = GetWindowLongPtrW(hWnd, GWL_STYLE);
+ ExStyle = GetWindowLongPtrW(hWnd, GWL_EXSTYLE);
if (!(Style & WS_MINIMIZE))
{
@@ -665,8 +665,8 @@
RECT WindowRect, ClientRect, OrigWndRect;
POINT ClientPoint;
SIZE WindowBorders;
- ULONG Style = GetWindowLongW(hWnd, GWL_STYLE);
- ULONG ExStyle = GetWindowLongW(hWnd, GWL_EXSTYLE);
+ ULONG Style = GetWindowLongPtrW(hWnd, GWL_STYLE);
+ ULONG ExStyle = GetWindowLongPtrW(hWnd, GWL_EXSTYLE);
GetWindowRect(hWnd, &WindowRect);
if (!PtInRect(&WindowRect, Point))
@@ -837,7 +837,7 @@
if(Parent)
GetClientRect(Parent, &ParentRect);
if (PtInRect(&TempRect, Point) && HASSIZEGRIP(Style, ExStyle,
- GetWindowLongW(Parent, GWL_STYLE), OrigWndRect, ParentRect))
+ GetWindowLongPtrW(Parent, GWL_STYLE), OrigWndRect, ParentRect))
{
if ((ExStyle & WS_EX_LEFTSCROLLBAR) != 0)
return HTBOTTOMLEFT;
@@ -880,7 +880,7 @@
WPARAM SCMsg;
ULONG ButtonType, Style;
- Style = GetWindowLongW(hWnd, GWL_STYLE);
+ Style = GetWindowLongPtrW(hWnd, GWL_STYLE);
switch (wParam)
{
case HTCLOSE:
@@ -962,7 +962,7 @@
}
case HTSYSMENU:
{
- if (GetWindowLongW(hWnd, GWL_STYLE) & WS_SYSMENU)
+ if (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_SYSMENU)
{
SendMessageW(hWnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU,
lParam);
@@ -1013,7 +1013,7 @@
{
ULONG Style;
- Style = GetWindowLongW(hWnd, GWL_STYLE);
+ Style = GetWindowLongPtrW(hWnd, GWL_STYLE);
switch(wParam)
{
case HTCAPTION:
@@ -1185,14 +1185,14 @@
Rect->bottom = Rect->bottom - Rect->top;
Rect->top = 0;
- Style = GetWindowLongW(Wnd, GWL_STYLE);
+ Style = GetWindowLongPtrW(Wnd, GWL_STYLE);
if (0 != (Style & WS_ICONIC))
{
return;
}
/* Remove frame from rectangle */
- ExStyle = GetWindowLongW(Wnd, GWL_EXSTYLE);
+ ExStyle = GetWindowLongPtrW(Wnd, GWL_EXSTYLE);
if (HAS_THICKFRAME(Style, ExStyle))
{
InflateRect(Rect, - GetSystemMetrics(SM_CXFRAME), - GetSystemMetrics(SM_CYFRAME));
@@ -1239,7 +1239,7 @@
NcGetInsideRect(Wnd, Rect);
GetWindowRect(Wnd, &WindowRect);
OffsetRect(Rect, WindowRect.left, WindowRect.top);
- if (0 != (GetWindowLongW(Wnd, GWL_STYLE) & WS_CHILD))
+ if (0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & WS_CHILD))
{
ClientToScreen(GetParent(Wnd), (POINT *) Rect);
}
Modified: trunk/reactos/dll/win32/user32/windows/window.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -302,7 +302,7 @@
lpParam = (LPVOID)&mdi;
- if (GetWindowLongW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES)
+ if (GetWindowLongPtrW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES)
{
if (dwStyle & WS_POPUP)
{
@@ -408,7 +408,7 @@
lpParam = (LPVOID)&mdi;
- if (GetWindowLongW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES)
+ if (GetWindowLongPtrW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES)
{
if (dwStyle & WS_POPUP)
{
@@ -1433,7 +1433,7 @@
// disabled. I think they stop processing messages but stay appearing
// as enabled.
- return !(GetWindowLongW(hWnd, GWL_STYLE) & WS_DISABLED);
+ return !(GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_DISABLED);
}
@@ -1443,7 +1443,7 @@
BOOL WINAPI
IsZoomed(HWND hWnd)
{
- return (GetWindowLongW(hWnd, GWL_STYLE) & WS_MAXIMIZE) != 0;
+ return (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_MAXIMIZE) != 0;
}
@@ -1494,7 +1494,7 @@
BOOL WINAPI
OpenIcon(HWND hWnd)
{
- if (!(GetWindowLongW(hWnd, GWL_STYLE) & WS_MINIMIZE))
+ if (!(GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_MINIMIZE))
return FALSE;
ShowWindow(hWnd,SW_RESTORE);
@@ -1555,7 +1555,7 @@
DefSetText(hWnd, (PCWSTR)lpString, TRUE);
- if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION)
+ if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION)
{
DefWndNCPaint(hWnd, (HRGN)1, -1);
}
@@ -1585,7 +1585,7 @@
DefSetText(hWnd, lpString, FALSE);
- if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION)
+ if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION)
{
DefWndNCPaint(hWnd, (HRGN)1, -1);
}
Modified: trunk/reactos/dll/win32/user32/windows/winpos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/winpos.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/winpos.c [iso-8859-1] Sat May 9 16:27:40 2009
@@ -28,7 +28,7 @@
LONG style;
if (!hwnd) return FALSE;
- style = GetWindowLongW( hwnd, GWL_STYLE );
+ style = GetWindowLongPtrW( hwnd, GWL_STYLE );
if (!(style & WS_VISIBLE)) return FALSE;
if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE;
return !(style & WS_DISABLED);
@@ -46,7 +46,7 @@
{
HWND hwndTo, fg;
- if ((GetWindowLongW( hwnd, GWL_STYLE ) & WS_POPUP) && (hwndTo =
GetWindow( hwnd, GW_OWNER )))
+ if ((GetWindowLongPtrW( hwnd, GWL_STYLE ) & WS_POPUP) && (hwndTo =
GetWindow( hwnd, GW_OWNER )))
{
hwndTo = GetAncestor( hwndTo, GA_ROOT );
if (can_activate_window( hwndTo )) goto done;