Trying to chop out the uwinapi library

2011-09-16 14:28:08 +02:00
parent b5cc76fbd5
commit 2dea0dab4f
92 changed files with 21 additions and 163 deletions
--- a/autodoc/source/exes/adc_uni/makefile.mk
+++ b/autodoc/source/exes/adc_uni/makefile.mk
@@ -39,7 +39,6 @@ PRJINC=$(PRJ)$/source
 .INCLUDE :  settings.mk
 .INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk

-UWINAPILIB=$(0)
 LIBSALCPPRT=$(0)

 # --- Files --------------------------------------------------------
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -147,7 +147,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\

 ifeq ($(GUI),WNT)
 $(eval $(call gb_Library_add_linked_libs,sb,\
-	uwinapi \
 	oleaut32 \
 ))
 endif
--- a/berkeleydb/db-4.7.25.patch
+++ b/berkeleydb/db-4.7.25.patch
@@ -657,13 +657,12 @@
 +
 --- misc/db-4.7.25.NC/makefile.mk	2009-07-21 11:42:40.000000000 +0200
 +++ misc/build/db-4.7.25.NC/makefile.mk	2009-07-21 11:39:26.000000000 +0200
-@@ -1 +1,76 @@
+@@ -1 +1,75 @@
 -dummy
 +PRJ=..$/..$/..$/..
 +PRJNAME=libdb47
 +TARGET=libdb47
 +USE_DEFFILE=true
-+UWINAPILIB=
 +
 +.INCLUDE :  settings.mk
 +CFLAGS+=-GS -EHsc -Gy
--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -64,8 +64,6 @@ LINKFLAGS += /delayload:cppuhelper3MSC.dll \
             /delayload:cppu3.dll \
             /delayload:sal3.dll

-UWINAPILIB=
-
 NO_OFFUH=TRUE
 CPPUMAKERFLAGS =
 UNOTYPES = \
--- a/cppunit/ooo-DllPlugInTester.mk
+++ b/cppunit/ooo-DllPlugInTester.mk
@@ -36,7 +36,6 @@ nodep = TRUE

 CDEFS += -DCPPUNIT_DLL
 CFLAGSCXX += -I../../include
-UWINAPILIB =

 OBJFILES = $(APP1OBJS)

--- a/cppunit/ooo-cppunit_dll.mk
+++ b/cppunit/ooo-cppunit_dll.mk
@@ -37,7 +37,6 @@ nodep = TRUE

 CDEFS += -DCPPUNIT_BUILD_DLL
 CFLAGSCXX += -I../../include
-UWINAPILIB =

 SLOFILES = $(SHL1OBJS)

--- a/cpputools/source/unoexe/makefile.mk
+++ b/cpputools/source/unoexe/makefile.mk
@@ -74,7 +74,7 @@ APP1RPATH=UREBIN

 # Include all relevant (see ure/source/README) dynamic libraries, so that C++
 # UNO components running in the uno executable have a defined environment
-# (stlport, unxlngi6 libstdc++.so.6, and wntmsci10 uwinapi.dll are already
+# (stlport, unxlngi6 libstdc++.so.6, and wntmsci10 are already
 # included via APP1STDLIB, unxlngi6 libgcc_s.so.1 and wntmsci10 msvcr71.dll and
 # msvcp71.dll are magic---TODO):
 APP1STDLIBS= \
--- a/crashrep/source/win32/soreport.cpp
+++ b/crashrep/source/win32/soreport.cpp
@@ -59,7 +59,6 @@
 #define RICHEDIT    TEXT("riched32.dll")
 #endif

-#include <systools/win32/uwinapi.h>
 #include <rtl/digest.h>
 #include <rtl/bootstrap.hxx>
 #include <osl/file.hxx>
--- a/desktop/win32/source/QuickStart/QuickStart.cxx
+++ b/desktop/win32/source/QuickStart/QuickStart.cxx
@@ -4,7 +4,6 @@

 #include "StdAfx.h"
 #include "resource.h"
-#include <systools/win32/uwinapi.h>
 #include <stdio.h>

 #define MY_TASKBAR_NOTIFICATION         WM_USER+1
--- a/desktop/win32/source/guiloader/genericloader.cxx
+++ b/desktop/win32/source/guiloader/genericloader.cxx
@@ -46,7 +46,6 @@
 #include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
