diff -r -u --ignore-case clients.old/pgp/win32/outlookexpress/commonwndproc.cpp clients/pgp/win32/outlookexpress/commonwndproc.cpp
--- clients.old/pgp/win32/outlookexpress/commonwndproc.cpp Mon Feb 1 11:03:27 1999
+++ clients/pgp/win32/outlookexpress/commonwndproc.cpp Thu Feb 11 23:19:06 1999
@@ -78,7 +78,7 @@
if (bPluginMenu)
{
- CallWindowProc(lpOldProc, hDlg, msg, wParam, lParam);
+ //CallWindowProc((long)(struct HWND__ *)lpOldProc, hDlg, msg, wParam, lParam);
SendMessage(plugin->hStatusBar, SB_SETTEXT,
255 | SBT_NOBORDERS, (LPARAM) szText);
@@ -122,7 +122,7 @@
}
}
- return CallWindowProc(lpOldProc, hDlg, msg, wParam, lParam);
+ return 0;// CallWindowProc(lpOldProc, hDlg, msg, wParam, lParam);
}
diff -r -u --ignore-case clients.old/pgp/win32/outlookexpress/mainwndproc.cpp clients/pgp/win32/outlookexpress/mainwndproc.cpp
--- clients.old/pgp/win32/outlookexpress/mainwndproc.cpp Mon Feb 1 11:03:27 1999
+++ clients/pgp/win32/outlookexpress/mainwndproc.cpp Thu Feb 11 23:21:04 1999
@@ -170,7 +170,7 @@
if ((HMENU) wParam == plugin->hPGPMenu)
{
- CallWindowProc(lpOldProc, hDlg, msg, wParam, lParam);
+ //CallWindowProc(lpOldProc, hDlg, msg, wParam, lParam);
EnableMenuItem(plugin->hPGPMenu, IDC_PREFS, MF_BYCOMMAND);
EnableMenuItem(plugin->hPGPMenu, IDC_PGPKEYS, MF_BYCOMMAND);
return 0;
@@ -381,7 +381,7 @@
}
}
- return CallWindowProc(lpOldProc, hDlg, msg, wParam, lParam);
+ return 0;//CallWindowProc(lpOldProc, hDlg, msg, wParam, lParam);
}
diff -r -u --ignore-case clients.old/pgp/win32/pgpadmin/passphrase.cpp clients/pgp/win32/pgpadmin/passphrase.cpp
--- clients.old/pgp/win32/pgpadmin/passphrase.cpp Mon Feb 1 11:03:28 1999
+++ clients/pgp/win32/pgpadmin/passphrase.cpp Thu Feb 11 22:59:12 1999
@@ -138,7 +138,7 @@
BOOL bError = FALSE;
bReturnCode = TRUE;
- LoadString(g_hInstance, IDS_TITLE, szTitle, 254);
+ LoadString((HINSTANCE__ *)g_hInstance, IDS_TITLE, szTitle, 254);
// Check data validity
@@ -147,7 +147,7 @@
if ((pConfig->nMinChars < 8) ||
(pConfig->nMinChars > 128))
{
- LoadString(g_hInstance, IDS_E_MINCHARSRANGE,
+ LoadString((HINSTANCE__ *)g_hInstance, IDS_E_MINCHARSRANGE,
szErrorMsg, 254);
bError = TRUE;
}
@@ -158,7 +158,7 @@
if ((pConfig->nMinQuality < 20) ||
(pConfig->nMinQuality > 100))
{
- LoadString(g_hInstance, IDS_E_MINQUALRANGE,
+ LoadString((HINSTANCE__ *)g_hInstance, IDS_E_MINQUALRANGE,
szErrorMsg, 254);
bError = TRUE;
}
diff -r -u --ignore-case clients.old/pgp/win32/pgpadmin/pgpadmin.cpp clients/pgp/win32/pgpadmin/pgpadmin.cpp
--- clients.old/pgp/win32/pgpadmin/pgpadmin.cpp Mon Feb 1 11:03:28 1999
+++ clients/pgp/win32/pgpadmin/pgpadmin.cpp Thu Feb 11 23:05:18 1999
@@ -53,7 +53,7 @@
wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ADMIN));
wc.hCursor = LoadCursor((HINSTANCE) NULL,
IDC_ARROW);
- wc.hbrBackground = GetStockObject(WHITE_BRUSH);
+ wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH);
wc.lpszMenuName = MAKEINTRESOURCE(IDR_MENU);
wc.lpszClassName = "PGPAdminWizardClass";
diff -r -u --ignore-case clients.old/pgp/win32/pgpadmin/pgpadmin.h clients/pgp/win32/pgpadmin/pgpadmin.h
--- clients.old/pgp/win32/pgpadmin/pgpadmin.h Mon Feb 1 11:03:28 1999
+++ clients/pgp/win32/pgpadmin/pgpadmin.h Thu Feb 11 23:00:42 1999
@@ -116,8 +116,8 @@
// Global variables
-extern HWND g_hInstance;
-
+//extern HWND g_hInstance;
+extern HINSTANCE g_hInstance;
// Wizard page dialog procedures
BOOL CALLBACK LicenseDlgProc(HWND hwndDlg,
diff -r -u --ignore-case clients.old/pgp/win32/pgpadmin/utils.cpp clients/pgp/win32/pgpadmin/utils.cpp
--- clients.old/pgp/win32/pgpadmin/utils.cpp Mon Feb 1 11:03:28 1999
+++ clients/pgp/win32/pgpadmin/utils.cpp Thu Feb 11 23:06:00 1999
@@ -263,14 +263,14 @@
PGPPublicKeyAlgorithm keyAlg;
hList = GetDlgItem(hWnd, nListCtrl);
- nNumItems = ListView_GetItemCount(hList);
+ nNumItems = ListView_GetItemCount((HWND) hList);
for (nIndex=0; nIndex<nNumItems; nIndex++)
{
lviKey.mask = LVIF_PARAM | LVIF_IMAGE;
lviKey.iItem = nIndex;
lviKey.iSubItem = 0;
- ListView_GetItem(hList, &lviKey);
+ ListView_GetItem((HWND)hList, &lviKey);
szKeyID = (char *) lviKey.lParam;
switch (lviKey.iImage)
@@ -289,7 +289,7 @@
if ((!strcmp(szKeyID, pConfig->szCorpKeyID)) &&
(keyAlg == pConfig->corpKeyType))
{
- ListView_SetItemState(hList, nIndex, LVIS_SELECTED, 0);
+ ListView_SetItemState((HWND)hList, nIndex, LVIS_SELECTED, 0);
bSelected = TRUE;
}
}
@@ -298,7 +298,7 @@
if ((!strcmp(szKeyID, pConfig->szIncomingADKID)) &&
(keyAlg == kPGPPublicKeyAlgorithm_DSA))
{
- ListView_SetItemState(hList, nIndex, LVIS_SELECTED, 0);
+ ListView_SetItemState((HWND)hList, nIndex, LVIS_SELECTED, 0);
bSelected = TRUE;
}
}
@@ -307,7 +307,7 @@
if ((!strcmp(szKeyID, pConfig->szOutgoingADKID)) &&
(keyAlg == pConfig->outgoingADKKeyType))
{
- ListView_SetItemState(hList, nIndex, LVIS_SELECTED, 0);
+ ListView_SetItemState((HWND)hList, nIndex, LVIS_SELECTED, 0);
bSelected = TRUE;
}
}
@@ -437,7 +437,7 @@
hDC = BeginPaint (hWnd, &ps);
hMemDC = CreateCompatibleDC (hDC);
- hBitmapOld = SelectObject (hMemDC, hBitmap);
+ hBitmapOld = (HBITMAP) SelectObject (hMemDC, hBitmap);
BitBlt (hDC, uXpos, uYpos, uXsize, uYsize, hMemDC, 0, 0, SRCCOPY);
SelectObject (hMemDC, hBitmapOld);
DeleteDC (hMemDC);
diff -r -u --ignore-case clients.old/pgp/win32/pgpkeys/gmidroptarget.cpp clients/pgp/win32/pgpkeys/gmidroptarget.cpp
--- clients.old/pgp/win32/pgpkeys/gmidroptarget.cpp Mon Feb 1 11:03:30 1999
+++ clients/pgp/win32/pgpkeys/gmidroptarget.cpp Wed Feb 10 23:20:10 1999
@@ -203,7 +203,7 @@
if (!FAILED(hr)) {
// Import the data and release it.
hGlobal = medium.hGlobal;
- GMImportGroups ((PGROUPMAN)m_pGroupMan, hGlobal);
+ GMImportGroups ((PGROUPMAN)m_pGroupMan, (struct HDROP__ *)hGlobal);
ReleaseStgMedium (&medium);
*pdwEffect = DROPEFFECT_COPY;
return NOERROR;
