--- src/gl/gl_framebuffer.cpp
+++ src/gl/gl_framebuffer.cpp
@@ -89,7 +89,7 @@ OpenGLFrameBuffer::OpenGLFrameBuffer(int
 	gl_InitSpecialTextures();
 #ifdef _MSC_VER
 	// [BB] Necessary for the hqnx resizing.
-	InitLUTs();
+//	InitLUTs();
 #endif
 }
 
--- src/gl/gl_hqresize.cpp
+++ src/gl/gl_hqresize.cpp
@@ -268,13 +268,14 @@ unsigned char *gl_CreateUpsampledTexture
 		case 3:
 			return scaleNxHelper( &scale4x, 4, inputBuffer, inWidth, inHeight, outWidth, outHeight );
 // [BB] hqnx scaling is only supported with the MS compiler.
+// StasBFG[iddqd]: replaced hqnx with regular scaling for Win64 support
 #ifdef _MSC_VER
 		case 4:
-			return hqNxHelper( &hq2x_32, 2, inputBuffer, inWidth, inHeight, outWidth, outHeight );
+			return scaleNxHelper( &scale2x, 2, inputBuffer, inWidth, inHeight, outWidth, outHeight );
 		case 5:
-			return hqNxHelper( &hq3x_32, 3, inputBuffer, inWidth, inHeight, outWidth, outHeight );
+			return scaleNxHelper( &scale3x, 3, inputBuffer, inWidth, inHeight, outWidth, outHeight );
 		case 6:
-			return hqNxHelper( &hq4x_32, 4, inputBuffer, inWidth, inHeight, outWidth, outHeight );
+			return scaleNxHelper( &scale4x, 4, inputBuffer, inWidth, inHeight, outWidth, outHeight );
 #endif
 		}
 	}
--- src/svnrevision.h
+++ src/svnrevision.h
@@ -0,0 +1,8 @@
+// 0
+//
+// This file was automatically generated by the
+// updaterevision tool. Do not edit by hand.
+
+#define SVN_REVISION_STRING "0"
+#define SVN_REVISION_NUMBER 0
+#define HG_REVISION_HASH_STRING ""
--- src/win32/i_main.cpp
+++ src/win32/i_main.cpp
@@ -917,7 +917,7 @@ void DoMain (HINSTANCE hInstance)
 		if ( Args->CheckParm( "-host" ))
 		{
 			// This never returns.
-			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_SERVERDIALOG ), NULL/*(HWND)Window*/, SERVERCONSOLE_ServerDialogBoxCallback );
+//			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_SERVERDIALOG ), NULL/*(HWND)Window*/, SERVERCONSOLE_ServerDialogBoxCallback );
 		}
 		else
 		{
--- src/win32/i_system.cpp
+++ src/win32/i_system.cpp
@@ -1049,13 +1049,13 @@ BOOL CALLBACK NoIWADBoxCallback (HWND hD
 			// Create the child dialogs.
 			if ( g_hDlg_NoIWAD_Welcome == NULL )
 			{
-				g_hDlg_NoIWAD_Welcome = CreateDialogParam( g_hInst, MAKEINTRESOURCE( IDD_NOIWADS_WELCOME ), hDlg, NoIWADBox_Welcome_Callback, NULL );
-				g_hDlg_NoIWAD_NoDoom = CreateDialogParam( g_hInst, MAKEINTRESOURCE( IDD_NOIWADS_NODOOM ), hDlg, NoIWADBox_NoDoom_Callback, NULL );
-				g_hDlg_NoIWAD_Redirect = CreateDialogParam( g_hInst, MAKEINTRESOURCE( IDD_NOIWADS_REDIRECT ), hDlg, NoIWADBox_Redirect_Callback, NULL );
-				SetParent( g_hDlg_NoIWAD_Welcome, hDlg );
-				SetParent( g_hDlg_NoIWAD_NoDoom, hDlg );
-				SetParent( g_hDlg_NoIWAD_Redirect, hDlg );
-				SetWindowPos( g_hDlg_NoIWAD_Welcome, NULL, 0, 55, 450, 250, SWP_NOZORDER );
+//				g_hDlg_NoIWAD_Welcome = CreateDialogParam( g_hInst, MAKEINTRESOURCE( IDD_NOIWADS_WELCOME ), hDlg, NoIWADBox_Welcome_Callback, NULL );
+//				g_hDlg_NoIWAD_NoDoom = CreateDialogParam( g_hInst, MAKEINTRESOURCE( IDD_NOIWADS_NODOOM ), hDlg, NoIWADBox_NoDoom_Callback, NULL );
+//				g_hDlg_NoIWAD_Redirect = CreateDialogParam( g_hInst, MAKEINTRESOURCE( IDD_NOIWADS_REDIRECT ), hDlg, NoIWADBox_Redirect_Callback, NULL );
+//				SetParent( g_hDlg_NoIWAD_Welcome, hDlg );
+//				SetParent( g_hDlg_NoIWAD_NoDoom, hDlg );
+//				SetParent( g_hDlg_NoIWAD_Redirect, hDlg );
+//				SetWindowPos( g_hDlg_NoIWAD_Welcome, NULL, 0, 55, 450, 250, SWP_NOZORDER );
 			}
 		}
 		break;
--- src/win32/serverconsole/serverconsole.cpp
+++ src/win32/serverconsole/serverconsole.cpp
@@ -303,7 +303,8 @@ BOOL CALLBACK SERVERCONSOLE_ServerDialog
 					I_PutInClipboard( szIPString );
 				}
 				else if ( iIndex == 3 )