-#include <systools/win32/uwinapi.h>

 #include "tools/pathutils.hxx"
 #include "../extendloaderenvironment.hxx"
--- a/desktop/win32/source/guistdio/guistdio.inc
+++ b/desktop/win32/source/guistdio/guistdio.inc
@@ -40,7 +40,6 @@

 #include <string.h>
 #include <stdlib.h>
-#include <systools/win32/uwinapi.h>

 #include <stdio.h>
 #include <sal/macros.h>
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -48,7 +48,6 @@
 #include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
-#include <systools/win32/uwinapi.h>

 #include "rtl/string.h"
 #include <sal/macros.h>
--- a/dtrans/Library_dnd.mk
+++ b/dtrans/Library_dnd.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_Library_add_linked_libs,dnd,\
 	shell32 \
 	user32 \
 	uuid \
-	uwinapi \
 	$(gb_STDLIBS) \
 ))

--- a/dtrans/Library_ftransl.mk
+++ b/dtrans/Library_ftransl.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_Library_add_linked_libs,ftransl,\
 	gdi32 \
 	ole32 \
 	sal \
-	uwinapi \
 	$(gb_STDLIBS) \
 ))

--- a/dtrans/Library_mcnttype.mk
+++ b/dtrans/Library_mcnttype.mk
@@ -55,10 +55,4 @@ $(eval $(call gb_Library_add_exception_objects,mcnttype,\
 	dtrans/source/cnttype/mctfentry \
 ))

-ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_add_linked_libs,mcnttype,\
-	uwinapi \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
--- a/dtrans/Library_sysdtrans.mk
+++ b/dtrans/Library_sysdtrans.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_Library_add_linked_libs,sysdtrans,\
 	shell32 \
 	uuid \
 	user32 \
-	uwinapi \
 	$(gb_STDLIBS) \
 ))

--- a/dtrans/source/win32/workbench/makefile.mk
+++ b/dtrans/source/win32/workbench/makefile.mk
@@ -57,7 +57,6 @@ APP1OBJS=		$(OBJ)$/test_wincb.obj
 APP1STDLIBS=	$(SALLIB) \
                $(CPPULIB)			\
                $(CPPUHELPERLIB)	\
-                $(SOLARLIBDIR)$/uwinapi.lib\
                $(USER32LIB) \
                $(OLE32LIB)\
                $(COMDLG32LIB)
--- a/dtrans/test/win32/dnd/makefile.mk
+++ b/dtrans/test/win32/dnd/makefile.mk
@@ -59,7 +59,6 @@ APP1STDLIBS= \
    $(SALLIB) \
    $(CPPUHELPERLIB) \
    $(CPPULIB)		\
-    $(UWINAPILIB) \
    $(USER32LIB)		\
    $(OLE32LIB)		\
    comsupp.lib		\
--- a/embedserv/source/inprocserv/makefile.mk
+++ b/embedserv/source/inprocserv/makefile.mk
@@ -39,7 +39,6 @@ use_shl_versions=
 LIBTARGET=NO
 USE_DEFFILE=YES
 LIBCMT=libcmt.lib
-UWINAPILIB=

 # --- Files -------------------------------------

--- a/extensions/source/activex/main/makefile.mk
+++ b/extensions/source/activex/main/makefile.mk
@@ -39,7 +39,6 @@ use_shl_versions=
 VERSIONOBJ=
 LIBTARGET=NO
 USE_DEFFILE=YES
-UWINAPILIB=

 .IF "$(BUILD_X64)"!=""
 USE_DEFFILE_X64=TRUE
@@ -107,7 +106,6 @@ SHL1RES=$(RES)$/$(TARGET).res
 CDEFS_X64+:=$(foreach,i,$(CDEFS) $(subst,-D_X86_=1,  $i))
 LIBTARGET_X64=NO
 USE_DEFFILE_X64=YES
-UWINAPILIB_X64=

 SLOFILES_X64= \
    $(SLO_X64)$/so_activex.obj \
--- a/extensions/test/ole/cpptest/readme.txt
+++ b/extensions/test/ole/cpptest/readme.txt
@@ -1,6 +1,2 @@
 Creates the com.sun.star.ServiceManager with CoCreateInstance in a cpp program.
 This little program can be used as starting point for further tests.
