Mike McCormack : progman: Win64 fixes.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jun 5 07:28:11 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: bda34ac973a94681828b4c02c5af4148f67890de
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bda34ac973a94681828b4c02c5af4148f67890de
Author: Mike McCormack <mike at codeweavers.com>
Date: Sun Jun 4 00:28:48 2006 +0900
progman: Win64 fixes.
---
programs/progman/dialog.c | 36 ++++++++++++++++++------------------
programs/progman/group.c | 6 +++---
programs/progman/program.c | 10 +++++-----
3 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/programs/progman/dialog.c b/programs/progman/dialog.c
index 469fd40..f3c2974 100644
--- a/programs/progman/dialog.c
+++ b/programs/progman/dialog.c
@@ -27,12 +27,12 @@ #include "commdlg.h"
#include "progman.h"
static BOOL DIALOG_BrowsePrograms(HWND, LPSTR, INT);
static BOOL DIALOG_BrowseSymbols(HWND, LPSTR, INT);
-static BOOL CALLBACK DIALOG_NEW_DlgProc(HWND, UINT, WPARAM, LPARAM);
-static BOOL CALLBACK DIALOG_COPY_MOVE_DlgProc(HWND, UINT, WPARAM, LPARAM);
-static BOOL CALLBACK DIALOG_GROUP_DlgProc(HWND, UINT, WPARAM, LPARAM);
-static BOOL CALLBACK DIALOG_PROGRAM_DlgProc(HWND, UINT, WPARAM, LPARAM);
-static BOOL CALLBACK DIALOG_SYMBOL_DlgProc(HWND, UINT, WPARAM, LPARAM);
-static BOOL CALLBACK DIALOG_EXECUTE_DlgProc(HWND, UINT, WPARAM, LPARAM);
+static INT_PTR CALLBACK DIALOG_NEW_DlgProc(HWND, UINT, WPARAM, LPARAM);
+static INT_PTR CALLBACK DIALOG_COPY_MOVE_DlgProc(HWND, UINT, WPARAM, LPARAM);
+static INT_PTR CALLBACK DIALOG_GROUP_DlgProc(HWND, UINT, WPARAM, LPARAM);
+static INT_PTR CALLBACK DIALOG_PROGRAM_DlgProc(HWND, UINT, WPARAM, LPARAM);
+static INT_PTR CALLBACK DIALOG_SYMBOL_DlgProc(HWND, UINT, WPARAM, LPARAM);
+static INT_PTR CALLBACK DIALOG_EXECUTE_DlgProc(HWND, UINT, WPARAM, LPARAM);
/***********************************************************************
*
@@ -62,7 +62,7 @@ INT DIALOG_New(INT nDefault)
* DIALOG_NEW_DlgProc
*/
-static BOOL CALLBACK DIALOG_NEW_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DIALOG_NEW_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg)
{
@@ -125,7 +125,7 @@ HLOCAL DIALOG_CopyMove(LPCSTR lpszProgra
* DIALOG_COPY_MOVE_DlgProc
*/
-static BOOL CALLBACK DIALOG_COPY_MOVE_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DIALOG_COPY_MOVE_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
HLOCAL hGroup;
@@ -213,7 +213,7 @@ BOOL DIALOG_GroupAttributes(LPSTR lpszTi
* DIALOG_GROUP_DlgProc
*/
-static BOOL CALLBACK DIALOG_GROUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DIALOG_GROUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg)
{
@@ -297,7 +297,7 @@ #endif
* DIALOG_PROGRAM_DlgProc
*/
-static BOOL CALLBACK DIALOG_PROGRAM_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DIALOG_PROGRAM_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
CHAR buffer[MAX_STRING_LEN];
switch (msg)
@@ -418,7 +418,7 @@ VOID DIALOG_Symbol(HICON *lphIcon, LPSTR
* DIALOG_SYMBOL_DlgProc
*/
-static BOOL CALLBACK DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg)
{
@@ -491,13 +491,13 @@ #endif
* DIALOG_Execute
*/
-VOID DIALOG_Execute()
+VOID DIALOG_Execute(void)
{
-INT_PTR z;
- DLGPROC lpfnDlg = MakeProcInstance(DIALOG_EXECUTE_DlgProc, Globals.hInstance);
- z=DialogBox(Globals.hInstance, STRING_EXECUTE,
- Globals.hMainWnd, lpfnDlg);
- FreeProcInstance(lpfnDlg);
+ INT_PTR z;
+ DLGPROC lpfnDlg = MakeProcInstance(DIALOG_EXECUTE_DlgProc, Globals.hInstance);
+ z=DialogBox(Globals.hInstance, STRING_EXECUTE,
+ Globals.hMainWnd, lpfnDlg);
+ FreeProcInstance(lpfnDlg);
}
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -505,7 +505,7 @@ INT_PTR z;
* DIALOG_EXECUTE_DlgProc
*/
-static BOOL CALLBACK DIALOG_EXECUTE_DlgProc(HWND hDlg, UINT msg,
+static INT_PTR CALLBACK DIALOG_EXECUTE_DlgProc(HWND hDlg, UINT msg,
WPARAM wParam, LPARAM lParam)
{
switch (msg)
diff --git a/programs/progman/group.c b/programs/progman/group.c
index 5b9ce49..ea2dd7b 100644
--- a/programs/progman/group.c
+++ b/programs/progman/group.c
@@ -44,7 +44,7 @@ #endif
case WM_CHILDACTIVATE:
case WM_NCLBUTTONDOWN:
- Globals.hActiveGroup = (HLOCAL) GetWindowLong(hWnd, 0);
+ Globals.hActiveGroup = (HLOCAL) GetWindowLongPtr(hWnd, 0);
EnableMenuItem(Globals.hFileMenu, PM_MOVE , MF_GRAYED);
EnableMenuItem(Globals.hFileMenu, PM_COPY , MF_GRAYED);
break;
@@ -64,7 +64,7 @@ ATOM GROUP_RegisterGroupWinClass()
class.style = CS_HREDRAW | CS_VREDRAW;
class.lpfnWndProc = GROUP_GroupWndProc;
class.cbClsExtra = 0;
- class.cbWndExtra = sizeof(LONG);
+ class.cbWndExtra = sizeof(LONG_PTR);
class.hInstance = Globals.hInstance;
class.hIcon = LoadIcon (0, IDI_WINLOGO);
class.hCursor = LoadCursor (0, IDC_ARROW);
@@ -180,7 +180,7 @@ HLOCAL GROUP_AddGroup(LPCSTR lpszName, L
group->hWnd = (HWND)SendMessage(Globals.hMDIWnd, WM_MDICREATE, 0, (LPARAM)&cs);
- SetWindowLong(group->hWnd, 0, (LONG) hGroup);
+ SetWindowLongPtr(group->hWnd, 0, (LONG_PTR) hGroup);
#if 1
if (!bSuppressShowWindow) /* FIXME shouldn't be necessary */
diff --git a/programs/progman/program.c b/programs/progman/program.c
index 8751c3c..347378c 100644
--- a/programs/progman/program.c
+++ b/programs/progman/program.c
@@ -35,7 +35,7 @@ static LRESULT CALLBACK PROGRAM_ProgramW
{
case WM_NCLBUTTONDOWN:
{
- HLOCAL hProgram = (HLOCAL) GetWindowLong(hWnd, 0);
+ HLOCAL hProgram = (HLOCAL) GetWindowLongPtr(hWnd, 0);
PROGRAM *program = LocalLock(hProgram);
PROGGROUP *group = LocalLock(program->hGroup);
group->hActiveProgram = hProgram;
@@ -45,7 +45,7 @@ static LRESULT CALLBACK PROGRAM_ProgramW
}
case WM_NCLBUTTONDBLCLK:
{
- PROGRAM_ExecuteProgram((HLOCAL) GetWindowLong(hWnd, 0));
+ PROGRAM_ExecuteProgram((HLOCAL) GetWindowLongPtr(hWnd, 0));
return(0);
}
@@ -56,7 +56,7 @@ static LRESULT CALLBACK PROGRAM_ProgramW
PAINTSTRUCT ps;
HDC hdc;
hdc = BeginPaint(hWnd,&ps);
- program = LocalLock((HLOCAL) GetWindowLong(hWnd, 0));
+ program = LocalLock((HLOCAL) GetWindowLongPtr(hWnd, 0));
if (program->hIcon)
DrawIcon(hdc, 0, 0, program->hIcon);
EndPaint(hWnd,&ps);
@@ -78,7 +78,7 @@ ATOM PROGRAM_RegisterProgramWinClass()
class.style = CS_HREDRAW | CS_VREDRAW;
class.lpfnWndProc = PROGRAM_ProgramWndProc;
class.cbClsExtra = 0;
- class.cbWndExtra = sizeof(LONG);
+ class.cbWndExtra = sizeof(LONG_PTR);
class.hInstance = Globals.hInstance;
class.hIcon = 0;
class.hCursor = LoadCursor (0, IDC_ARROW);
@@ -220,7 +220,7 @@ HLOCAL PROGRAM_AddProgram(HLOCAL hGroup,
x, y, CW_USEDEFAULT, CW_USEDEFAULT,
group->hWnd, 0, Globals.hInstance, 0);
- SetWindowLong(program->hWnd, 0, (LONG) hProgram);
+ SetWindowLongPtr(program->hWnd, 0, (LONG_PTR) hProgram);
ShowWindow (program->hWnd, SW_SHOWMINIMIZED);
SetWindowPos (program->hWnd, 0, x, y, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE);
More information about the wine-cvs
mailing list