Author: dchapyshev Date: Sat May 9 14:06:22 2009 New Revision: 40858
URL: http://svn.reactos.org/svn/reactos?rev=40858&view=rev Log: - SetClassLong -> SetClassLongPtr, GetClassLong -> GetClassLongPtr (for 64-bit compatible, see note in MSDN) Part 1/x
Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp
Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/desktop... ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] Sat May 9 14:06:22 2009 @@ -259,7 +259,7 @@ { // set background brush for the short moment of displaying the // background color while moving foreground windows - SetClassLong(hwnd, GCL_HBRBACKGROUND, COLOR_BACKGROUND+1); + SetClassLongPtr(hwnd, GCL_HBRBACKGROUND, COLOR_BACKGROUND+1);
_display_version = RegGetDWORDValue(HKEY_CURRENT_USER, TEXT("Control Panel\Desktop"), TEXT("PaintDesktopVersion"), 1); }
Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskbar... ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Sat May 9 14:06:22 2009 @@ -109,7 +109,7 @@ _hwndStartButton = hwndStart;
// disable double clicks - SetClassLong(hwndStart, GCL_STYLE, GetClassLong(hwndStart, GCL_STYLE) & ~CS_DBLCLKS); + SetClassLongPtr(hwndStart, GCL_STYLE, GetClassLongPtr(hwndStart, GCL_STYLE) & ~CS_DBLCLKS);
// create task bar _hwndTaskBar = TaskBar::Create(_hwnd);
Modified: trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskbar... ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] Sat May 9 14:06:22 2009 @@ -333,10 +333,10 @@ SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon);
if (!hIcon) - hIcon = (HICON)GetClassLong(hwnd, GCL_HICONSM); - - if (!hIcon) - hIcon = (HICON)GetClassLong(hwnd, GCL_HICON); + hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM); + + if (!hIcon) + hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICON);
if (!hIcon) SendMessageTimeout(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (LPDWORD)&hIcon); @@ -358,10 +358,10 @@
if (allow_from_class) { if (!hIcon) - hIcon = (HICON)GetClassLong(hwnd, GCL_HICON); + hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICON);
if (!hIcon) - hIcon = (HICON)GetClassLong(hwnd, GCL_HICONSM); + hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM); }
if (!hIcon)