-
-
-It needs uwinapi.dll, which is in the program folder of OOo (URE\bin in
-OOo 3.0)
--- a/fpicker/util/makefile.mk
+++ b/fpicker/util/makefile.mk
@@ -50,7 +50,6 @@ COMMON_LIBS=$(CPPULIB)\

 SHL1TARGET=$(TARGET1)
 SHL1STDLIBS=		$(COMMON_LIBS) \
-            $(UWINAPILIB) \
            $(ADVAPI32LIB) \
            $(SHELL32LIB)\
            $(OLE32LIB)\
@@ -85,7 +84,6 @@ SHL2NOCHECK=TRUE
 SHL2TARGET=$(TARGET2)

 SHL2STDLIBS=		$(COMMON_LIBS) \
-            $(UWINAPILIB) \
            $(ADVAPI32LIB) \
            $(OLE32LIB)\
            $(GDI32LIB)\
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -59,9 +59,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/mnemonic.hxx>
 #include <tools/urlobj.hxx>
-#ifdef WINNT
-#include <systools/win32/snprintf.h>
-#endif

 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
--- a/hyphen/hyphen-2.7.1.patch
+++ b/hyphen/hyphen-2.7.1.patch
@@ -51,7 +51,7 @@
 	rm -rf hyphen.us* hyph_en_US.dic
 --- misc/hyphen-2.7.1/makefile.mk	2010-12-02 10:35:40.265625000 +0100
 +++ misc/build/hyphen-2.7.1/makefile.mk	2010-12-02 10:25:45.750000000 +0100
-@@ -1 +1,28 @@
+@@ -1 +1,27 @@
 -dummy
 +PRJ = ..$/..$/..$/..
 +
@@ -61,7 +61,6 @@
 +
 +USE_DEFFILE=TRUE
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+UWINAPILIB=
 +
 +.INCLUDE : settings.mk
 +
--- a/jurt/source/pipe/wrapper/makefile.mk
+++ b/jurt/source/pipe/wrapper/makefile.mk
@@ -30,7 +30,6 @@ PRJNAME = jurt
 TARGET = wrapper

 NO_DEFAULT_STL = TRUE
-UWINAPILIB =
 VISIBILITY_HIDDEN = TRUE

 .INCLUDE: settings.mk
--- a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
+++ b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
@@ -67,9 +67,9 @@ SHL1STDLIBS= \

 .IF "$(GUI)" == "WNT"
 .IF "$(COM)"!="GCC"
-SHL1STDLIBS += uwinapi.lib advapi32.lib
+SHL1STDLIBS += advapi32.lib
 .ELSE
-SHL1STDLIBS += -luwinapi -ladvapi32 
+SHL1STDLIBS += -ladvapi32 
 .ENDIF # GCC
 .ENDIF #WNT

--- a/libtextcat/libtextcat-2.2.patch
+++ b/libtextcat/libtextcat-2.2.patch
@@ -969,7 +969,7 @@
 +}
 --- misc/libtextcat-2.2/src/makefile.mk	Mon Mar 31 11:30:06 2008
 +++ misc/build/libtextcat-2.2/src/makefile.mk	Mon Mar 31 11:29:42 2008
-@@ -1 +1,87 @@
+@@ -1 +1,86 @@
 -dummy
 +#*************************************************************************
 +#
@@ -1006,7 +1006,6 @@
 +
 +USE_DEFFILE=TRUE
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+UWINAPILIB=
 +
 +.INCLUDE : settings.mk
 +
--- a/migrationanalysis/src/msokill/makefile.mk
+++ b/migrationanalysis/src/msokill/makefile.mk
@@ -45,7 +45,6 @@ OBJFILES= 	$(OBJ)$/msokill.obj \

 # --- Targets ------------------------------------------------------

-UWINAPILIB=
 LIBSALCPPRT=

 APP1NOSAL=		TRUE
--- a/neon/neon.patch
+++ b/neon/neon.patch
@@ -492,7 +492,7 @@
 +#endif
 --- misc/neon-0.29.5/src/makefile.mk	2011-02-03 10:32:38.000000000 +0100
 +++ misc/build/neon-0.29.5/src/makefile.mk	2011-02-03 10:26:19.000000000 +0100
