Revert "Trying to chop out the uwinapi library"

This reverts commit 2dea0dab4fafda3c10a5bd03ad15ed39a4658b51.

26 files changed, 42 insertions, 1 deletions

diff --git a/setup_native/source/win32/customactions/indexingfilter/makefile.mk b/setup_native/source/win32/customactions/indexingfilter/makefile.mk
index 00ab554af0df..0298d05960db 100644
--- a/setup_native/source/win32/customactions/indexingfilter/makefile.mk
+++ b/setup_native/source/win32/customactions/indexingfilter/makefile.mk
@@ -42,6 +42,8 @@ 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 17be4fab0e61..3039ef4ccabd 100644
--- a/setup_native/source/win32/customactions/javafilter/makefile.mk
+++ b/setup_native/source/win32/customactions/javafilter/makefile.mk
@@ -42,6 +42,8 @@ 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 10b06d6b9df7..2b7dc2556c5e 100644
--- a/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
+++ b/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
@@ -53,6 +53,7 @@
 #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 e1b541bf5220..94eab3a0109c 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -46,6 +46,8 @@ 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 1b2584b2a139..5f979a81fa68 100644
--- a/setup_native/source/win32/customactions/languagepacks/respintest.cxx
+++ b/setup_native/source/win32/customactions/languagepacks/respintest.cxx
@@ -48,6 +48,7 @@
 #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 e9383441f7fc..641f48ab6e27 100755
--- a/setup_native/source/win32/customactions/patch/makefile.mk
+++ b/setup_native/source/win32/customactions/patch/makefile.mk
@@ -45,13 +45,15 @@ 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 ab6ca41847e1..07e9bc28bf20 100644
--- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
+++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
@@ -53,6 +53,7 @@
 #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 f7a9dde720b4..57b53d262ac7 100644
--- a/setup_native/source/win32/customactions/quickstarter/makefile.mk
+++ b/setup_native/source/win32/customactions/quickstarter/makefile.mk
@@ -41,6 +41,8 @@ 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 05399749a779..fb1fc22a8555 100644
--- a/setup_native/source/win32/customactions/rebase/makefile.mk
+++ b/setup_native/source/win32/customactions/rebase/makefile.mk
@@ -40,6 +40,8 @@ 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 63827f3156a2..0f162fa6cd9a 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
@@ -44,6 +44,8 @@ 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 98b01815f6d0..47239713ec1e 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk
@@ -45,6 +45,8 @@ 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 a9da5860cdde..a0d7fbaefc1f 100644
--- a/setup_native/source/win32/customactions/reg64/makefile.mk
+++ b/setup_native/source/win32/customactions/reg64/makefile.mk
@@ -46,6 +46,8 @@ 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 0ec7c74e900f..22eb1c89f7cd 100644
--- a/setup_native/source/win32/customactions/regactivex/makefile.mk
+++ b/setup_native/source/win32/customactions/regactivex/makefile.mk
@@ -42,6 +42,8 @@ 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 fba0b249c81f..ffad814e3d74 100644
--- a/setup_native/source/win32/customactions/sellang/makefile.mk
+++ b/setup_native/source/win32/customactions/sellang/makefile.mk
@@ -46,6 +46,8 @@ 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 ca6f80b891fa..e0a775af1bcd 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -47,6 +47,7 @@
 #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 4f86d4733348..58159cabd56f 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
@@ -52,6 +52,7 @@
 #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 af7034362d13..01ba1ab13b16 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
@@ -53,6 +53,8 @@
 #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 db5b14cca927..76f6b6e94a4f 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
@@ -53,6 +53,7 @@
 #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 bdd90d927a46..ffd6ef1a87dd 100644
--- a/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
@@ -46,6 +46,7 @@
 
 #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 8a95973c849c..56885d408b77 100644
--- a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
@@ -46,6 +46,7 @@
 
 #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 f5eec1004385..e0950d992dc2 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -45,6 +45,8 @@ 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 7fbef718b3fc..f9dfc5cb99bc 100644
--- a/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
@@ -52,6 +52,7 @@
 #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 2b4ddac35412..40ff772ff878 100644
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -53,6 +53,7 @@
 #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 f91e38788045..3041f87598ac 100755
--- a/setup_native/source/win32/customactions/thesaurus/makefile.mk
+++ b/setup_native/source/win32/customactions/thesaurus/makefile.mk
@@ -46,6 +46,8 @@ 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 4127a172abc6..07bd605cb964 100644
--- a/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx
+++ b/setup_native/source/win32/customactions/thesaurus/thesaurus.cxx
@@ -43,6 +43,7 @@
 #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 bf5eec30ad7e..61c58036b9a8 100644
--- a/setup_native/source/win32/customactions/tools/makefile.mk
+++ b/setup_native/source/win32/customactions/tools/makefile.mk
@@ -43,6 +43,8 @@ USE_DEFFILE=TRUE
 
 .IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
 
+UWINAPILIB=
+
 SLOFILES =	$(SLO)$/seterror.obj \
             $(SLO)$/checkversion.obj