Trying to chop out the uwinapi library

26 files changed, 1 insertions, 42 deletions

diff --git a/setup_native/source/win32/customactions/indexingfilter/makefile.mk b/setup_native/source/win32/customactions/indexingfilter/makefile.mk
index 0298d05960db..00ab554af0df 100644
--- a/setup_native/source/win32/customactions/indexingfilter/makefile.mk
+++ b/setup_native/source/win32/customactions/indexingfilter/makefile.mk
@@ -42,8 +42,6 @@ USE_DEFFILE=TRUE
 
 .IF "$(GUI)"=="WNT"
 
-UWINAPILIB=
-
 SLOFILES =	$(SLO)$/restartindexingservice.obj
 
 SHL1LIBS = $(SLB)$/$(TARGET).lib 
diff --git a/setup_native/source/win32/customactions/javafilter/makefile.mk b/setup_native/source/win32/customactions/javafilter/makefile.mk
index 3039ef4ccabd..17be4fab0e61 100644
--- a/setup_native/source/win32/customactions/javafilter/makefile.mk
+++ b/setup_native/source/win32/customactions/javafilter/makefile.mk
@@ -42,8 +42,6 @@ DYNAMIC_CRT=
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
-UWINAPILIB=
-
 SLOFILES =	$(SLO)$/jfregca.obj
 
 STDSHL += \
diff --git a/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx b/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
index 2b7dc2556c5e..10b06d6b9df7 100644
--- a/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
+++ b/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
@@ -53,7 +53,6 @@
 #include <stdio.h>
 #include <sal/macros.h>
 
-#include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
 #define WININIT_FILENAME    "wininit.ini"
diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk
index 94eab3a0109c..e1b541bf5220 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -46,8 +46,6 @@ CDEFS+=-Dnot_used_define_to_disable_pch
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
-UWINAPILIB=
-
 SLOFILES =	$(SLO)$/lngpckinsthelper.obj \
             $(SLO)$/respintest.obj \
             $(SLO)$/checkrunningofficelanguagepack.obj
diff --git a/setup_native/source/win32/customactions/languagepacks/respintest.cxx b/setup_native/source/win32/customactions/languagepacks/respintest.cxx
index 5f979a81fa68..1b2584b2a139 100644
--- a/setup_native/source/win32/customactions/languagepacks/respintest.cxx
+++ b/setup_native/source/win32/customactions/languagepacks/respintest.cxx
@@ -48,7 +48,6 @@
 #include <string>
 #include <sal/macros.h>
 
-#include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
 using namespace std;
diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk
index 641f48ab6e27..e9383441f7fc 100755
--- a/setup_native/source/win32/customactions/patch/makefile.mk
+++ b/setup_native/source/win32/customactions/patch/makefile.mk
@@ -45,15 +45,13 @@ CDEFS+=-Dnot_used_define_to_disable_pch
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
-UWINAPILIB=
-
 SLOFILES = \
     $(SLO)$/swappatchfiles.obj
 
 STDSHL += \
     $(ADVAPI32LIB)\
     $(MSILIB)\
-        $(SHELL32LIB)								
+    $(SHELL32LIB)								
 
 .IF "$(COM)"=="GCC"
 STDSHL+=	\
diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
index 07e9bc28bf20..ab6ca41847e1 100644
--- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
+++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
@@ -53,7 +53,6 @@
 #include <stdio.h>
 #include <sal/macros.h>
 
-#include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
 #define WININIT_FILENAME    "wininit.ini"
diff --git a/setup_native/source/win32/customactions/quickstarter/makefile.mk b/setup_native/source/win32/customactions/quickstarter/makefile.mk
index 57b53d262ac7..f7a9dde720b4 100644
--- a/setup_native/source/win32/customactions/quickstarter/makefile.mk
+++ b/setup_native/source/win32/customactions/quickstarter/makefile.mk
@@ -41,8 +41,6 @@ USE_DEFFILE=TRUE
 
 .INCLUDE : settings.mk
 
-UWINAPILIB=
-
 # --- Files --------------------------------------------------------
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
diff --git a/setup_native/source/win32/customactions/rebase/makefile.mk b/setup_native/source/win32/customactions/rebase/makefile.mk
index fb1fc22a8555..05399749a779 100644
--- a/setup_native/source/win32/customactions/rebase/makefile.mk
+++ b/setup_native/source/win32/customactions/rebase/makefile.mk
@@ -40,8 +40,6 @@ MINGW_NODLL=YES
 
 .INCLUDE : settings.mk
 
-UWINAPILIB=
-
 # --- Files --------------------------------------------------------
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
index 0f162fa6cd9a..63827f3156a2 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
@@ -44,8 +44,6 @@ CFLAGS+=-DUNICODE -D_UNICODE
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
-UWINAPILIB=
-
 SLOFILES =	$(SLO)$/reg4allmsi.obj            
 
 SHL1STDLIBS=	$(KERNEL32LIB)\
diff --git a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
index 47239713ec1e..98b01815f6d0 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
@@ -45,8 +45,6 @@ CFLAGS+=-DUNICODE -D_UNICODE
 
 .IF "$(GUI)"=="WNT"
 
-UWINAPILIB=
-
 SLOFILES =	$(SLO)$/msihelper.obj\
             $(SLO)$/windowsregistry.obj\
             $(SLO)$/userregistrar.obj\