-@@ -1,1 +1,96 @@
+@@ -1,1 +1,95 @@
 -dummy
 +PRJ=..$/..$/..$/..$/..
 +
@@ -502,7 +502,6 @@
 +USE_DEFFILE=TRUE
 +NO_DEFAULT_STL=TRUE
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+UWINAPILIB=
 +
 +# --- Settings -----------------------------------------------------
 +
--- a/odk/source/unoapploader/win/makefile.mk
+++ b/odk/source/unoapploader/win/makefile.mk
@@ -33,7 +33,6 @@ TARGETTYPE=GUI
 LIBTARGET=NO

 DYNAMIC_CRT=
-UWINAPILIB=
 NO_DEFAULT_STL=true

 # --- Settings -----------------------------------------------------
--- a/pyuno/zipcore/makefile.mk
+++ b/pyuno/zipcore/makefile.mk
@@ -33,7 +33,6 @@ LIBTARGET=NO

 .INCLUDE : settings.mk
 .IF "$(L10N_framework)"==""
-UWINAPILIB =

 .IF "$(SYSTEM_PYTHON)" == "YES"
 systempython:
--- a/redland/raptor/raptor-1.4.18.patch.dmake
+++ b/redland/raptor/raptor-1.4.18.patch.dmake
@@ -1,6 +1,6 @@
 --- misc/raptor-1.4.18/src/makefile.mk	Thu Nov  6 15:25:51 2008
 +++ misc/build/raptor-1.4.18/src/makefile.mk	Thu Nov  6 15:33:14 2008
-@@ -1,1 +1,119 @@
+@@ -1,1 +1,117 @@
 -dummy
 +#*************************************************************************
 +#
@@ -34,10 +34,8 @@
 +PRJNAME=redland
 +TARGET=raptor
 +LIBTARGET=NO
-+UWINAPIDLL=
 +
 +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+UWINAPILIB=
 +
 +
 +# --- Settings -----------------------------------------------------
--- a/redland/rasqal/rasqal-0.9.16.patch.dmake
+++ b/redland/rasqal/rasqal-0.9.16.patch.dmake
@@ -1,6 +1,6 @@
 --- misc/rasqal-0.9.16/src/makefile.mk	Thu Nov  6 15:56:45 2008
 +++ misc/build/rasqal-0.9.16/src/makefile.mk	Thu Nov  6 15:55:09 2008
-@@ -1,1 +1,94 @@
+@@ -1,1 +1,93 @@
 -dummy
 +#*************************************************************************
 +#
@@ -34,7 +34,6 @@
 +PRJNAME=redland
 +TARGET=rasqal
 +LIBTARGET=NO
-+UWINAPILIB=
 +
 +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
 +
--- a/redland/redland/redland-1.0.8.patch.dmake
+++ b/redland/redland/redland-1.0.8.patch.dmake
@@ -1,6 +1,6 @@
 --- misc/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:32:46 2008
 +++ misc/build/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:26:20 2008
-@@ -1,1 +1,111 @@
+@@ -1,1 +1,110 @@
 -dummy
 +#*************************************************************************
 +#
@@ -34,7 +34,6 @@
 +PRJNAME=redland
 +TARGET=librdf
 +LIBTARGET=NO
-+UWINAPILIB=
 +
 +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
 +
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -68,9 +68,6 @@
 #ifdef __MINGW32__
 #define _SNPRINTF_DLLIMPORT
 #endif
-#ifndef _SNPRINTF_H
-#include <systools/win32/snprintf.h>
-#endif

 #endif /* defined WIN32 */

--- a/sal/inc/systools/win32/snprintf.h.deleteme
+++ b/sal/inc/systools/win32/snprintf.h.deleteme
--- a/sal/inc/systools/win32/uwinapi.h.deleteme
+++ b/sal/inc/systools/win32/uwinapi.h.deleteme
--- a/sal/osl/w32/dllentry.c
+++ b/sal/osl/w32/dllentry.c
@@ -34,7 +34,6 @@
 #pragma warning(pop)
 #endif
 #include <tlhelp32.h>
-#include <systools/win32/uwinapi.h>
 #include <winsock.h>
 #include <osl/diagnose.h>
 #include <sal/types.h>
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -32,8 +32,6 @@
 #define UNICODE
 #define _UNICODE
 #define _WIN32_WINNT 0x0500
