diff options
| -rw-r--r-- | plugins/FileAsMessage/dialog.cpp | 6 | ||||
| -rw-r--r-- | plugins/FileAsMessage/dialog.h | 2 | ||||
| -rw-r--r-- | plugins/FileAsMessage/main.cpp | 29 | ||||
| -rw-r--r-- | plugins/FileAsMessage/optionsdlg.cpp | 2 |
4 files changed, 16 insertions, 23 deletions
diff --git a/plugins/FileAsMessage/dialog.cpp b/plugins/FileAsMessage/dialog.cpp index 5f6a6d5afd..f038b87a33 100644 --- a/plugins/FileAsMessage/dialog.cpp +++ b/plugins/FileAsMessage/dialog.cpp @@ -1130,11 +1130,9 @@ LRESULT CALLBACK ProgressWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa return CallSubclassed(hwnd, uMsg, wParam, lParam);
}
-LRESULT CALLBACK DialogProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
+INT_PTR CALLBACK DialogProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
{
- struct FILEECHO *dat;
-
- dat = (struct FILEECHO*)GetWindowLongPtr(hDlg, GWLP_USERDATA);
+ struct FILEECHO *dat = (struct FILEECHO*)GetWindowLongPtr(hDlg, GWLP_USERDATA);
switch( uMsg )
{
case WM_INITDIALOG:
diff --git a/plugins/FileAsMessage/dialog.h b/plugins/FileAsMessage/dialog.h index ab5795dc0f..679742c2f6 100644 --- a/plugins/FileAsMessage/dialog.h +++ b/plugins/FileAsMessage/dialog.h @@ -5,7 +5,7 @@ extern HINSTANCE hInst; int getMsgId(char *msg);
-LRESULT CALLBACK DialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
+INT_PTR CALLBACK DialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
#ifdef _DEBUG
#define CHECKPOINT
diff --git a/plugins/FileAsMessage/main.cpp b/plugins/FileAsMessage/main.cpp index d9da47e448..b797c53b9b 100644 --- a/plugins/FileAsMessage/main.cpp +++ b/plugins/FileAsMessage/main.cpp @@ -24,7 +24,7 @@ char *szServiceTitle = SERVICE_TITLE; char *szServicePrefix = SERVICE_PREFIX;
HANDLE hHookDbSettingChange, hHookContactAdded, hHookSkinIconsChanged;
-extern LRESULT CALLBACK OptionsDlgProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
+extern INT_PTR CALLBACK OptionsDlgProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam );
int idIcons[5] = {IDI_PLAY, IDI_PAUSE, IDI_REFRESH, IDI_STOP, IDI_SMALLICON};
HICON hIcons[5];
@@ -87,9 +87,8 @@ int OnSkinIconsChanged(WPARAM wParam,LPARAM lParam) int OnSettingChanged(WPARAM wParam,LPARAM lParam)
{
DBCONTACTWRITESETTING *cws=(DBCONTACTWRITESETTING*)lParam;
- HWND hwnd;
- hwnd = WindowList_Find(hFileList,(HANDLE)wParam);
+ HWND hwnd = WindowList_Find(hFileList,(HANDLE)wParam);
PostMessage(hwnd, WM_FE_STATUSCHANGE, 0,0);
//OnSkinIconsChanged(0,0);
//PostMessage(hwnd, WM_FE_SKINCHANGE, 0,0);
@@ -105,10 +104,9 @@ int OnContactAdded(WPARAM wParam,LPARAM lParam) INT_PTR OnRecvFile(WPARAM wParam, LPARAM lParam)
{
- HWND hwnd;
CLISTEVENT *clev = (CLISTEVENT*)lParam;
- hwnd = WindowList_Find(hFileList,(HANDLE)clev->hContact);
+ HWND hwnd = WindowList_Find(hFileList,(HANDLE)clev->hContact);
if(IsWindow(hwnd))
{
ShowWindow(hwnd, SW_SHOWNORMAL);
@@ -136,9 +134,7 @@ INT_PTR OnRecvFile(WPARAM wParam, LPARAM lParam) INT_PTR OnSendFile(WPARAM wParam, LPARAM lParam)
{
- HWND hwnd;
-
- hwnd = WindowList_Find(hFileList,(HANDLE)wParam);
+ HWND hwnd = WindowList_Find(hFileList,(HANDLE)wParam);
if(IsWindow(hwnd))
{
SetForegroundWindow(hwnd);
@@ -149,7 +145,7 @@ INT_PTR OnSendFile(WPARAM wParam, LPARAM lParam) if(hwnd != 0) WindowList_Remove(hFileList, hwnd);
FILEECHO *fe = new FILEECHO((HANDLE)wParam);
fe->inSend = TRUE;
- hwnd = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_MAIN), NULL, (DLGPROC)DialogProc, (LPARAM)fe);
+ hwnd = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_MAIN), NULL, DialogProc, (LPARAM)fe);
if(hwnd == NULL)
{
delete fe;
@@ -165,18 +161,17 @@ INT_PTR OnRecvMessage( WPARAM wParam, LPARAM lParam ) {
CCSDATA *pccsd = (CCSDATA *)lParam;
PROTORECVEVENT *ppre = ( PROTORECVEVENT * )pccsd->lParam;
- HWND hwnd;
if(strncmp(ppre->szMessage, szServicePrefix, strlen(szServicePrefix)))
return CallService( MS_PROTO_CHAINRECV, wParam, lParam );
- hwnd = (HWND)WindowList_Find(hFileList, (HANDLE)pccsd->hContact);
+ HWND hwnd = WindowList_Find(hFileList, (HANDLE)pccsd->hContact);
if(!IsWindow(hwnd))
{
if(hwnd != 0) WindowList_Remove(hFileList, hwnd);
FILEECHO *fe = new FILEECHO((HANDLE)pccsd->hContact);
fe->inSend = FALSE;
- hwnd = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_MAIN), NULL, (DLGPROC)DialogProc, (LPARAM)fe);
+ hwnd = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_MAIN), NULL, DialogProc, (LPARAM)fe);
if(hwnd == NULL)
{
delete fe;
@@ -197,11 +192,11 @@ int OnOptInitialise(WPARAM wParam, LPARAM lParam) odp.cbSize = sizeof(odp);
odp.hInstance = hInst;
- odp.pszTemplate = MAKEINTRESOURCE(IDD_OPTIONS);
- odp.pszTitle = Translate(SERVICE_TITLE);
- odp.pszGroup = Translate("Plugins");
- odp.flags = ODPF_BOLDGROUPS;
- odp.pfnDlgProc = (DLGPROC)OptionsDlgProc;
+ odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
+ odp.ptszTitle = _T(SERVICE_TITLE);
+ odp.ptszGroup = _T("Plugins");
+ odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR;
+ odp.pfnDlgProc = OptionsDlgProc;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/FileAsMessage/optionsdlg.cpp b/plugins/FileAsMessage/optionsdlg.cpp index da605d0f32..748a118db5 100644 --- a/plugins/FileAsMessage/optionsdlg.cpp +++ b/plugins/FileAsMessage/optionsdlg.cpp @@ -35,7 +35,7 @@ int settingId[] = // this handles the options page
// verwaltet die Optionsseite
//
-LRESULT CALLBACK OptionsDlgProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
+INT_PTR CALLBACK OptionsDlgProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
{
switch( uMsg )
{
|