NewStory: worning fixes, icons compiles

12 files changed, 68 insertions, 66 deletions

diff --git a/plugins/NewStory/src/calendartool.cpp b/plugins/NewStory/src/calendartool.cpp
index e7cd6041dd..c9ca60ab64 100644
--- a/plugins/NewStory/src/calendartool.cpp
+++ b/plugins/NewStory/src/calendartool.cpp
@@ -7,13 +7,13 @@ struct CalendarToolData
 
 INT_PTR CALLBACK CalendarToolDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	CalendarToolData *data = (CalendarToolData *)GetWindowLong(hwnd, GWLP_USERDATA);
+	CalendarToolData *data = (CalendarToolData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 	switch (msg)
 	{
 		case WM_INITDIALOG:
 		{
 			data = (CalendarToolData *)lParam;
-			SetWindowLong(hwnd, GWLP_USERDATA, (LONG)data);
+			SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)data);
 
 // This causes ALL miranda dialogs to have drop-shadow enabled. That's bad =(
 //			SetClassLong(hwnd, GCL_STYLE, GetClassLong(hwnd, GCL_STYLE)|CS_DROPSHADOW);
@@ -73,7 +73,7 @@ INT_PTR CALLBACK CalendarToolDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 		{
 			delete data;
 			data = 0;
-			SetWindowLong(hwnd, GWLP_USERDATA, 0);
+			SetWindowLongPtr(hwnd, GWLP_USERDATA, 0);
 		}
 	}
 	return FALSE;
diff --git a/plugins/NewStory/src/fonts.h b/plugins/NewStory/src/fonts.h
index 020e61d68a..4718aacb72 100644
--- a/plugins/NewStory/src/fonts.h
+++ b/plugins/NewStory/src/fonts.h
@@ -23,6 +23,8 @@ struct MyColourID
 	COLORREF defaultValue, cl;
 };
 
+
+
 extern MyColourID colors[];
 
 enum
diff --git a/plugins/NewStory/src/history.cpp b/plugins/NewStory/src/history.cpp
index 267b2f42c1..e27f9a9603 100644
--- a/plugins/NewStory/src/history.cpp
+++ b/plugins/NewStory/src/history.cpp
@@ -408,12 +408,12 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 {
 	//CallSnappingWindowProc(hwnd, msg, wParam, lParam);
 
-	WindowData *data = (WindowData *)GetWindowLong(hwnd, GWLP_USERDATA);
+	WindowData *data = (WindowData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 
 	if ((msg >= NSM_FIRST) && (msg < NSM_LAST))
 	{
 		int result = SendMessage(GetDlgItem(hwnd, IDC_ITEMS2), msg, wParam, lParam);
-		SetWindowLong(hwnd, DWLP_MSGRESULT, result);
+		SetWindowLongPtr(hwnd, DWLP_MSGRESULT, result);
 		return result;
 	}
 
@@ -511,7 +511,7 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 			SendMessage(data->ibTotal.hwndIcoOut, BM_SETCHECK, BST_CHECKED, 0);
 			data->ibTotal.hwndTxtOut = GetDlgItem(hwnd, IDC_TXT_TOTAL_OUT);
 			
-			SetWindowLong(hwnd, GWLP_USERDATA, (LONG)data);
+			SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)data);
 
 			data->hMenu = LoadMenu(g_plugin.getInst(), MAKEINTRESOURCE(IDR_POPUPS));
 			//CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM)data->hMenu, 0);
@@ -597,10 +597,10 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 
 			RECT rc
 			{
-				db_get_dw(data->hContact, MODULENAME, "left"),
-				db_get_dw(data->hContact, MODULENAME, "top"),
-				db_get_dw(data->hContact, MODULENAME, "right"),
-				db_get_dw(data->hContact, MODULENAME, "bottom")
+				(LONG)db_get_dw(data->hContact, MODULENAME, "left"),
+				(LONG)db_get_dw(data->hContact, MODULENAME, "top"),
+				(LONG)db_get_dw(data->hContact, MODULENAME, "right"),
+				(LONG)db_get_dw(data->hContact, MODULENAME, "bottom")
 			};
 			if ((rc.left-rc.right) && (rc.top-rc.bottom))
 				MoveWindow(hwnd, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, TRUE);