-					DialogBox( g_hInst, MAKEINTRESOURCE( IDD_SERVERSTATISTICS ), hDlg, SERVERCONSOLE_ServerStatisticsCallback );
+//					DialogBox( g_hInst, MAKEINTRESOURCE( IDD_SERVERSTATISTICS ), hDlg, SERVERCONSOLE_ServerStatisticsCallback );
+;
 			}
 			break;
 		}
@@ -416,15 +417,15 @@ BOOL CALLBACK SERVERCONSOLE_ServerDialog
 				break;
 			case ID_SETTINGS_CONFIGREDMFLAGS:
 
-				DialogBox( g_hInst, MAKEINTRESOURCE( IDD_DMFLAGS ), hDlg, SERVERCONSOLE_DMFlagsCallback );
+//				DialogBox( g_hInst, MAKEINTRESOURCE( IDD_DMFLAGS ), hDlg, SERVERCONSOLE_DMFlagsCallback );
 				break;
 			case ID_SETTINGS_MAPROTATION:
 
-				DialogBox( g_hInst, MAKEINTRESOURCE( IDD_MAPROTATION ), hDlg, SERVERCONSOLE_MapRotationCallback );
+//				DialogBox( g_hInst, MAKEINTRESOURCE( IDD_MAPROTATION ), hDlg, SERVERCONSOLE_MapRotationCallback );
 				break;
 			case ID_SERVER_STATISTICS:
 
-				DialogBox( g_hInst, MAKEINTRESOURCE( IDD_SERVERSTATISTICS ), hDlg, SERVERCONSOLE_ServerStatisticsCallback );
+//				DialogBox( g_hInst, MAKEINTRESOURCE( IDD_SERVERSTATISTICS ), hDlg, SERVERCONSOLE_ServerStatisticsCallback );
 				break;
 			case ID_ADMIN_ADDREMOVEBOT:
 
@@ -438,15 +439,15 @@ BOOL CALLBACK SERVERCONSOLE_ServerDialog
 			case ID_ADMIN_CHANGEMAP:
 
 				if ( g_bServerLoaded )
-					DialogBox( g_hInst, MAKEINTRESOURCE( IDD_CHANGEMAP ), hDlg, SERVERCONSOLE_ChangeMapCallback );
+//					DialogBox( g_hInst, MAKEINTRESOURCE( IDD_CHANGEMAP ), hDlg, SERVERCONSOLE_ChangeMapCallback );
 				break;
 			case ID_ADMIN_BANIP:
 
