1 files changed, 11 insertions, 12 deletions

diff --git a/src/FileViewer.cpp b/src/FileViewer.cpp
index 191f744..1ca4192 100755
--- a/src/FileViewer.cpp
+++ b/src/FileViewer.cpp
@@ -880,8 +880,7 @@ bool bAdvancedCopy(HWND hwnd)
 

 LRESULT CALLBACK EditSubclassProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	CLHistoryDlg * pclDlg = (CLHistoryDlg *)GetWindowLong(hwnd,GWL_USERDATA);

-

+	CLHistoryDlg * pclDlg = (CLHistoryDlg *)GetWindowLongPtr(hwnd, -21);

 	switch( msg )

 	{

 		case WM_CONTEXTMENU:

@@ -961,7 +960,7 @@ LRESULT CALLBACK EditSubclassProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 				res = SendMessage(hwnd, EM_FINDTEXT, (WPARAM)fr->Flags,(LPARAM)&ft);

 				if(res == -1) 

 				{

-					MessageBox( hwnd , TranslateTS(_T("Search string was not found !")),MSG_BOX_TITEL,MB_OK );

+					MessageBox( hwnd , LPGENT("Search string was not found !"),MSG_BOX_TITEL,MB_OK );

 					return 0;

 				}

 			}			

@@ -1080,13 +1079,13 @@ void SetRichEditFont(HWND hRichEdit, bool bUseSyntaxHL )
 

 static BOOL CALLBACK DlgProcFileViewer(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	CLHistoryDlg * pclDlg = (CLHistoryDlg *)GetWindowLong(hwndDlg,GWL_USERDATA);

+	CLHistoryDlg * pclDlg = (CLHistoryDlg *)GetWindowLongPtr(hwndDlg,-21);

 

 	switch (msg)

 	{

 		case WM_INITDIALOG:

 		{

-			SetWindowLong(hwndDlg,GWL_USERDATA,lParam);

+			SetWindowLongPtr(hwndDlg,-21,lParam);

 			CLHistoryDlg * pclDlg = (CLHistoryDlg *)lParam;

 #ifdef _UNICODE

 			EnableWindow( GetDlgItem( hwndDlg , IDC_FV_FIND ) , FALSE );

@@ -1095,7 +1094,7 @@ static BOOL CALLBACK DlgProcFileViewer(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				(LPARAM)LoadIcon( hInstance, MAKEINTRESOURCE(IDI_EXPORT_MESSAGE)));

 

 			HWND hRichEdit = GetDlgItem( hwndDlg , IDC_RICHEDIT );

-			pclDlg->wpOrigEditProc = (WNDPROC) SetWindowLongPtr( hRichEdit, GWL_WNDPROC, (LONG) EditSubclassProc); 

+			pclDlg->wpOrigEditProc = (WNDPROC) SetWindowLongPtr( hRichEdit, -4, (LONG) EditSubclassProc); 

 			

 			SetWindowLongPtr( hRichEdit, GWLP_USERDATA, (LONG) pclDlg ); 

 			

@@ -1105,12 +1104,12 @@ static BOOL CALLBACK DlgProcFileViewer(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			HMENU hSysMenu = GetSystemMenu( hwndDlg , FALSE );

 

 			InsertMenu( hSysMenu , 0 , MF_SEPARATOR | MF_BYPOSITION , 0 , 0 );

-			InsertMenu( hSysMenu , 0 , MF_STRING | MF_BYPOSITION , ID_FV_SAVE_AS_RTF, TranslateTS(_T("Save as RTF")) );

+			InsertMenu( hSysMenu , 0 , MF_STRING | MF_BYPOSITION , ID_FV_SAVE_AS_RTF, LPGENT("Save as RTF") );

 

 			InsertMenu( hSysMenu , 0 , MF_SEPARATOR | MF_BYPOSITION , 0 , 0 );

 

 			BYTE bUseCC = (BYTE)DBGetContactSettingByte( NULL , MODULE , szFileViewDB "UseCC" , 0 );

-			InsertMenu( hSysMenu , 0 , MF_STRING | MF_BYPOSITION | ( bUseCC ? MF_CHECKED : 0 ) , ID_FV_COLOR, TranslateTS(_T("Color...")) );

+			InsertMenu( hSysMenu , 0 , MF_STRING | MF_BYPOSITION | ( bUseCC ? MF_CHECKED : 0 ) , ID_FV_COLOR, LPGENT("Color...") );

 

 			if( bUseCC )

 			{

@@ -1119,11 +1118,11 @@ static BOOL CALLBACK DlgProcFileViewer(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				);

 			}

 

-			InsertMenu( hSysMenu , 0 , MF_STRING | MF_BYPOSITION , ID_FV_FONT, TranslateTS(_T("Font...")) );

+			InsertMenu( hSysMenu , 0 , MF_STRING | MF_BYPOSITION , ID_FV_FONT, LPGENT("Font...") );

 

 

 			bool bUseSyntaxHL = DBGetContactSettingByte( NULL , MODULE , szFileViewDB "UseSyntaxHL" , 1 )!=0;

-			InsertMenu( hSysMenu , 0 , MF_STRING | MF_BYPOSITION | ( bUseSyntaxHL ? MF_CHECKED : 0 ) , ID_FV_SYNTAX_HL, TranslateTS(_T("Syntax highlight")) );

+			InsertMenu( hSysMenu , 0 , MF_STRING | MF_BYPOSITION | ( bUseSyntaxHL ? MF_CHECKED : 0 ) , ID_FV_SYNTAX_HL, LPGENT("Syntax highlight") );

 

 			SetRichEditFont( hRichEdit , bUseSyntaxHL );

 

@@ -1185,7 +1184,7 @@ static BOOL CALLBACK DlgProcFileViewer(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			LeaveCriticalSection( &csHistoryList );

 

 			delete pclDlg;

-         SetWindowLong(hwndDlg,GWL_USERDATA,NULL);

+         SetWindowLongPtr(hwndDlg,-21,NULL);

          return 0;

       }

       case WM_DESTROY:

@@ -1408,7 +1407,7 @@ static BOOL CALLBACK DlgProcFileViewer(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 bool bShowFileViewer( HANDLE hContact )

 {

 	CLHistoryDlg * pcl = new CLHistoryDlg( hContact );

-	pcl->hWnd = CreateDialogParam( hInstance,MAKEINTRESOURCE(IDD_FILE_VIEWER),NULL,DlgProcFileViewer,(LPARAM)pcl);

+	pcl->hWnd = CreateDialogParam( hInstance,MAKEINTRESOURCE(IDD_FILE_VIEWER),NULL,(DLGPROC)DlgProcFileViewer,(LPARAM)pcl);

 	if( pcl->hWnd )

 	{

 		EnterCriticalSection( &csHistoryList );