- compiles without PSDK again

- moved all defines that are missing without PSDK to Platform.h


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

Source/7zip/7zGuids.cpp

@@ -2,11 +2,11 @@
 
 // #include "StdAfx.h"
 
-#include <windows.h>
-#include <initguid.h>
 #ifndef INITGUID
 #define INITGUID
 #endif
+#include <objbase.h>
+#include <initguid.h>
+#include "../Platform.h"
 #include "7zip/ICoder.h"
 #include "7zip/Compress/LZ/IMatchFinder.h"
-

Source/DialogTemplate.cpp

@@ -21,7 +21,6 @@
 */
 
 #include "DialogTemplate.h"
-#include <commctrl.h>
 
 //////////////////////////////////////////////////////////////////////
 // Utilities
@@ -263,10 +262,6 @@ int CDialogTemplate::RemoveItem(WORD wId) {
   return 0;
 }
 
-#ifndef DS_SHELLFONT
-#define DS_SHELLFONT (DS_SETFONT | DS_FIXEDSYS)
-#endif
-
 // Sets the font of the dialog
 void CDialogTemplate::SetFont(char* szFaceName, WORD wFontSize) {
   if (lstrcmp(szFaceName, "MS Shell Dlg")) {

Source/DialogTemplate.h

@@ -27,19 +27,12 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <Windows.h>
+#include "Platform.h"
 #include <Vector>
 
 #include <StdExcept>
 using namespace std;
 
-#ifndef IS_INTRESOURCE
-#ifndef ULONG_PTR
-#define ULONG_PTR DWORD
-#endif
-#define IS_INTRESOURCE(_r) (((ULONG_PTR)(_r) >> 16) == 0)
-#endif
-
 struct DialogItemTemplate {
   DWORD  dwHelpId; // Extended only
 

Source/Plugins.cpp

@@ -2,7 +2,7 @@
 #ifdef NSIS_CONFIG_PLUGIN_SUPPORT
 
 #include "Plugins.h"
-#include <windows.h>
+#include "Platform.h"
 #include <WinNT.h>
 
 

Source/Plugins.h

@@ -1,11 +1,7 @@
-
-
 #ifndef __X18_PLUGINS_H
 #define __X18_PLUGINS_H
 
-
+#include "Platform.h"
-#include <windows.h>
-#include <stdio.h>
 #include "strlist.h"
 
 struct plugin {

Source/ResourceEditor.h

@@ -29,7 +29,7 @@
 
 #ifdef RESOURCE_EDITOR_NOT_API
 
-#include <Windows.h>
+#include "Platform.h"
 #include <WinNT.h>
 #include <Time.h>
 #include <Vector>
@@ -40,13 +40,6 @@
 #include <StdExcept>
 using namespace std;
 
-#ifndef IS_INTRESOURCE
-#ifndef ULONG_PTR
-#define ULONG_PTR DWORD
-#endif
-#define IS_INTRESOURCE(_r) (((ULONG_PTR)(_r) >> 16) == 0)
-#endif
-
 class CResourceDirectory;
 class CResourceDirectoryEntry;
 class CResourceDataEntry;

Source/ResourceVersionInfo.cpp

@@ -2,7 +2,7 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-#include <windows.h>
+#include "Platform.h"
 #include "build.h"
 
 #include "ResourceVersionInfo.h"

Source/afxres.h

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include "Platform.h"
 
 #ifndef IDC_STATIC
 #define IDC_STATIC -1

Source/build.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include "Platform.h"
 #include <stdio.h>
 #include "exehead/config.h"
 #include "exehead/fileform.h"

Source/exehead/Main.c

@@ -24,8 +24,7 @@
 */
 
 
-#include <windows.h>
+#include "../Platform.h"
-#include <commctrl.h>
 #include <shlobj.h>
 #include "resource.h"
 #include "util.h"

Source/exehead/Ui.c

@@ -20,7 +20,7 @@
 *  3. This notice may not be removed or altered from any source distribution.
 */
 
-#include <windows.h>
+#include "../Platform.h"
 #include <windowsx.h>
 #include <shlobj.h>
 #include <shellapi.h>
@@ -34,9 +34,6 @@
 #include "exec.h"
 #include "lang.h"
 
-#define LB_ICONWIDTH 20
-#define LB_ICONHEIGHT 20
-
 #ifdef NSIS_CONFIG_VISIBLE_SUPPORT
 HICON g_hIcon;
 #endif
@@ -721,9 +718,6 @@ static BOOL CALLBACK LicenseProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
         }
       }
       if (enlink->msg==WM_SETCURSOR) {
-#ifndef IDC_HAND
-#define IDC_HAND MAKEINTRESOURCE(32649)
-#endif
         SetCursor(LoadCursor(0,IDC_HAND));
       }
     }
@@ -857,9 +851,6 @@ static BOOL CALLBACK DirProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
       bi.lpfn = BrowseCallbackProc;
       bi.lParam = (LPARAM)dir;
       bi.lpszTitle = GetNSISStringTT(browse_text);
-#ifndef BIF_NEWDIALOGSTYLE
-#define BIF_NEWDIALOGSTYLE 0x0040
-#endif
       bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_NEWDIALOGSTYLE;
       idlist = SHBrowseForFolder(&bi);
       if (idlist)
@@ -940,10 +931,6 @@ static BOOL CALLBACK DirProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 
 #ifdef NSIS_CONFIG_COMPONENTPAGE
 
-#ifndef TVITEM
-#define TVITEM TV_ITEM
-#endif
-
 static int NSISCALL SetChildrenStates(HWND hwTree, HTREEITEM hItem, int iChecked)
 {
   int iCheckedChildren = 0, iChildren = 0, *pFlags, iState = 1;
@@ -1132,13 +1119,6 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 
     TreeView_SetImageList(hwndTree1, hImageList, TVSIL_STATE);
 
-#ifndef TVM_SETITEMHEIGHT
-#define TVM_SETITEMHEIGHT (TV_FIRST + 27)
-#endif
-#ifndef TVM_GETITEMHEIGHT
-#define TVM_GETITEMHEIGHT (TV_FIRST + 28)
-#endif
-
     if (SendMessage(hwndTree1, TVM_GETITEMHEIGHT, 0, 0) < 16)
       SendMessage(hwndTree1, TVM_SETITEMHEIGHT, 16, 0);
 
@@ -1533,9 +1513,6 @@ static DWORD WINAPI install_thread(LPVOID p)
 
 #ifdef NSIS_CONFIG_VISIBLE_SUPPORT
 
-// listview unfolds partly hidden labels if it does not have infotip text
-#define LVS_EX_LABELTIP 0x00004000
-
 static BOOL CALLBACK InstProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
   HWND linsthwnd=insthwnd;

Source/exehead/afxres.h

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include "../Platform.h"
 
 #ifndef IDC_STATIC
 #define IDC_STATIC -1

Source/exehead/bgbg.c

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include "../Platform.h"
 #include "resource.h"
 #include "config.h"
 #include "fileform.h"

Source/exehead/config.h

@@ -387,10 +387,6 @@
   #define NSIS_DEFAULT_LANG 1033
 #endif
 
-#ifndef INVALID_FILE_ATTRIBUTES
-#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
-#endif
-
 #define VARS_SECTION_NAME ".ndata"
 
 typedef char NSIS_STRING[NSIS_MAX_STRLEN];

Source/exehead/exec.c

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include "../Platform.h"
 #include <shlobj.h>
 #include <shellapi.h>
 #include "fileform.h"

Source/exehead/fileform.c

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include "../Platform.h"
 #include "fileform.h"
 #include "util.h"
 #include "state.h"

Source/exehead/util.c

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include "../Platform.h"
 #include <shellapi.h>
 #include "util.h"
 #include "state.h"
@@ -27,10 +27,6 @@ NSIS_STRING g_usrvars[1];
 #define SECTION_VARS_RWD "/section:" ## VARS_SECTION_NAME ## ",rwd"
 #pragma comment(linker, SECTION_VARS_RWD)
 
-#ifndef INVALID_FILE_ATTRIBUTES
-#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
-#endif
-
 int NSISCALL my_PIDL2Path(char *out, LPITEMIDLIST idl)
 {
   int Res;

Source/lang.cpp

@@ -1,4 +1,4 @@
-#include <Windows.h>
+#include "Platform.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "build.h"

Source/makenssi.cpp

@@ -28,7 +28,7 @@ const char *NSIS_VERSION="v2.0rc3";
   Includes portions derived from bzip2 (see documentation for details).
 */
 
-#include <windows.h>
+#include "Platform.h"
 #include <stdio.h>
 #include <signal.h>
 

Source/script.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include "Platform.h"
 #include <stdio.h>
 #include <shlobj.h>
 #define _RICHEDIT_VER 0x0200
@@ -13,10 +13,6 @@
 #include "lang.h"
 #include "exehead/resource.h"
 
-#ifndef FOF_NOERRORUI
-#define FOF_NOERRORUI 0x0400
-#endif
-
 #define MAX_INCLUDEDEPTH 10
 #define MAX_LINELENGTH 4096
 

Source/strlist.h

@@ -1,6 +1,8 @@
 #ifndef _STRLIST_H_
 #define _STRLIST_H_
 
+#include "Platform.h"
+#include <stdio.h>
 #include <stdlib.h> // for gcc
 
 class IGrowBuf

Source/tokens.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include "Platform.h"
 #include <stdlib.h>
 #include <stdio.h>
 

Source/util.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include "Platform.h"
 #include <stdio.h>
 #include <stdarg.h>
 #include <conio.h>