-#include "systools/win32/uwinapi.h"
-
 #include "osl/file.hxx"

 #include "file_url.h"
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -29,8 +29,6 @@
 #define UNICODE
 #define _UNICODE
 #define _WIN32_WINNT 0x0500
-#include "systools/win32/uwinapi.h"
-
 #include "osl/file.h"

 #include "file_url.h"
--- a/sal/osl/w32/file_error.c
+++ b/sal/osl/w32/file_error.c
@@ -29,8 +29,6 @@
 #define UNICODE
 #define _UNICODE
 #define _WIN32_WINNT 0x0500
-#include "systools/win32/uwinapi.h"
-
 #include "file_error.h"

 #include "osl/diagnose.h"
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -29,7 +29,6 @@
 #define UNICODE
 #define _UNICODE
 #define _WIN32_WINNT 0x0500
-#include "systools/win32/uwinapi.h"

 #include "file_url.h"
 #include <sal/macros.h>
--- a/sal/osl/w32/security.c
+++ b/sal/osl/w32/security.c
@@ -33,7 +33,6 @@
 #include <osl/diagnose.h>
 #include <osl/thread.h>
 #include <osl/file.h>
-#include <systools/win32/uwinapi.h>
 #include <sal/macros.h>
 #include "secimpl.h"

--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -40,7 +40,6 @@
 #include <DbgHelp.h>
 #endif
 #include <errorrep.h>
-#include <systools/win32/uwinapi.h>
 #include <sal/macros.h>

 typedef struct _oslSignalHandlerImpl
--- a/sal/osl/w32/tempfile.cxx
+++ b/sal/osl/w32/tempfile.cxx
@@ -29,7 +29,6 @@
 #define UNICODE
 #define _UNICODE
 #define _WIN32_WINNT 0x0500
-#include "systools/win32/uwinapi.h"

 #include "osl/file.h"

--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -5,13 +5,12 @@ sa	sal\typesconfig							nmake	-	all	sa_tc sa_inc NULL
 sa	sal\cpprt								nmake	-	u	sa_cpprt sa_util sa_inc NULL
 sa	sal\rtl\source							nmake	-	all	sa_rtl sa_tc.u sa_inc NULL
 sa	sal\textenc								nmake	-	all	sa_textenc sa_tc.u sa_inc NULL
-sa	sal\systools\win32\uwinapi				nmake	-	n	sa_uwinapi sa_inc NULL
-sa	sal\systools\win32\onlineupdate			nmake	-	n	sa_onlineupdate sa_uwinapi.n sa_inc NULL
+sa	sal\systools\win32\onlineupdate			nmake	-	n	sa_onlineupdate sa_inc NULL
 sa	sal\osl\w32								nmake	-	n	sa_osln sa_inc NULL
 sa  sal\qa                                  nmake   -   all sa_qa sa_util NULL
 sa	sal\osl\unx								nmake	-	u	sa_oslu sa_tc.u sa_inc NULL
 sa	sal\osl\all								nmake	-	all	sa_oslall sa_tc.u sa_inc NULL
-sa	sal\util								nmake	-	all	sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_onlineupdate.n sa_osln.n sa_oslu.u sa_rtl sa_textenc NULL
+sa	sal\util								nmake	-	all	sa_util sa_tc.u sa_oslall sa_onlineupdate.n sa_osln.n sa_oslu.u sa_rtl sa_textenc NULL
 sa sal\cppunittester nmake - all sa_cppunittester sa_cpprt.u sa_util NULL
 sa sal\qa\ByteSequence nmake - all sa_qa_ByteSequence sa_cppunittester sa_util NULL
 sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer sa_cppunittester sa_util NULL
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -78,14 +78,7 @@ SHL1RPATH=URELIB

 .IF "$(GUI)"=="WNT"

-.IF "$(COM)"=="GCC"
-UWINAPILIB=     -luwinapi
-.ELSE
-UWINAPILIB=     $(LB)$/uwinapi.lib
-.ENDIF
-
 SHL1STDLIBS=	\
