4 files changed, 240 insertions, 0 deletions
diff --git a/embeddedobj/test/Container1/nativelib/exports.dxp b/embeddedobj/test/Container1/nativelib/exports.dxp
new file mode 100644
index 000000000..e03ee0d2b
--- /dev/null
+++ b/embeddedobj/test/Container1/nativelib/exports.dxp
@@ -0,0 +1,3 @@
+Java_embeddedobj_test_NativeView_getNativeWindowSystemType;
+Java_embeddedobj_test_NativeView_getNativeWindow;
+
diff --git a/embeddedobj/test/Container1/nativelib/makefile.mk b/embeddedobj/test/Container1/nativelib/makefile.mk
new file mode 100644
index 000000000..771b12bf4
--- /dev/null
+++ b/embeddedobj/test/Container1/nativelib/makefile.mk
@@ -0,0 +1,69 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+#
+
+PRJ=..$/..$/..
+PRJNAME=embeddedobj
+TARGET=nativeview
+# LIBTARGET=NO
+USE_DEFFILE=TRUE
+ENABLE_EXCEPTIONS=TRUE
+VERSIONOBJ=
+PACKAGE=embeddedobj$/test
+
+USE_JAVAVER:=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+# --- Files --------------------------------------------------------
+
+.IF "$(JAVANUMVER:s/.//)" >= "000100040000"
+
+SLOFILES= $(SLO)$/nativeview.obj
+
+SHL1TARGET=$(TARGET)
+SHL1IMPLIB=i$(SHL1TARGET)
+
+SHL1STDLIBS= \
+    jawt.lib
+
+SHL1OBJS=$(SLOFILES) 
+SHL1VERSIONOBJ=
+
+DEF1NAME=$(SHL1TARGET)
+DEF1EXPORTFILE=exports.dxp
+
+SHL1HEADER=nativeview.h
+
+.ENDIF                  # "$(JAVANUMVER:s/.//)" >= "000100040000"
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :      target.mk
+
+.IF "$(JAVANUMVER:s/.//)" >= "000100040000"
+
+$(SLO)$/nativeview.obj : $(SHL1HEADER)
+
+$(SHL1HEADER) :
+        javah -classpath $(OUT)$/class -o $(SHL1HEADER) embeddedobj.test
+
+.ENDIF                  # "$(JAVANUMVER:s/.//)" >= "000100040000"
+
+
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c
new file mode 100644
index 000000000..a58ce54ef
--- /dev/null
+++ b/embeddedobj/test/Container1/nativelib/nativeview.c
@@ -0,0 +1,118 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifdef _WIN32
+
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+// property name to register own window procedure on hwnd
+#define OLD_PROC_KEY "oldwindowproc"
+// signature of this window procedure
+static LRESULT APIENTRY NativeViewWndProc( HWND , UINT , WPARAM , LPARAM );
+
+#endif
+
+#include "jawt.h"
+#include "jawt_md.h"
+#include "NativeView.h"
+
+#define MY_ASSERT(X,S) if (!X) { fprintf(stderr,"%s\n",S); return 0;}
+
+#define SYSTEM_WIN32   1
+#define SYSTEM_WIN16   2
+#define SYSTEM_JAVA    3
+#define SYSTEM_MAC     5
+#define SYSTEM_XWINDOW 6
+
+/*****************************************************************************
+ *
+ * Class      : NativeView
+ * Method     : getNativeWindowSystemType
+ * Signature  : ()I
+ * Description: returns an identifier for the current operating system
+ */
+JNIEXPORT jint JNICALL Java_embeddedobj_test_NativeView_getNativeWindowSystemType
+  (JNIEnv * env, jobject obj_this)
+{
+    return SYSTEM_WIN32;
+}
+
+/*****************************************************************************
+ *
+ * Class      : NativeView
+ * Method     : getNativeWindow
+ * Signature  : ()J
+ * Description: returns the native systemw window handle of this object
+ */
+JNIEXPORT jlong JNICALL Java_embeddedobj_test_NativeView_getNativeWindow
+  (JNIEnv * env, jobject obj_this)
+{
+    jboolean                      result  ;
+    jint                          lock    ;
+    JAWT                          awt     ;
+    JAWT_DrawingSurface*          ds      ;
+    JAWT_DrawingSurfaceInfo*      dsi     ;
+#ifdef _WIN32
+    JAWT_Win32DrawingSurfaceInfo* dsi_win ;
+#else
+    // FIXME: Where is dsi_x11 defined?
+    // Added below because I'm guessing this test breaks
+
+    // JAWT_X11DrawingSurfaceInfo*dsi_x11 ;
+#endif
+    jlong                         drawable;
+
+    /* Get the AWT */
+    awt.version = JAWT_VERSION_1_3;
+    result      = JAWT_GetAWT(env, &awt);
+    MY_ASSERT(result!=JNI_FALSE,"wrong jawt version");
+
+    /* Get the drawing surface */
+    if ((ds = awt.GetDrawingSurface(env, obj_this)) == NULL)
+        return 0;
+
+    /* Lock the drawing surface */
+    lock = ds->Lock(ds);
+    MY_ASSERT((lock & JAWT_LOCK_ERROR)==0,"can't lock the drawing surface");
+
+    /* Get the drawing surface info */
+    dsi = ds->GetDrawingSurfaceInfo(ds);
+
+    /* Get the platform-specific drawing info */
+#ifdef _WIN32
+    dsi_win  = (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo;
+    drawable = (jlong)dsi_win->hwnd;
+#else
+    dsi_x11  = (JAWT_X11DrawingSurfaceInfo*)dsi->platformInfo;
+    drawable = (jlong)dsi_x11->drawable;
+#endif
+
+    /* Free the drawing surface info */
+    ds->FreeDrawingSurfaceInfo(dsi);
+    /* Unlock the drawing surface */
+    ds->Unlock(ds);
+    /* Free the drawing surface */
+    awt.FreeDrawingSurface(ds);
+
+    return drawable;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.h b/embeddedobj/test/Container1/nativelib/nativeview.h
new file mode 100644
index 000000000..b8687bd09
--- /dev/null
+++ b/embeddedobj/test/Container1/nativelib/nativeview.h
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
+ */
+
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_openoffice_OpenOffice */
+
+#ifndef _Included_NativeView
+#define _Included_NativeView
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     org_openoffice_OpenOffice
+ * Method:    getNativeWindowSystemType
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_embeddedobj_test_NativeView_getNativeWindowSystemType
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_openoffice_OpenOffice
+ * Method:    getNativeWindow
+ * Signature: ()J
+ */
+JNIEXPORT jlong JNICALL Java_embeddedobj_test_NativeView_getNativeWindow
+  (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */