Bug 526802 - [Win32] Update SWT windows native build scripts to works

with latest VisualStudio and Win10-SDK

Change-Id: Icf7485f1cc21ee369e9b13f5709448f8443e8fd7
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>

3 files changed, 13 insertions, 35 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
index aef2d79e3d..8e22320ed8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
@@ -1,5 +1,5 @@
 @rem ***************************************************************************
-@rem Copyright (c) 2000, 2017 IBM Corporation and others.
+@rem Copyright (c) 2000, 2018 IBM Corporation and others.
 @rem All rights reserved. This program and the accompanying materials
 @rem are made available under the terms of the Eclipse Public License v1.0
 @rem which accompanies this distribution, and is available at
@@ -15,10 +15,10 @@ IF EXIST C:\BUILD\swt-builddir set "SWT_BUILDDIR=C:\BUILD\swt-builddir"
 IF "x.%SWT_BUILDDIR%"=="x." set "SWT_BUILDDIR=S:\swt-builddir"
 echo SWT build dir: %SWT_BUILDDIR%
 
-IF "x.%MSSDK%"=="x." set "MSSDK=%SWT_BUILDDIR%\MSSDKs\Windows Server 2003 SP1 SDK"
+IF "x.%MSSDK%"=="x." set "%ProgramFiles(x86)%\Windows Kits\10"
 IF "x.%WEBKIT_DIR%"=="x." set "WEBKIT_DIR=%SWT_BUILDDIR%\webkit\WebKit-r72896"
 IF "x.%WEBKIT_SUPPORT_DIR%"=="x." set "WEBKIT_SUPPORT_DIR=%SWT_BUILDDIR%\webkit\WebKitSupportLibrary"
-IF "x.%MSVC_HOME%"=="x." set "MSVC_HOME=%SWT_BUILDDIR%\MSVCs\Microsoft Visual Studio 9.0"
+IF "x.%MSVC_HOME%"=="x." set "MSVC_HOME=%ProgramFiles(x86)%\Microsoft Visual Studio\2017"
 
 IF x.%1==x.x86 GOTO X86
 IF x.%1==x.x86_64 GOTO X86_64
@@ -26,7 +26,7 @@ IF x.%1==x.x86_64 GOTO X86_64
 :X86
 IF "x.%OUTPUT_DIR%"=="x." set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.x86
 IF "x.%SWT_JAVA_HOME%"=="x." set "SWT_JAVA_HOME=%SWT_BUILDDIR%\ibm-java-sdk-80-win-i386\sdk"
-call "%MSVC_HOME%\Common7\Tools\vsvars32.bat"
+call "%MSVC_HOME%\Community\VC\Auxiliary\Build\vcvarsall.bat" x86
 call "%MSSDK%\setenv" /XP32 /RETAIL
 IF x.%1==x.x86 shift
 GOTO MAKE
@@ -36,7 +36,7 @@ set PROCESSOR_ARCHITECTURE=AMD64
 IF "x.%OUTPUT_DIR%"=="x." set OUTPUT_DIR=..\..\..\org.eclipse.swt.win32.win32.x86_64
 IF "x.%SWT_JAVA_HOME%"=="x." set "SWT_JAVA_HOME=%SWT_BUILDDIR%\ibm-java-sdk-80-win-x86_64\sdk"
 set CFLAGS=-DJNI64
-call "%MSSDK%\setenv" /X64 /RETAIL
+call "%MSVC_HOME%\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
 shift
 GOTO MAKE
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
index f83ebb0c8d..4f6a675008 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2000, 2017 IBM Corporation and others.
+# Copyright (c) 2000, 2018 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -16,7 +16,6 @@
 #	OUTPUT_DIR
 
 !include <make_common.mak>
-!include <win32.mak>
 
 SWT_PREFIX  = swt
 WS_PREFIX   = win32
@@ -60,10 +59,14 @@ WEBKITCFLAGS = -c -O1\
 	-I"$(WEBKIT_SUPPORT_DIR)\win\include"
 
 #CFLAGS = $(cdebug) $(cflags) $(cvarsmt) $(CFLAGS) \
-CFLAGS = -O1 -DNDEBUG $(cflags) $(cvarsmt) $(CFLAGS) \
+CFLAGS = -O1 -DNDEBUG /c $(cflags) $(cvarsmt) $(CFLAGS) \
 	-DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DUSE_ASSEMBLER \
 	/I"$(SWT_JAVA_HOME)\include" /I"$(SWT_JAVA_HOME)\include\win32" /I.
 RCFLAGS = $(rcflags) $(rcvars) $(RCFLAGS) -DSWT_FILE_VERSION=\"$(maj_ver).$(min_ver)\" -DSWT_COMMA_VERSION=$(comma_ver)
+ldebug = /RELEASE  /INCREMENTAL:NO /NOLOGO
+dlllflags = -dll
+guilibsmt = kernel32.lib  ws2_32.lib mswsock.lib advapi32.lib bufferoverflowu.lib user32.lib gdi32.lib comdlg32.lib winspool.lib
+olelibsmt = ole32.lib uuid.lib oleaut32.lib $(guilibsmt)
 
 all: make_swt make_awt make_gdip make_wgl
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h
index 68aa1d67d2..87a4d24197 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@
 #include <shellapi.h>
 #include <wininet.h>
 #include <mshtmhst.h>
+#include <Tabflicks.h>
 
 #ifndef _WIN32_WCE
 #include <initguid.h>
@@ -696,12 +697,6 @@
 #ifndef _WIN32_WCE
 #ifndef _BP_PAINTPARAMS
 typedef HANDLE HPAINTBUFFER;
-typedef struct _BP_PAINTPARAMS {
-    DWORD cbSize;
-    DWORD dwFlags;
-    const RECT *prcExclude;
-    const BLENDFUNCTION *pBlendFunction;
-} BP_PAINTPARAMS, *PBP_PAINTPARAMS;
 #endif
 
 #ifndef PROPERTYKEY_DEFINED
@@ -735,26 +730,6 @@ int
     __in LPARAM lParam);
 #endif
     
-#ifndef _DTTOPTS
-typedef struct _DTTOPTS
-{
-    DWORD             dwSize;
-    DWORD             dwFlags;
-    COLORREF          crText;
-    COLORREF          crBorder;
-    COLORREF          crShadow;
-    int               iTextShadowType;
-    POINT             ptShadowOffset;
-    int               iBorderSize;
-    int               iFontPropId;
-    int               iColorPropId;
-    int               iStateId;
-    BOOL              fApplyOverlay;
-    int               iGlowSize;
-    DTT_CALLBACK_PROC pfnDrawTextCallback;
-    LPARAM            lParam;
-} DTTOPTS, *PDTTOPTS; 
-#endif
 #endif /* _WIN32_WCE */