Revert "Trying to chop out the uwinapi library"

This reverts commit 2dea0dab4fafda3c10a5bd03ad15ed39a4658b51.

13 files changed, 24 insertions, 2 deletions

diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h
index 59584bdb0f50..e4ed257e4a3f 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -68,6 +68,9 @@
 #ifdef __MINGW32__
 #define _SNPRINTF_DLLIMPORT
 #endif
+#ifndef _SNPRINTF_H
+#include <systools/win32/snprintf.h>
+#endif
 
 #endif /* defined WIN32 */
 
diff --git a/sal/inc/systools/win32/snprintf.h.deleteme b/sal/inc/systools/win32/snprintf.h
index cfed10fcaee2..cfed10fcaee2 100644
--- a/sal/inc/systools/win32/snprintf.h.deleteme
+++ b/sal/inc/systools/win32/snprintf.h
diff --git a/sal/inc/systools/win32/uwinapi.h.deleteme b/sal/inc/systools/win32/uwinapi.h
index e7874e439e5a..e7874e439e5a 100644
--- a/sal/inc/systools/win32/uwinapi.h.deleteme
+++ b/sal/inc/systools/win32/uwinapi.h
diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c
index f6e526cf44fe..4d894260446a 100644
--- a/sal/osl/w32/dllentry.c
+++ b/sal/osl/w32/dllentry.c
@@ -34,6 +34,7 @@
 #pragma warning(pop)
 #endif
 #include <tlhelp32.h>
+#include <systools/win32/uwinapi.h>
 #include <winsock.h>
 #include <osl/diagnose.h>
 #include <sal/types.h>
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 3a1f799cfb44..b4648a72d2ae 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -32,6 +32,8 @@
 #define UNICODE
 #define _UNICODE
 #define _WIN32_WINNT 0x0500
+#include "systools/win32/uwinapi.h"
+
 #include "osl/file.hxx"
 
 #include "file_url.h"
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 53dbda6ccfe6..8e3ea7f9f284 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -29,6 +29,8 @@
 #define UNICODE
 #define _UNICODE
 #define _WIN32_WINNT 0x0500
+#include "systools/win32/uwinapi.h"
+
 #include "osl/file.h"
 
 #include "file_url.h"
diff --git a/sal/osl/w32/file_error.c b/sal/osl/w32/file_error.c
index ac6a56f9d0ed..bc9048d72a36 100644
--- a/sal/osl/w32/file_error.c
+++ b/sal/osl/w32/file_error.c
@@ -29,6 +29,8 @@
 #define UNICODE
 #define _UNICODE
 #define _WIN32_WINNT 0x0500
+#include "systools/win32/uwinapi.h"
+
 #include "file_error.h"
 
 #include "osl/diagnose.h"
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index d665ee4a63d2..82fd8d2fbc74 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -29,6 +29,7 @@
 #define UNICODE
 #define _UNICODE
 #define _WIN32_WINNT 0x0500
+#include "systools/win32/uwinapi.h"
 
 #include "file_url.h"
 #include <sal/macros.h>
diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c
index 81b0e85f98f5..053d39f446c1 100644
--- a/sal/osl/w32/security.c
+++ b/sal/osl/w32/security.c
@@ -33,6 +33,7 @@
 #include <osl/diagnose.h>
 #include <osl/thread.h>
 #include <osl/file.h>
+#include <systools/win32/uwinapi.h>
 #include <sal/macros.h>
 #include "secimpl.h"
 
diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx
index a5f243dd5061..659d66ee1c74 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -40,6 +40,7 @@
 #include <DbgHelp.h>
 #endif
 #include <errorrep.h>
+#include <systools/win32/uwinapi.h>
 #include <sal/macros.h>
 
 typedef struct _oslSignalHandlerImpl
diff --git a/sal/osl/w32/tempfile.cxx b/sal/osl/w32/tempfile.cxx
index d5d4f16fef57..9922b699a932 100644
--- a/sal/osl/w32/tempfile.cxx
+++ b/sal/osl/w32/tempfile.cxx
@@ -29,6 +29,7 @@
 #define UNICODE
 #define _UNICODE
 #define _WIN32_WINNT 0x0500
+#include "systools/win32/uwinapi.h"
 
 #include "osl/file.h"
 
diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index 07b7211fdd6f..9f9a6accf2ef 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -5,12 +5,13 @@ 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\onlineupdate			nmake	-	n	sa_onlineupdate 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\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_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_uwinapi.n 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
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
index 76b6c130d0af..3a3a164480ee 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -78,7 +78,14 @@ SHL1RPATH=URELIB
 
 .IF "$(GUI)"=="WNT"
 
+.IF "$(COM)"=="GCC"
+UWINAPILIB=     -luwinapi
+.ELSE
+UWINAPILIB=     $(LB)$/uwinapi.lib
+.ENDIF
+
 SHL1STDLIBS=	\
+                $(UWINAPILIB)\
                 $(ADVAPI32LIB)\
                 $(WS2_32LIB)\
                 $(MPRLIB)\