Merge pull request #66 from csware/warnings

Increase warning level and fix warnings

Author: ffes

src/CMakeLists.txt

@@ -31,6 +31,11 @@ if(MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 endif(MSVC)
 
+# enable all warnings
+if(MSVC)
+    add_compile_options(/W4)
+endif(MSVC)
+
 ## section: source files
 set(NppEditorConfig_SOURCE_FILES
     ./DlgAbout.cpp

src/NppPluginEditorConfig.cpp

@@ -24,7 +24,7 @@ extern FuncItem funcItem[nbFunc];
 
 BOOL APIENTRY DllMain(HANDLE hModule, 
         DWORD  reasonForCall, 
-        LPVOID lpReserved)
+        LPVOID)
 {
     switch (reasonForCall)
     {
@@ -84,8 +84,7 @@ extern "C" __declspec(dllexport) void beNotified(SCNotification *notifyCode)
 // Please let me know if you need to access to some messages :
 // http://sourceforge.net/forum/forum.php?forum_id=482781
 //
-extern "C" __declspec(dllexport) LRESULT messageProc(UINT message,
-        WPARAM wParam, LPARAM lParam)
+extern "C" __declspec(dllexport) LRESULT messageProc(UINT, WPARAM, LPARAM)
 {
     return TRUE;
 }

src/PluginDefinition.cpp

@@ -216,10 +216,10 @@ void insertFinalNewline(bool insert)
         return;
 
     // Get the last line number
-    int lastLine = SendMessage(curScintilla, SCI_GETLINECOUNT, 0, 0) - 1;
+    intptr_t lastLine = ::SendMessage(curScintilla, SCI_GETLINECOUNT, 0, 0) - 1;
 
     // Get the length of that last line
-    int length = SendMessage(curScintilla, SCI_LINELENGTH, lastLine, 0);
+    intptr_t length = ::SendMessage(curScintilla, SCI_LINELENGTH, lastLine, 0);
 
     // Do we need to insert a final newline?
     if (insert)
@@ -231,7 +231,7 @@ void insertFinalNewline(bool insert)
         // What type of EOL must be inserted?
         char eolBuf[10];
         eolBuf[0] = 0;
-        int eolMode = SendMessage(curScintilla, SCI_GETEOLMODE, 0, 0);
+        int eolMode = static_cast<int>(::SendMessage(curScintilla, SCI_GETEOLMODE, 0, 0));
         switch (eolMode)
         {
             case SC_EOL_CRLF:
@@ -259,7 +259,7 @@ void insertFinalNewline(bool insert)
 
     // Find the last non-newline character
     length = SendMessage(curScintilla, SCI_GETTEXTLENGTH, 0, 0);
-    int pos = length;
+    intptr_t pos = length;
     while (pos > 0 && isNewline((char) SendMessage(curScintilla, SCI_GETCHARAT, pos - 1, 0)))
         pos--;
 
@@ -353,7 +353,7 @@ void onBeforeSave(HWND hWnd, uptr_t idFrom)
     // Save the folding behavior and set it to 0 to keep folds from opening
     // when modifying the file.
     HWND curScintilla = getCurrentScintilla();
-    int automatic_fold = SendMessage(curScintilla, SCI_GETAUTOMATICFOLD, 0, 0);
+    int automatic_fold = static_cast<int>(::SendMessage(curScintilla, SCI_GETAUTOMATICFOLD, 0, 0));
     SendMessage(curScintilla, SCI_SETAUTOMATICFOLD, 0, 0);
 
     // Trailing whitespace needs to be trimmed before 'insert_final_newline' is