-                $(UWINAPILIB)\
                $(ADVAPI32LIB)\
                $(WS2_32LIB)\
                $(MPRLIB)\
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -122,7 +122,6 @@ $(eval $(call gb_Library_add_linked_libs,scui,\
 	msvcrt \
 	$(gb_Library_win32_OLDNAMES) \
 	user32 \
-	uwinapi \
 ))
 endif
 # vim: set noet sw=4 ts=4:
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -160,7 +160,6 @@ $(eval $(call gb_Library_add_linked_libs,vbaobj,\
 	msvcrt \
 	$(gb_Library_win32_OLDNAMES) \
 	user32 \
-	uwinapi \
 ))
 endif
 # vim: set noet sw=4 ts=4:
--- a/scaddins/Library_analysis.mk
+++ b/scaddins/Library_analysis.mk
@@ -48,12 +48,6 @@ $(eval $(call gb_Library_add_linked_libs,analysis,\
 	tl \
 ))

-ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_add_linked_libs,analysis,\
-    uwinapi \
-))
-endif
-
 $(eval $(call gb_Library_add_exception_objects,analysis,\
 	scaddins/source/analysis/analysis \
 	scaddins/source/analysis/analysishelper \
--- a/sdext/source/pdfimport/xpdfwrapper/makefile.mk
+++ b/sdext/source/pdfimport/xpdfwrapper/makefile.mk
@@ -53,7 +53,6 @@ CFLAGS += -I$(SOLARINCDIR)$/xpdf
 .ENDIF

 # --- Files --------------------------------------------------------
-UWINAPILIB:=
 APP1TARGET=$(TARGET)
 APP1LIBSALCPPRT=
 APP1OBJS= \
--- 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 
--- 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 += \
--- 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"
--- 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
--- 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;
--- 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+=	\
--- 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"
--- 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)"!=""
--- 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)"!=""
--- 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)\
--- 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\
--- 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

--- 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 += \
--- 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

--- 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 )
--- 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 )
--- 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, ... )
--- 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"
--- 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>

--- 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>

--- 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 \
--- 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)
--- 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>

 //----------------------------------------------------------
--- 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

--- 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>
--- 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

--- a/shell/source/win32/makefile.mk
+++ b/shell/source/win32/makefile.mk
@@ -46,7 +46,6 @@ SHL1TARGET=$(TARGET).uno
 SHL1STDLIBS=$(CPPULIB)\
            $(CPPUHELPERLIB)\
            $(SALLIB)\
-            $(UWINAPILIB) \
            $(ADVAPI32LIB) \
            $(OLE32LIB) \
            $(SHELL32LIB)
--- a/shell/source/win32/shlxthandler/makefile.mk
+++ b/shell/source/win32/shlxthandler/makefile.mk
@@ -46,9 +46,6 @@ ALL :
 .ENDIF


-UWINAPILIB =
-UWINAPILIB_X64 =
-
 CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
 .IF "$(COM)" == "MSC"
 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
--- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk
+++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk
@@ -32,10 +32,6 @@ LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE

-# Do not use the uwinapi library
-UWINAPILIB=
-
-
 # --- Settings -----------------------------------------------------

 .INCLUDE :  settings.mk
--- a/shell/source/win32/shlxthandler/prophdl/makefile.mk
+++ b/shell/source/win32/shlxthandler/prophdl/makefile.mk
@@ -46,9 +46,6 @@ ALL :
 .ENDIF


-UWINAPILIB =
-UWINAPILIB_X64 =
-
 CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501
 .IF "$(COM)" == "MSC"
 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -wd4100
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -177,7 +177,6 @@ gb_CXXFLAGS := \
 	-Zm500 \

 gb_STDLIBS := \
-	uwinapi \
 	advapi32 \

 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
@@ -445,7 +444,6 @@ gb_Library_PLAINLIBS_NONE += \
 	unicows \
 	user32 \
 	uuid \
-	uwinapi \
 	version \
 	winmm \
 	winspool \
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -136,7 +136,6 @@ gb_COMPILERNOOPTFLAGS := -O0
 gb_STDLIBS := \
 	mingwthrd \
 	mingw32 \
-	uwinapi \
 	mingwex \


@@ -457,7 +456,6 @@ gb_Library_PLAINLIBS_NONE += \
 	unicows \
 	user32 \
 	uuid \
-	uwinapi \
 	winmm \
 	version \
 	winspool \
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -119,7 +119,6 @@ LINKFLAGSDEBUG=-g
 LINKFLAGSOPT=

 STDLIBCPP=-lstdc++
