diff options
Diffstat (limited to 'plugins/Msg_Export/src')
| -rwxr-xr-x | plugins/Msg_Export/src/FileViewer.cpp | 13 | ||||
| -rwxr-xr-x | plugins/Msg_Export/src/main.cpp | 4 | ||||
| -rwxr-xr-x | plugins/Msg_Export/src/options.cpp | 8 |
3 files changed, 12 insertions, 13 deletions
diff --git a/plugins/Msg_Export/src/FileViewer.cpp b/plugins/Msg_Export/src/FileViewer.cpp index 191f744571..89925a48f4 100755 --- a/plugins/Msg_Export/src/FileViewer.cpp +++ b/plugins/Msg_Export/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:
@@ -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 );
@@ -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 );
diff --git a/plugins/Msg_Export/src/main.cpp b/plugins/Msg_Export/src/main.cpp index 5d9ce233dc..1433bac97f 100755 --- a/plugins/Msg_Export/src/main.cpp +++ b/plugins/Msg_Export/src/main.cpp @@ -343,7 +343,7 @@ int __declspec(dllexport)Load() if( bReplaceHistory )
{
- hServiceFunc = CreateServiceFunction(MS_HISTORY_SHOWCONTACTHISTORY,ShowExportHistory); //this need new code
+ hServiceFunc = CreateServiceFunction(MS_HISTORY_SHOWCONTACTHISTORY,(MIRANDASERVICE)ShowExportHistory); //this need new code
/* if( hServiceFunc )
{
int *disableDefaultModule=(int*)CallService(MS_PLUGINS_GETDISABLEDEFAULTARRAY,0,0);
@@ -364,7 +364,7 @@ int __declspec(dllexport)Load() if( ! hServiceFunc )
{
- hServiceFunc = CreateServiceFunction(MS_SHOW_EXPORT_HISTORY,ShowExportHistory);
+ hServiceFunc = CreateServiceFunction(MS_SHOW_EXPORT_HISTORY,(MIRANDASERVICE)ShowExportHistory);
}
if( ! hServiceFunc )
diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp index 17bc917bb7..02477c2539 100755 --- a/plugins/Msg_Export/src/options.cpp +++ b/plugins/Msg_Export/src/options.cpp @@ -1158,7 +1158,7 @@ static BOOL CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wParam, {
case CDDS_PREPAINT:
{
- SetWindowLong(hwndDlg, DWL_MSGRESULT, CDRF_NOTIFYITEMDRAW);
+ SetWindowLongPtr(hwndDlg, 0, CDRF_NOTIFYITEMDRAW);
return true;
}
case CDDS_ITEMPREPAINT:
@@ -1167,7 +1167,7 @@ static BOOL CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wParam, {
lplvcd->clrText = RGB( 0 , 0 , 255 );
}
- SetWindowLong(hwndDlg, DWL_MSGRESULT, CDRF_NEWFONT);
+ SetWindowLongPtr(hwndDlg, 0, CDRF_NEWFONT);
return true;
}
}
@@ -1470,14 +1470,14 @@ int OptionsInitialize(WPARAM wParam,LPARAM /*lParam*/) odp.pszTitle = Translate("Message export");
odp.pszGroup = Translate("Plugins");
odp.groupPosition = 100000000;
- odp.pfnDlgProc = DlgProcMsgExportOpts;
+ odp.pfnDlgProc = (DLGPROC)DlgProcMsgExportOpts;
Options_AddPage(wParam,&odp);
odp.position = 100000001;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGEXPORT2);
odp.pszTitle = Translate("Message export2");
- odp.pfnDlgProc = DlgProcMsgExportOpts2;
+ odp.pfnDlgProc = (DLGPROC)DlgProcMsgExportOpts2;
Options_AddPage(wParam,&odp);
return 0;
}
|