summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2012-01-19 02:13:47 -0700
committerFridrich Štrba <fridrich.strba@bluewin.ch>2012-01-19 13:17:31 +0100
commitd823fef9b9f7ad0d0dcd834a3f2c47c3f018f523 (patch)
tree7e7e0848b869d0a1b48d85029b75e5bd97aa4377
parent293f1a753fbf2471c4db47cebd09a8429a0d2459 (diff)
Make older Duden Korrektor work with LO (fdo#37561)
signed-off-by: Michael Meeks <mmeeks@suse.com> Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
-rwxr-xr-xsal/systools/win32/uwinapi/legacy.cpp46
-rw-r--r--sal/systools/win32/uwinapi/makefile.mk5
-rwxr-xr-xsal/systools/win32/uwinapi/uwinapi.dxp25
3 files changed, 76 insertions, 0 deletions
diff --git a/sal/systools/win32/uwinapi/legacy.cpp b/sal/systools/win32/uwinapi/legacy.cpp
new file mode 100755
index 000000000000..2218d1d77a8a
--- /dev/null
+++ b/sal/systools/win32/uwinapi/legacy.cpp
@@ -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@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/makefile.mk b/sal/systools/win32/uwinapi/makefile.mk
index 0989b6121135..7b5c93bd5d1b 100644
--- a/sal/systools/win32/uwinapi/makefile.mk
+++ b/sal/systools/win32/uwinapi/makefile.mk
@@ -48,6 +48,7 @@ CFLAGSCXX+=-Wno-unused-parameter -Wno-return-type
.ENDIF
SLOFILES=\
+ $(SLO)$/legacy.obj\
$(SLO)$/snprintf.obj\
$(SLO)$/snwprintf.obj
@@ -55,6 +56,10 @@ SHL1TARGET=$(TARGET)
SHL1IMPLIB=$(SHL1TARGET)
SHL1DEF=$(MISC)/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
+.IF "$(COM)"=="MSC"
+DEF1EXPORTFILE=\
+ $(SHL1TARGET).dxp
+.ENDIF
DEF1DEPN=\
$(DEF1EXPORTFILE)\
makefile.mk
diff --git a/sal/systools/win32/uwinapi/uwinapi.dxp b/sal/systools/win32/uwinapi/uwinapi.dxp
new file mode 100755
index 000000000000..0eeb2a3b1b03
--- /dev/null
+++ b/sal/systools/win32/uwinapi/uwinapi.dxp
@@ -0,0 +1,25 @@
+;
+; 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 or as specified alternatively below. 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@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.
+;
+;*************************************************************************
+
+GetShortPathNameW