64-bit compilation now compiles and runs

2 files changed, 20 insertions, 26 deletions

diff --git a/xorg-server/hw/xwin/xlaunch/main.cc b/xorg-server/hw/xwin/xlaunch/main.cc
index 8ec1e011c..bf4f5e6a5 100644
--- a/xorg-server/hw/xwin/xlaunch/main.cc
+++ b/xorg-server/hw/xwin/xlaunch/main.cc
@@ -219,7 +219,7 @@ class CMyWizard : public CWizard
                         config.window = CConfig::Nodecoration;
                     else
                     {
-                        SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+                        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, -1);
                         return TRUE;
                     }
                     // Get selected display number
@@ -233,27 +233,27 @@ class CMyWizard : public CWizard
                     if (config.display.empty())
                     {
                         MessageBox(hwndDlg,"Please fill in a display number.","Error",MB_OK);
-                        SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+                        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, -1);
                     }
                     else
-                        SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CLIENTS);
+                        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_CLIENTS);
                     return TRUE;
                 case IDD_CLIENTS:
                     // Check for select client startup method
                     if (IsDlgButtonChecked(hwndDlg, IDC_CLIENT))
                     {
                         config.client = CConfig::StartProgram;
-                        SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_PROGRAM);
+                        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_PROGRAM);
                     } else if (IsDlgButtonChecked(hwndDlg, IDC_XDMCP))
                     {
                         config.client = CConfig::XDMCP;
-                        SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_XDMCP);
+                        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_XDMCP);
                     } else if (IsDlgButtonChecked(hwndDlg, IDC_CLIENT_NONE))
                     {
                         config.client = CConfig::NoClient;
-                        SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_EXTRA);
+                        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_EXTRA);
                     } else
-                        SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+                        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, -1);
                     return TRUE;
                 case IDD_PROGRAM:
                     // Check wether local or remote client should be started
@@ -263,7 +263,7 @@ class CMyWizard : public CWizard
                         config.local = false;
                     else
                     {
-                        SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+                        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, -1);
                         return TRUE;
                     }
                     // Read program, user and host name
@@ -290,9 +290,9 @@ class CMyWizard : public CWizard
                     }
                     // Check for valid input
                     if (!config.local && (config.host.empty() || config.localprogram.empty() || config.remoteprogram.empty()))
-                        SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+                        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, -1);
                     else
-                        SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_EXTRA);
+                        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_EXTRA);
                     return TRUE;
                 case IDD_XDMCP:
                     // Check for broadcast
@@ -302,7 +302,7 @@ class CMyWizard : public CWizard
                         config.broadcast = false;
                     else
                     {
-                        SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+                        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, -1);
                         return TRUE;
                     }
                     // Check for indirect mode
@@ -319,9 +319,9 @@ class CMyWizard : public CWizard
                     }
                     // Check for valid input
                     if (!config.broadcast && config.xdmcp_host.empty())
-                        SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+                        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, -1);
                     else
-                        SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_EXTRA);
+                        SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_EXTRA);
                     if (IsDlgButtonChecked(hwndDlg, IDC_XDMCP_TERMINATE))
                         config.xdmcpterminate = true;
                     else
@@ -355,7 +355,7 @@ class CMyWizard : public CWizard
                         buffer[511] = 0;
                         config.extra_params = buffer;
                     }
-                    SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_FINISH);
+                    SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_FINISH);
                     return TRUE;
                 default:
                     break;
@@ -385,20 +385,20 @@ class CMyWizard : public CWizard
             {
                 case IDD_PROGRAM:
                 case IDD_XDMCP:
-                    SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CLIENTS);
+                    SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_CLIENTS);
                     return TRUE;
                 case IDD_FONTPATH:
                 case IDD_EXTRA: // temporary. fontpath is disabled
                     switch (config.client)
                     {
                         case CConfig::NoClient:
-                            SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CLIENTS);
+                            SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_CLIENTS);
                             return TRUE;
                         case CConfig::StartProgram:
-                            SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_PROGRAM);
+                            SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_PROGRAM);
                             return TRUE;
                         case CConfig::XDMCP:
-                            SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_XDMCP);
+                            SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_XDMCP);
                             return TRUE;
                     }
                     break;
diff --git a/xorg-server/hw/xwin/xlaunch/makefile b/xorg-server/hw/xwin/xlaunch/makefile
index 98656e57e..83426fe19 100644
--- a/xorg-server/hw/xwin/xlaunch/makefile
+++ b/xorg-server/hw/xwin/xlaunch/makefile
@@ -11,18 +11,12 @@ WINAPP = xlaunch
 

 RESOURCES = resources.rc

 

-$(OBJDIR)\%.res : resources\%.rc $(wildcard resources\*.rc) 

+$(OBJDIR)\%.res : resources\%.rc $(wildcard resources\*.rc)

 	$(RC) $(RCFLAGS) $(RCDEFINES:%=-d "%") $(RCINCLUDES:%=-i %) -Fo$(relpath $@) $<

 

 LIBDIRS=$(dir $(INCLUDELIBFILES))

 

 load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);)

 

-LINKLIBS += $(MHMAKECONF)\libxml2\lib\libxml2.lib

-

-ifeq ($(DEBUG),1)

-LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib

-else

-LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib

-endif

+LINKLIBS += $(LIBXMLLIB) $(PTHREADLIB)