@@ -766,8 +766,8 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 								data->disableTimeTreeChange = false;
 							} else
 							{
-								LPNMTREEVIEW pnmtv = (LPNMTREEVIEW)lParam;
-								int id = pnmtv->itemNew.lParam;
+//								LPNMTREEVIEW pnmtv = (LPNMTREEVIEW)lParam;
+//								int id = pnmtv->itemNew.lParam;
 //								SendMessage(GetDlgItem(hwnd, IDC_ITEMS), LB_SETCARETINDEX, id, 0);
 //								SendMessage(hwnd, WM_COMMAND, MAKEWPARAM(IDC_ITEMS, LBN_SELCHANGE), (LPARAM)GetDlgItem(hwnd, IDC_ITEMS));
 //								SendMessage(GetDlgItem(hwnd, IDC_ITEMS), LB_SETTOPINDEX, id, 0);
@@ -825,7 +825,7 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 				{
 					RECT rc;
 					GetWindowRect(GetDlgItem(hwnd, LOWORD(wParam)), &rc);
-					DWORD itemID = 0;
+//					DWORD itemID = 0;
 					switch (TrackPopupMenu(GetSubMenu(data->hMenu, 2), TPM_RETURNCMD, rc.left, rc.bottom, 0, hwnd, NULL))
 					{
 //						case ID_LOGOPTIONS_SHOWTIMETREE:
@@ -887,9 +887,9 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 					LayoutHistoryWnd(hwnd, data);
 					break;
 
-					RECT rc;
+					/*RECT rc;
 					GetWindowRect(GetDlgItem(hwnd, LOWORD(wParam)), &rc);
-					DWORD itemID = 0;
+//					DWORD itemID = 0;
 					bool doFilter = true;
 					switch (TrackPopupMenu(GetSubMenu(data->hMenu, 1), TPM_RETURNCMD, rc.left, rc.bottom, 0, hwnd, NULL))
 					{
@@ -957,7 +957,7 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 					}
 					if (doFilter)
 						PostMessage(hwnd, UM_REBUILDLIST, 0, 0);
-					break;
+					break;*/
 				}
 
 				case IDC_SECURITY:
@@ -1041,8 +1041,8 @@ INT_PTR svcShowNewstory(WPARAM wParam, LPARAM)
 	} else
 	if (AskPassword((MCONTACT)wParam))
 	{
-		HWND hwnd = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_HISTORY), 0, HistoryDlgProc, wParam);
-		ShowWindow(hwnd, SW_SHOWNORMAL);
+		HWND hwnd2 = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_HISTORY), 0, HistoryDlgProc, wParam);
+		ShowWindow(hwnd2, SW_SHOWNORMAL);
 	}
 	return 0;
 }
@@ -1057,8 +1057,8 @@ INT_PTR svcShowSystemNewstory(WPARAM, LPARAM)
 	} else
 	if (AskPassword(0))
 	{
-		HWND hwnd = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_HISTORY), 0, HistoryDlgProc, 0);
-		ShowWindow(hwnd, SW_SHOWNORMAL);
+		HWND hwnd2 = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_HISTORY), 0, HistoryDlgProc, 0);
+		ShowWindow(hwnd2, SW_SHOWNORMAL);
 	}
 	return 0;
 }
diff --git a/plugins/NewStory/src/history_array.cpp b/plugins/NewStory/src/history_array.cpp
index 6d34d9043d..38d16de58e 100644
--- a/plugins/NewStory/src/history_array.cpp
+++ b/plugins/NewStory/src/history_array.cpp
@@ -34,7 +34,7 @@ bool HistoryArray::ItemData::load(EventLoadMode mode)
 				atext = (char *)dbe.pBlob;
 				atext_del = false;
 				aLength = lstrlenA(atext);
-				if (dbe.cbBlob > aLength+1)
+				if (dbe.cbBlob > (DWORD)aLength + 1)
 				{
 					wtext = (WCHAR *)(dbe.pBlob + aLength + 1);
 					wtext_del = false;
@@ -181,7 +181,7 @@ bool HistoryArray::addHistory(MCONTACT hContact, EventLoadMode)
 		++i;
 		hEvent = db_event_next(hEvent, 0);
 	}
-	char buf[666];
+//	char buf[666];
 
 	return true;
 }
diff --git a/plugins/NewStory/src/history_control.cpp b/plugins/NewStory/src/history_control.cpp
index 8467503026..e0e82d0501 100644
--- a/plugins/NewStory/src/history_control.cpp
+++ b/plugins/NewStory/src/history_control.cpp
@@ -71,7 +71,7 @@ static LRESULT CALLBACK HistoryEditWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 		{
 		case VK_ESCAPE:
 		{
-			EndEditItem(GetParent(hwnd), (NewstoryListData *)GetWindowLong(GetParent(hwnd), 0));
+			EndEditItem(GetParent(hwnd), (NewstoryListData *)GetWindowLongPtr(GetParent(hwnd), 0));
 			return 0;
 		}
 		}
