[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sal/Library_uwinapi.mk sal/systools

[Fridrich Strba]

 sal/Library_uwinapi.mk                 |    7 +++++
 sal/systools/win32/uwinapi/legacy.c    |   46 +++++++++++++++++++++++++++++++++
 sal/systools/win32/uwinapi/uwinapi.def |    8 +++++
 3 files changed, 61 insertions(+)

New commits:
commit a56d11d946f5f82599593c02036f51fe76809745
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jun 13 14:37:04 2012 +0200

    Bring back the Duden hack
    
    Change-Id: I062179fca29034602ffc18ad7e2b7de2988dac2f
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk
index 2d8d04a..8d7f828 100644
--- a/sal/Library_uwinapi.mk
+++ b/sal/Library_uwinapi.mk
@@ -47,6 +47,13 @@ $(eval $(call gb_Library_add_defs,uwinapi,\
 $(eval $(call gb_Library_add_cobjects,uwinapi,\
 	sal/systools/win32/uwinapi/snprintf \
 	sal/systools/win32/uwinapi/snwprintf \
+	sal/systools/win32/uwinapi/legacy \
 ))
 
+$(eval $(call gb_Library_add_ldflags,uwinapi,\
+	/DEF:$(SRCDIR)/sal/systools/win32/uwinapi/uwinapi.def \
+))
+
+
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/systools/win32/uwinapi/legacy.c b/sal/systools/win32/uwinapi/legacy.c
new file mode 100644
index 0000000..2218d1d
--- /dev/null
+++ b/sal/systools/win32/uwinapi/legacy.c
@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Fridrich Strba  <fridrich.strba at bluewin.ch>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#pragma warning(disable:4273)       // inconsistent dll linkage
+#endif
+
+EXTERN_C DWORD WINAPI GetShortPathNameW(LPCWSTR lpszLongPath,LPWSTR lpszShortPath,DWORD cchBuffer)
+{
+    typedef DWORD (WINAPI * GetShortPathNameW_t) (LPCWSTR,LPWSTR,DWORD);
+
+    GetShortPathNameW_t p_GetShortPathNameW =
+        (GetShortPathNameW_t) GetProcAddress (
+            GetModuleHandle ("kernel32.dll"), "GetShortPathNameW");
+
+    if (p_GetShortPathNameW)
+        return p_GetShortPathNameW(lpszLongPath,lpszShortPath,cchBuffer);
+    else
+        return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/uwinapi.def b/sal/systools/win32/uwinapi/uwinapi.def
new file mode 100644
index 0000000..f740fb1
--- /dev/null
+++ b/sal/systools/win32/uwinapi/uwinapi.def
@@ -0,0 +1,8 @@
+LIBRARY      "uwinapi.dll"
+
+EXPORTS
+	GetShortPathNameW PRIVATE
+	snprintf
+	snwprintf
+	vsnprintf
+	vsnwprintf