diff --git a/setup_native/source/win32/customactions/reg64/makefile.mk b/setup_native/source/win32/customactions/reg64/makefile.mk
index a0d7fbaefc1f..a9da5860cdde 100644
--- a/setup_native/source/win32/customactions/reg64/makefile.mk
+++ b/setup_native/source/win32/customactions/reg64/makefile.mk
@@ -46,8 +46,6 @@ CDEFS+=-Dnot_used_define_to_disable_pch
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
-UWINAPILIB=
-
 SLOFILES = \
     $(SLO)$/reg64.obj
 
diff --git a/setup_native/source/win32/customactions/regactivex/makefile.mk b/setup_native/source/win32/customactions/regactivex/makefile.mk
index 22eb1c89f7cd..0ec7c74e900f 100644
--- a/setup_native/source/win32/customactions/regactivex/makefile.mk
+++ b/setup_native/source/win32/customactions/regactivex/makefile.mk
@@ -42,8 +42,6 @@ USE_DEFFILE=TRUE
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
-UWINAPILIB=
-
 SLOFILES =	$(SLO)$/regactivex.obj
 
 STDSHL += \
diff --git a/setup_native/source/win32/customactions/sellang/makefile.mk b/setup_native/source/win32/customactions/sellang/makefile.mk
index ffad814e3d74..fba0b249c81f 100644
--- a/setup_native/source/win32/customactions/sellang/makefile.mk
+++ b/setup_native/source/win32/customactions/sellang/makefile.mk
@@ -46,8 +46,6 @@ CFLAGS+=-D_STLP_USE_STATIC_LIB
 
 # --- Files --------------------------------------------------------
 
-UWINAPILIB=
-
 SLOFILES = \
     $(SLO)$/sellang.obj
 
diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx
index e0a775af1bcd..ca6f80b891fa 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -47,7 +47,6 @@
 #include <string.h>
 
 #include <sal/macros.h>
-#include <systools/win32/uwinapi.h>
 
 static const char *
 langid_to_string( LANGID langid, int *have_default_lang )
diff --git a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
index 58159cabd56f..4f86d4733348 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
@@ -52,7 +52,6 @@
 #include <queue>
 #include <stdio.h>
 
-#include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
 static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
diff --git a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
index 01ba1ab13b16..af7034362d13 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
@@ -53,8 +53,6 @@
 #include <stdio.h>
 #include <strsafe.h>
 
-#include <systools/win32/uwinapi.h>
-
 //----------------------------------------------------------
 #ifdef DEBUG
 inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
diff --git a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
index 76f6b6e94a4f..db5b14cca927 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
@@ -53,7 +53,6 @@
 #include <stdio.h>
 #include <sal/macros.h>
 
-#include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
 #define WININIT_FILENAME    "wininit.ini"
diff --git a/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx b/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
index ffd6ef1a87dd..bdd90d927a46 100644
--- a/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
@@ -46,7 +46,6 @@
 
 #include <tchar.h>
 #include <string>
-#include <systools/win32/uwinapi.h>
 
 #include <../tools/seterror.hxx>
 
diff --git a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
index 56885d408b77..8a95973c849c 100644
--- a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
@@ -46,7 +46,6 @@
 
 #include <tchar.h>
 #include <string>
-#include <systools/win32/uwinapi.h>
 
 #include <../tools/seterror.hxx>
 
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index e0950d992dc2..f5eec1004385 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -45,8 +45,6 @@ CDEFS+=-Dnot_used_define_to_disable_pch
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
-UWINAPILIB=
-
 SLOFILES = \
     $(SLO)$/shellextensions.obj \
     $(SLO)$/startmenuicon.obj \
diff --git a/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx b/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
index f9dfc5cb99bc..7fbef718b3fc 100644
--- a/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
@@ -52,7 +52,6 @@
 #include <queue>
 #include <stdio.h>
 
-#include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
 static void SetMsiProperty(MSIHANDLE handle, const std::_tstring& sProperty)
diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
index 40ff772ff878..2b4ddac35412 100644
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -53,7 +53,6 @@
 #include <stdio.h>
 #include <strsafe.h>
 
-#include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
 //----------------------------------------------------------
diff --git a/setup_native/source/win32/customactions/thesaurus/makefile.mk b/setup_native/source/win32/customactions/thesaurus/makefile.mk
index 3041f87598ac..f91e38788045 100755
--- a/setup_native/source/win32/customactions/thesaurus/makefile.mk
+++ b/setup_native/source/win32/customactions/thesaurus/makefile.mk
@@ -46,8 +46,6 @@ CFLAGS+=-D_STLP_USE_STATIC_LIB
 
 # --- Files --------------------------------------------------------
 
-UWINAPILIB=
-
 SLOFILES = \
     $(SLO)$/thesaurus.obj
 
diff --git a/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx b/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx
index 07bd605cb964..4127a172abc6 100644
--- a/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx
+++ b/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx
@@ -43,7 +43,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <systools/win32/uwinapi.h>
 #include <io.h>
 #include <iostream>
 #include <fstream>
diff --git a/setup_native/source/win32/customactions/tools/makefile.mk b/setup_native/source/win32/customactions/tools/makefile.mk
index 61c58036b9a8..bf5eec30ad7e 100644
--- a/setup_native/source/win32/customactions/tools/makefile.mk
+++ b/setup_native/source/win32/customactions/tools/makefile.mk
@@ -43,8 +43,6 @@ USE_DEFFILE=TRUE
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
-UWINAPILIB=
-
 SLOFILES =	$(SLO)$/seterror.obj \
             $(SLO)$/checkversion.obj