-UWINAPILIB*=$(DYNAMIC) -luwinapi

 .IF "$(MINGW_SHARED_GCCLIB)"=="YES" && "$(DYNAMIC_CRT)"!=""
 MINGW_LIBGCC=-lgcc_s -lgcc
@@ -146,10 +145,10 @@ STDLIBCUIMT+=-lmingwthrd
 STDSHLGUIMT+=-lmingwthrd
 STDSHLCUIMT+=-lmingwthrd
 .ENDIF
-STDLIBGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
-STDLIBCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
-STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
-STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
+STDLIBGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group -lm -lkernel32 -luser32 -lmsvcrt
+STDLIBCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group -lm -lkernel32 -luser32 -lmsvcrt
+STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group -lm -lkernel32 -luser32 -lmsvcrt
+STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group -lm -lkernel32 -luser32 -lmsvcrt

 LIBMGR=$(AR)
 LIBFLAGS=-rsu
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -277,7 +277,6 @@ LINKFLAGSWST=/DEBUG:mapped,partial /DEBUGTYPE:coff wst.lib /NODEFAULTLIB
 LINKFLAGSDEBUG=-DEBUG
 LINKFLAGSOPT=

-UWINAPILIB*=uwinapi.lib
 .IF "$(DYNAMIC_CRT)"!=""
 .IF "$(USE_DEBUG_RUNTIME)" != ""
 LIBCMT=msvcrtd.lib
@@ -304,10 +303,10 @@ STDSLOGUI=
 STDOBJCUI=
 STDSLOCUI=

-STDLIBGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDLIBCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDSHLGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDSHLCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDLIBGUIMT=$(LIBCMT) $(LIBCPMT) kernel32.lib user32.lib oldnames.lib
+STDLIBCUIMT=$(LIBCMT) $(LIBCPMT) kernel32.lib user32.lib oldnames.lib
+STDSHLGUIMT=$(LIBCMT) $(LIBCPMT) kernel32.lib user32.lib oldnames.lib
+STDSHLCUIMT=$(LIBCMT) $(LIBCPMT) kernel32.lib user32.lib oldnames.lib

 LIBMGR=lib $(NOLOGO)
 IMPLIB=lib
--- a/soltools/cpp/makefile.mk
+++ b/soltools/cpp/makefile.mk
@@ -42,7 +42,6 @@ all:
    @echo Nothing done when cross-compiling
 .ENDIF

-UWINAPILIB=$(0)
 LIBSALCPPRT=$(0)

 # --- Files --------------------------------------------------------
--- a/soltools/javadep/makefile.mk
+++ b/soltools/javadep/makefile.mk
@@ -42,7 +42,6 @@ all:
    @echo Nothing done when cross-compiling
 .ENDIF

-UWINAPILIB=$(0)
 LIBSALCPPRT=$(0)

 # --- Files --------------------------------------------------------
--- a/soltools/ldump/makefile.mk
+++ b/soltools/ldump/makefile.mk
@@ -36,7 +36,6 @@ TARGETTYPE=CUI
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk

-UWINAPILIB=$(0)
 LIBSALCPPRT=$(0)

 # --- Files --------------------------------------------------------
--- a/soltools/mkdepend/makefile.mk
+++ b/soltools/mkdepend/makefile.mk
@@ -44,7 +44,6 @@ all:
 .ENDIF

 LIBSALCPPRT=
-UWINAPILIB=

 CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS  

--- a/soltools/testSHL/makefile.mk
+++ b/soltools/testSHL/makefile.mk
@@ -35,7 +35,6 @@ TARGETTYPE=CUI
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 .INCLUDE :  settings.mk

-UWINAPILIB=$(0)
 LIBSALCPPRT=$(0)

 # ------------------------------------------------------------------
--- a/svx/source/dialog/sendreportw32.cxx
+++ b/svx/source/dialog/sendreportw32.cxx
@@ -36,7 +36,6 @@
 #include <postwin.h>
 #include <tchar.h>
 #include <stdio.h>
-#include <systools/win32/uwinapi.h>
 #include <sal/macros.h>

 // need to undef min and max macros from MS headers here to make
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -498,7 +498,6 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
    shell32 \
    user32 \
    uuid \
-    uwinapi \
    winspool \
    version \
 ))