-				DialogBox( g_hInst, MAKEINTRESOURCE( IDD_BANIP ), hDlg, SERVERCONSOLE_BanIPCallback );
+//				DialogBox( g_hInst, MAKEINTRESOURCE( IDD_BANIP ), hDlg, SERVERCONSOLE_BanIPCallback );
 				break;
 			case ID_ADMIN_VIEWBANLIST:
 
-				DialogBox( g_hInst, MAKEINTRESOURCE( IDD_BANLIST ), hDlg, SERVERCONSOLE_BanListCallback );
+//				DialogBox( g_hInst, MAKEINTRESOURCE( IDD_BANLIST ), hDlg, SERVERCONSOLE_BanListCallback );
 				break;
 			case IDM_HOW_TO_USE1:
 
@@ -769,10 +770,11 @@ void serverconsole_ScoreboardRightClicke
 		if ( iSelection == IDR_PLAYER_BAN_DIALOG )
 		{
 			strcpy( g_szScoreboard_Reason, "" );
-			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_BANPLAYER_ADV ), g_hDlg, serverconsole_BanPlayerAdvancedCallback );
+//			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_BANPLAYER_ADV ), g_hDlg, serverconsole_BanPlayerAdvancedCallback );
 		}
 		else if ( strlen( g_szBanLength ))
-			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_BANPLAYER_SIMPLE ), g_hDlg, serverconsole_BanPlayerSimpleCallback );
+//			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_BANPLAYER_SIMPLE ), g_hDlg, serverconsole_BanPlayerSimpleCallback );
+;
 	}
 }
 
@@ -1143,7 +1145,7 @@ BOOL CALLBACK serverconsole_BanPlayerSim
 
 				GetDlgItemText( hDlg, IDC_REASON, g_szScoreboard_Reason, 512 );				
 				EndDialog( hDlg, -1 );
-				DialogBox( g_hInst, MAKEINTRESOURCE( IDD_BANPLAYER_ADV ), g_hDlg, serverconsole_BanPlayerAdvancedCallback );
+//				DialogBox( g_hInst, MAKEINTRESOURCE( IDD_BANPLAYER_ADV ), g_hDlg, serverconsole_BanPlayerAdvancedCallback );
 				break;
 			case IDCANCEL:
 
@@ -1346,11 +1348,11 @@ BOOL CALLBACK SERVERCONSOLE_BanListCallb
 					if ( lIdx != LB_ERR )
 					{
 						SendDlgItemMessage( hDlg, IDC_BANLIST, LB_GETTEXT, lIdx, (LPARAM)g_szBanEditString );
-						if ( DialogBox( g_hInst, MAKEINTRESOURCE( IDD_EDITBAN ), hDlg, SERVERCONSOLE_EditBanCallback ))
-						{
-							SendDlgItemMessage( hDlg, IDC_BANLIST, LB_DELETESTRING, lIdx, 0 );
-							SendDlgItemMessage( hDlg, IDC_BANLIST, LB_INSERTSTRING, lIdx, (LPARAM)g_szBanEditString );
-						}
+//						if ( DialogBox( g_hInst, MAKEINTRESOURCE( IDD_EDITBAN ), hDlg, SERVERCONSOLE_EditBanCallback ))
+//						{
+//							SendDlgItemMessage( hDlg, IDC_BANLIST, LB_DELETESTRING, lIdx, 0 );
+//							SendDlgItemMessage( hDlg, IDC_BANLIST, LB_INSERTSTRING, lIdx, (LPARAM)g_szBanEditString );
+//						}
 					}
 					else
 						MessageBox( hDlg, "Please select a ban to edit first.", SERVERCONSOLE_TITLESTRING, MB_OK );