@@ -81,10 +81,10 @@ static LRESULT CALLBACK HistoryEditWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 	{
 		if (lParam)
 		{
-			MSG *msg = (MSG *)lParam;
-			if (msg->message == WM_KEYDOWN && msg->wParam == VK_TAB)
+			MSG *msg2 = (MSG *)lParam;
+			if (msg2->message == WM_KEYDOWN && msg2->wParam == VK_TAB)
 				return 0;
-			if (msg->message == WM_CHAR && msg->wParam == '\t')
+			if (msg2->message == WM_CHAR && msg2->wParam == '\t')
 				return 0;
 		}
 		return DLGC_WANTMESSAGE;
@@ -102,7 +102,7 @@ static LRESULT CALLBACK HistoryEditWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 // WndProc
 LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	NewstoryListData *data = (NewstoryListData *)GetWindowLong(hwnd, 0);
+	NewstoryListData *data = (NewstoryListData *)GetWindowLongPtr(hwnd, 0);
 
 	switch (msg)
 	{
@@ -114,7 +114,7 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 			data->cachedMaxTopItem = 0;
 			data->cachedMaxTopPixel = 0;
 			data->hwndEditBox = 0;
-			SetWindowLong(hwnd, 0, (int)data);
+			SetWindowLongPtr(hwnd, 0, (LONG_PTR)data);
 			RecalcScrollBar(hwnd, data);
 
 			break;
@@ -138,8 +138,8 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 
 		case NSM_SELECTITEMS:
 		{
-			DWORD start = min(data->items.getCount()-1, max(0, wParam));
-			DWORD end = min(data->items.getCount()-1, max(0, lParam));
+			int start = min(data->items.getCount()-1, max(0, wParam));
+			int end = min(data->items.getCount()-1, max(0, lParam));
 			if (start > end)
 			{
 				start ^= end;
@@ -154,8 +154,8 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 
 		case NSM_TOGGLEITEMS:
 		{
-			DWORD start = min(data->items.getCount()-1, max(0, wParam));
-			DWORD end = min(data->items.getCount()-1, max(0, lParam));
+			int start = min(data->items.getCount()-1, max(0, wParam));
+			int end = min(data->items.getCount()-1, max(0, lParam));
 			if (start > end)
 			{
 				start ^= end;
@@ -178,15 +178,15 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 
 		case NSM_SELECTITEMS2:
 		{
-			DWORD start = min(data->items.getCount()-1, max(0, wParam));
-			DWORD end = min(data->items.getCount()-1, max(0, lParam));
+			int start = min(data->items.getCount()-1, max(0, wParam));
+			int end = min(data->items.getCount()-1, max(0, lParam));
 			if (start > end)
 			{
 				start ^= end;
 				end ^= start;
 				start ^= end;
 			}
-			DWORD count = data->items.getCount();
+			int count = data->items.getCount();
 			for (int i = 0; i < count; ++i)
 			{
 				if ((i >= start) && (i <= end))
@@ -203,8 +203,8 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 
 		case NSM_DESELECTITEMS:
 		{
-			DWORD start = min(data->items.getCount()-1, max(0, wParam));
-			DWORD end = min(data->items.getCount()-1, max(0, lParam));
+			int start = min(data->items.getCount()-1, max(0, wParam));
+			int end = min(data->items.getCount()-1, max(0, lParam));
 			if (start > end)
 			{
 				start ^= end;
@@ -375,12 +375,12 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 
 				if (top <= height)
 				{
-					RECT rc;
-					SetRect(&rc, 0, top, width, height);
+					RECT rc2;
+					SetRect(&rc2, 0, top, width, height);
 				
 					HBRUSH hbr;
 					hbr = CreateSolidBrush(RGB(0xff,0xff,0xff));
-					FillRect(hdc, &rc, hbr);
+					FillRect(hdc, &rc2, hbr);
 					DeleteObject(hbr);
 				}
 
@@ -407,19 +407,19 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 		{
 			if (lParam)
 			{
-				MSG *msg = (MSG *) lParam;
-				if (msg->message == WM_KEYDOWN)
+				MSG *msg2 = (MSG *) lParam;
+				if (msg2->message == WM_KEYDOWN)
 				{
-					if (msg->wParam == VK_TAB)
+					if (msg2->wParam == VK_TAB)
 						return 0;
-					if (msg->wParam == VK_ESCAPE && !data->hwndEditBox)
+					if (msg2->wParam == VK_ESCAPE && !data->hwndEditBox)
 						return 0;
 				} else
-				if (msg->message == WM_CHAR)
+				if (msg2->message == WM_CHAR)
 				{
-					if (msg->wParam == '\t')
+					if (msg2->wParam == '\t')
 						return 0;
-					if (msg->wParam == 27 && !data->hwndEditBox)
+					if (msg2->wParam == 27 && !data->hwndEditBox)
 						return 0;
 				}
 			}
@@ -604,7 +604,7 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 		case WM_DESTROY:
 		{
 			delete data;
-			SetWindowLong(hwnd, 0, 0);
+			SetWindowLongPtr(hwnd, 0, 0);
 			break;
 		}
 	}
@@ -807,7 +807,7 @@ static void BeginEditItem(HWND hwnd, NewstoryListData *data, int index)
 
 			TCHAR *text = TplFormatString(tpl, item->hContact, item);
 			data->hwndEditBox = CreateWindow(_T("EDIT"), text, WS_CHILD|WS_BORDER|ES_READONLY|ES_MULTILINE|ES_AUTOVSCROLL, 0, top, rc.right-rc.left, itemHeight, hwnd, NULL, g_plugin.getInst(), NULL);
-			OldEditWndProc = (WNDPROC)SetWindowLong(data->hwndEditBox, GWLP_WNDPROC, (LONG)HistoryEditWndProc);
+			OldEditWndProc = (WNDPROC)SetWindowLongPtr(data->hwndEditBox, GWLP_WNDPROC, (LONG_PTR)HistoryEditWndProc);
 			SendMessage(data->hwndEditBox, WM_SETFONT, (WPARAM)fonts[fontid].hfnt, 0);
 			SendMessage(data->hwndEditBox, EM_SETMARGINS, EC_RIGHTMARGIN, 100);
 			SendMessage(data->hwndEditBox, EM_SETSEL, 0, (LPARAM) (-1));
diff --git a/plugins/NewStory/src/icons.cpp b/plugins/NewStory/src/icons.cpp
index 26a8f01360..36bf44344b 100644
--- a/plugins/NewStory/src/icons.cpp
+++ b/plugins/NewStory/src/icons.cpp
@@ -48,12 +48,12 @@ void InitIcons()
 	HookEvent(ME_SKIN2_ICONSCHANGED, evtIconsChanged);
 }
 
-void RefreshIcons(IconItem *icons, int count)
+/*void RefreshIcons(IconItem *icons, int count)
 {
 	//if (ServiceExists(MS_SKIN2_ADDICON))
 	//	for (int i = 0; i < count; i++)
 	//		icons[i].hIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)icons[i].szId);
-}
+}*/
 
 HICON GetIcon(int iconId)
 {
diff --git a/plugins/NewStory/src/opt_passwords.cpp b/plugins/NewStory/src/opt_passwords.cpp
index 16efd37ec2..eb9be44eaa 100644
--- a/plugins/NewStory/src/opt_passwords.cpp
+++ b/plugins/NewStory/src/opt_passwords.cpp
@@ -19,7 +19,7 @@ static void ResetListOptions(HWND hwndList)
 	SendMessage(hwndList, CLM_SETINDENT, 10, 0);
 	for (int i = 0; i <= FONTID_MAX; i++)
 		SendMessage(hwndList, CLM_SETTEXTCOLOR, i, GetSysColor(COLOR_WINDOWTEXT));
-	SetWindowLong(hwndList, GWL_STYLE, GetWindowLong(hwndList, GWL_STYLE) | CLS_SHOWHIDDEN);
+	SetWindowLongPtr(hwndList, GWL_STYLE, GetWindowLongPtr(hwndList, GWL_STYLE) | CLS_SHOWHIDDEN);
 }
 
 INT_PTR CALLBACK OptPasswordsDlgProc(HWND hwnd, UINT msg, WPARAM, LPARAM lParam)
diff --git a/plugins/NewStory/src/options.cpp b/plugins/NewStory/src/options.cpp
index 0fba7ed390..96c51b3c69 100644
--- a/plugins/NewStory/src/options.cpp
+++ b/plugins/NewStory/src/options.cpp
@@ -20,7 +20,7 @@ void InitOptions()
 
 INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
-static int OptionsInitialize(WPARAM wParam, LPARAM lParam)
+static int OptionsInitialize(WPARAM wParam, LPARAM)
 {
 	OPTIONSDIALOGPAGE odp = { 0 };
 	odp.position = 100000000;
diff --git a/plugins/NewStory/src/password.cpp b/plugins/NewStory/src/password.cpp
index 31cd062b8e..88a8d55f36 100644
--- a/plugins/NewStory/src/password.cpp
+++ b/plugins/NewStory/src/password.cpp
@@ -55,7 +55,7 @@ void SetPassword(MCONTACT hContact, char *password)
 
 INT_PTR CALLBACK PasswordDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	PasswordData *data = (PasswordData *)GetWindowLong(hwnd, GWLP_USERDATA);
+	PasswordData *data = (PasswordData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 	switch (msg) 
 	{
 		case WM_INITDIALOG:
@@ -63,7 +63,7 @@ INT_PTR CALLBACK PasswordDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 			data = new PasswordData;
 			data->attempt = 0;
 			data->hContact = (MCONTACT)lParam;
-			SetWindowLong(hwnd, GWLP_USERDATA, (LONG)data);
+			SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)data);
 
 			RECT rc, rcMe;
 			SystemParametersInfo(SPI_GETWORKAREA, 0, &rc, 0);
@@ -126,7 +126,7 @@ INT_PTR CALLBACK PasswordDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 		{
 			delete data;
 			data = 0;
-			SetWindowLong(hwnd, GWLP_USERDATA, 0);
+			SetWindowLongPtr(hwnd, GWLP_USERDATA, 0);
 		}
 	}
 	return FALSE;
@@ -150,13 +150,13 @@ bool AskPassword(MCONTACT hContact)
 
 INT_PTR CALLBACK ChangePasswordDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	MCONTACT hContact = (MCONTACT)GetWindowLong(hwnd, GWLP_USERDATA);
+	MCONTACT hContact = (MCONTACT)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 	switch (msg)
 	{
 		case WM_INITDIALOG:
 		{
 			hContact = (MCONTACT)lParam;
-			SetWindowLong(hwnd, GWLP_USERDATA, (LONG)hContact);
+			SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)hContact);
 
 //			RECT rc, rcMe;
 //			SystemParametersInfo(SPI_GETWORKAREA, 0, &rc, 0);
@@ -225,7 +225,7 @@ INT_PTR CALLBACK ChangePasswordDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 
 		case WM_DESTROY:
 		{
-			SetWindowLong(hwnd, GWLP_USERDATA, 0);
+			SetWindowLongPtr(hwnd, GWLP_USERDATA, 0);
 		}
 	}
 	return FALSE;
diff --git a/plugins/NewStory/src/resource.h b/plugins/NewStory/src/resource.h
index 6d29c53451..0aa0f83820 100644
--- a/plugins/NewStory/src/resource.h
+++ b/plugins/NewStory/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by resource.rc
+// Microsoft Visual C++ generated include file.
+// Used by D:\Miranda NG Git_orig_commit\miranda-ng\plugins\NewStory\res\resource.rc
 //
 #define IDD_HISTORY                     101
 #define IDI_NEWSTORY                    102
@@ -174,7 +174,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        127
+#define _APS_NEXT_RESOURCE_VALUE        128
 #define _APS_NEXT_COMMAND_VALUE         40041
 #define _APS_NEXT_CONTROL_VALUE         1107
 #define _APS_NEXT_SYMED_VALUE           101
diff --git a/plugins/NewStory/src/stdafx.h b/plugins/NewStory/src/stdafx.h
index b9e774aa86..1d86e347f2 100644
--- a/plugins/NewStory/src/stdafx.h
+++ b/plugins/NewStory/src/stdafx.h
@@ -24,7 +24,7 @@ Boston, MA 02111-1307, USA.
 #include <process.h>
 #include <tchar.h>
 #include <commctrl.h>
-#include <stdio.h>
+//#include <stdio.h>
 #include <time.h>
 
 //Miranda headers
diff --git a/plugins/NewStory/src/utils.cpp b/plugins/NewStory/src/utils.cpp
index 717fe67042..96e7525e19 100644
--- a/plugins/NewStory/src/utils.cpp
+++ b/plugins/NewStory/src/utils.cpp
@@ -35,7 +35,7 @@ void CopyText(HWND hwnd, TCHAR *text)
 //	GlobalFree(hMem);
 }
 
-void ExportHistory(HANDLE hContact, char *fnTemplate, char *fn, HWND hwndHistory)
+/*void ExportHistory(HANDLE hContact, char *fnTemplate, char *fn, HWND hwndHistory)
 {
 /*
 	char *szHeader    = "---header---";
@@ -206,8 +206,8 @@ void ExportHistory(HANDLE hContact, char *fnTemplate, char *fn, HWND hwndHistory
 	free(tOther);
 	free(tFooter);
 	free(tEnd);
-*/
-}
+
+}*/
 
 char *appendString(char *s1, char *s2)
 {