Fixed minor issues and typos

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6584 212acab6-be3b-0410-9dea-997c60f758d6

Contrib/ExDLL/pluginapi.c

@@ -69,7 +69,7 @@ void NSISCALL setuservariable(const int varnum, LPCTSTR var)
     lstrcpy(g_variables + varnum*g_stringsize, var);
 }
 
-#ifdef _UNICODE
+#ifdef UNICODE
 int NSISCALL PopStringA(LPSTR ansiStr)
 {
    LPWSTR wideStr = (LPWSTR) GlobalAlloc(GPTR, g_stringsize*sizeof(WCHAR));

Contrib/Library/LibraryLocal/LibraryLocal.cpp

@@ -41,11 +41,11 @@ int GetTLBVersion(tstring& filepath, DWORD& high, DWORD & low)
   hr = LoadTypeLib(fullpath, &typeLib);
 #else
   // If built without UNICODE, we still need to convert this string to a Unicode string.
-  WCHAR *ole_filename = WinWStrDupFromTChar(fullpath);
+  WCHAR *ole_filename = (WCHAR*) WinWStrDupFromTChar(fullpath);
   if (!ole_filename) return 0;
   hr = LoadTypeLib(ole_filename, &typeLib);
   free(ole_filename);
-#endif
+#endif //~ _UNICODE
   
   if (SUCCEEDED(hr)) {
 
@@ -72,7 +72,7 @@ int GetTLBVersion(tstring& filepath, DWORD& high, DWORD & low)
 
   return 0;
 
-#endif
+#endif //~ _WIN32
 }
 
 NSIS_ENTRYPOINT_TMAIN

Contrib/Makensisw/utils.cpp

@@ -659,7 +659,7 @@ void AddTip(HWND hWnd,LPCTSTR lpszToolTip) {
   ti.cbSize = sizeof(TOOLINFO);
   ti.uFlags = TTF_IDISHWND;
   ti.hwnd   = g_tip.tip_p;
-  ti.uId = (UINT) hWnd;
+  ti.uId = (UINT_PTR) hWnd;
   ti.lpszText = (LPTSTR) lpszToolTip;
   SendMessage(g_tip.tip, TTM_ADDTOOL, 0, (LPARAM) (LPTOOLINFO) &ti); 
 }

Contrib/Modern UI 2/Interface.nsh

@@ -51,9 +51,11 @@ Var mui.Button.Back
     !insertmacro MUI_DEFAULT MUI_BGCOLOR "FFFFFF"
 
     ;Map *_NOSTRETCH legacy define to the correct *_STRETCH value
+    !verbose push 2
     !insertmacro MUI_LEGACY_MAP_NOSTRETCH MUI_HEADERIMAGE_ ""
     !insertmacro MUI_LEGACY_MAP_NOSTRETCH MUI_WELCOMEFINISHPAGE_ ""
     !insertmacro MUI_LEGACY_MAP_NOSTRETCH MUI_UNWELCOMEFINISHPAGE_ ""
+    !verbose pop
 
     ;Default header images
     !ifdef MUI_HEADERIMAGE
@@ -158,7 +160,7 @@ Var mui.Button.Back
 !macroend
 !macro MUI_HEADERIMAGE_INITHELPER_LOADIMAGE UN RTL IMGRESID PATH
 
-  GetDlgItem $mui.Header.Image $HWNDPARENT ${IMGRESID} ; Every mode doesn't use this variable but we have to reference it to avoid a compiler warning.
+  GetDlgItem $mui.Header.Image $HWNDPARENT ${IMGRESID} ; This variable is not used by every mode but we have to reference it to avoid a compiler warning.
 
   !if "${MUI_HEADERIMAGE_${UN}BITMAP${RTL}_STRETCH}" == "NoStretchNoCropNoAlign"
 

Contrib/MultiUser/MultiUser.nsh

@@ -199,7 +199,7 @@ Installer/uninstaller initialization
   !endif
 
   !ifndef MULTIUSER_INIT_TEXT_ALLUSERSNOTPOSSIBLE
-    !define MULTIUSER_INIT_TEXT_ALLUSERSNOTPOSSIBLE "Your user account does not have sufficient privileges to install $(^Name) for all users of this compuetr."
+    !define MULTIUSER_INIT_TEXT_ALLUSERSNOTPOSSIBLE "Your user account does not have sufficient privileges to install $(^Name) for all users of this computer."
   !endif
 
 !macroend

Contrib/System/Source/System.c

@@ -405,7 +405,7 @@ PLUGINFUNCTIONSHORT(Int64Op)
 #endif
     }
 
-    // operation
+    // Operation
     switch (*op)
     {
     case _T('+'): i1 += i2; break;