--- src/win32/serverconsole/serverconsole_dmflags.cpp
+++ src/win32/serverconsole/serverconsole_dmflags.cpp
@@ -533,7 +533,7 @@ void flags_ReadNewValue( HWND hDlg, int 
 static void flags_InsertTab( char *pszTitle, int iResource, HWND hDlg, TCITEM tcitem, HWND edit, RECT tabrect, RECT tcrect, int &index )
 {
 	tcitem.pszText = pszTitle;
-	tcitem.lParam = (LPARAM) CreateDialogParam( g_hInst, MAKEINTRESOURCE( iResource ), hDlg, flags_GenericTabCallback, (LPARAM) edit );
+//	tcitem.lParam = (LPARAM) CreateDialogParam( g_hInst, MAKEINTRESOURCE( iResource ), hDlg, flags_GenericTabCallback, (LPARAM) edit );
 	TabCtrl_InsertItem( edit, index, &tcitem );
 	SetWindowPos( (HWND) tcitem.lParam, HWND_TOP, tcrect.left + 3, tcrect.top + tabrect.bottom + 3,
 		tcrect.right - tcrect.left - 8, tcrect.bottom - tcrect.top - tabrect.bottom - 8, 0 );
--- src/win32/serverconsole/serverconsole_settings.cpp
+++ src/win32/serverconsole/serverconsole_settings.cpp
@@ -144,7 +144,7 @@ BOOL	CALLBACK		settings_AccessTab_Callba
 
 void SERVERCONSOLE_SETTINGS_Display( HWND hDlg )
 {
-	DialogBox( g_hInst, MAKEINTRESOURCE( IDD_SERVERSETTINGS_DIALOG ), hDlg, settings_Dialog_Callback );
+//	DialogBox( g_hInst, MAKEINTRESOURCE( IDD_SERVERSETTINGS_DIALOG ), hDlg, settings_Dialog_Callback );
 }
 
 //==========================================================================
@@ -397,25 +397,25 @@ BOOL CALLBACK settings_Dialog_Callback( 
 
 		// Create the tabs.
 		tcitem.pszText = "Server information";
-		tcitem.lParam = (LPARAM) CreateDialogParam( g_hInst, MAKEINTRESOURCE( IDD_SERVERSETTINGS_SERVERTAB ), hDlg, settings_ServerTab_Callback, (LPARAM) edit );
+//		tcitem.lParam = (LPARAM) CreateDialogParam( g_hInst, MAKEINTRESOURCE( IDD_SERVERSETTINGS_SERVERTAB ), hDlg, settings_ServerTab_Callback, (LPARAM) edit );
 		TabCtrl_InsertItem( edit, 0, &tcitem );
 		SetWindowPos( (HWND) tcitem.lParam, HWND_TOP, tcrect.left + 3, tcrect.top + tabrect.bottom + 3,
 			tcrect.right - tcrect.left - 8, tcrect.bottom - tcrect.top - tabrect.bottom - 8, 0 );
 
 		tcitem.pszText = "Gameplay";
-		tcitem.lParam = (LPARAM) CreateDialogParam( g_hInst, MAKEINTRESOURCE( IDD_SERVERSETTINGS_GAMEPLAYTAB ), hDlg, settings_GameplayTab_Callback, (LPARAM) edit );
+//		tcitem.lParam = (LPARAM) CreateDialogParam( g_hInst, MAKEINTRESOURCE( IDD_SERVERSETTINGS_GAMEPLAYTAB ), hDlg, settings_GameplayTab_Callback, (LPARAM) edit );
 		TabCtrl_InsertItem( edit, 1, &tcitem );		
 		SetWindowPos( (HWND) tcitem.lParam, HWND_TOP, tcrect.left + 3, tcrect.top + tabrect.bottom + 3,
 			tcrect.right - tcrect.left - 8, tcrect.bottom - tcrect.top - tabrect.bottom - 8, 0 );
 
 		tcitem.pszText = "Access";
-		tcitem.lParam = (LPARAM) CreateDialogParam( g_hInst, MAKEINTRESOURCE( IDD_SERVERSETTINGS_ACCESSTAB ), hDlg, settings_AccessTab_Callback, (LPARAM) edit );
+//		tcitem.lParam = (LPARAM) CreateDialogParam( g_hInst, MAKEINTRESOURCE( IDD_SERVERSETTINGS_ACCESSTAB ), hDlg, settings_AccessTab_Callback, (LPARAM) edit );
 		TabCtrl_InsertItem( edit, 3, &tcitem );		
 		SetWindowPos( (HWND) tcitem.lParam, HWND_TOP, tcrect.left + 3, tcrect.top + tabrect.bottom + 3,
 			tcrect.right - tcrect.left - 8, tcrect.bottom - tcrect.top - tabrect.bottom - 8, 0 );
 
 		tcitem.pszText = "Administration";
-		tcitem.lParam = (LPARAM) CreateDialogParam( g_hInst, MAKEINTRESOURCE( IDD_SERVERSETTINGS_ADMINTAB ), hDlg, settings_AdminTab_Callback, (LPARAM) edit );
+//		tcitem.lParam = (LPARAM) CreateDialogParam( g_hInst, MAKEINTRESOURCE( IDD_SERVERSETTINGS_ADMINTAB ), hDlg, settings_AdminTab_Callback, (LPARAM) edit );
 		TabCtrl_InsertItem( edit, 4, &tcitem );		
 		SetWindowPos( (HWND) tcitem.lParam, HWND_TOP, tcrect.left + 3, tcrect.top + tabrect.bottom + 3,
 			tcrect.right - tcrect.left - 8, tcrect.bottom - tcrect.top - tabrect.bottom - 8, 0 );
@@ -625,7 +625,7 @@ BOOL CALLBACK settings_ServerTab_Callbac
 	case WM_COMMAND:
 
 		if ( LOWORD( wParam ) == IDC_STARTUPMESSAGE )
-			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_EDITMOTD ), hDlg, settings_ServerTab_MOTDCallback );
+//			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_EDITMOTD ), hDlg, settings_ServerTab_MOTDCallback );
 		break;
 	}
 
@@ -746,9 +746,9 @@ BOOL CALLBACK settings_GameplayTab_Callb
 		if ( LOWORD( wParam ) == IDC_GAMEPLAYMODE )
 			settings_GameplayTab_ShowOrHideItems( hDlg );
 		if ( LOWORD( wParam ) == IDC_MAPLIST )
-			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_MAPROTATION ), hDlg, SERVERCONSOLE_MapRotationCallback );
+//			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_MAPROTATION ), hDlg, SERVERCONSOLE_MapRotationCallback );
 		if ( LOWORD( wParam ) == IDC_SHOWFLAGS )
-			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_DMFLAGS ), hDlg, SERVERCONSOLE_DMFlagsCallback );
+//			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_DMFLAGS ), hDlg, SERVERCONSOLE_DMFlagsCallback );
 		break;
 	}
 
@@ -821,9 +821,9 @@ BOOL CALLBACK settings_AdminTab_Callback
 		}
 
 		if ( LOWORD( wParam ) == IDC_MESSAGES )
-			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_MESSAGEOPTIONS ), hDlg, SERVERCONSOLE_MessagesCallback );
+//			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_MESSAGEOPTIONS ), hDlg, SERVERCONSOLE_MessagesCallback );
 		if ( LOWORD( wParam ) == IDC_BANLIST )
-			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_BANLIST ), hDlg, SERVERCONSOLE_BanListCallback );
+//			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_BANLIST ), hDlg, SERVERCONSOLE_BanListCallback );
 
 		break;
 	}
@@ -926,7 +926,7 @@ BOOL CALLBACK settings_AccessTab_Callbac
 			break;
 		case IDC_BANLIST:
 
-			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_BANLIST ), hDlg, SERVERCONSOLE_BanListCallback );
+//			DialogBox( g_hInst, MAKEINTRESOURCE( IDD_BANLIST ), hDlg, SERVERCONSOLE_BanListCallback );
 			/*
 			SERVERCONSOLE_IPLIST_Display( hDlg, IPLIST_BAN );			
 			break;