gecko-dev/java/webclient/src_share/bal_util.cpp
edburns%acm.org 22af3b9709 bug=47357
a=edburns
r=ashuk

This change creates a new directory, java/webclient/src_share, that
contains the code that will be used in both src_moz and src_ie, and any
other native browser wrapping implementations.

Here are the steps I followed to implement this change.

1. Create a new directory java/webclient/src_share

2. Move all jni_util*.* files from src_moz into src_share

3. Make it so src_share compiles into a new .lib

   src_share has no netscape dependencies.  Any functionality that
   depended on ns dependencies was kept in src_moz.  In this case, we
   have a function prototype only in src_share, with the implementation
   in src_moz.  We did this for nsHashtable.  The other trick was for
   things in WebShellInitContext that had nothing to do with Netscape.
   This case was accomodated by creating a new struct, ShareInitContext,
   that contains all WebShellInitContext members that have nothing to do
   with Netscape.  Currently this is just jobject propertiesClass.  I
   modified the WebShellInitContext struct to contain a ShareContext
   struct as its last member.  There are two new methods in jni_util.h
   that allow for the initialization and deallocation of the members of
   the ShareContext struct.

4. Make it so src_moz uses the new .lib to provide the jni_util behavior

  a. Create ns_util* files that include ../src_share/jni_util* files
  appropriately.

  The only tricky part was for things in jni_util.h that

Here's the list of files in this change.

cvs -z3 -n update (in directory D:\Projects\mozilla\java\webclient)
cvs server: Updating .
M Makefile.win // added src_share to DIRS
M src_moz/BookmarksImpl.cpp             // include ns_util instead of jni_util
M src_moz/CBrowserContainer.cpp         // include ns_util instead of jni_util
M src_moz/CBrowserContainer.h           // include ns_util instead of jni_util
M src_moz/CurrentPageImpl.cpp           // include ns_util instead of jni_util
M src_moz/HistoryImpl.cpp               // include ns_util instead of jni_util
M src_moz/Makefile.win                  // include ns_util instead of jni_util
M src_moz/NativeEventThread.cpp         // include ns_util instead of jni_util
M src_moz/NavigationImpl.cpp            // include ns_util instead of jni_util
M src_moz/RDFEnumeration.cpp            // include ns_util instead of jni_util
M src_moz/RDFTreeNode.cpp               // include ns_util instead of jni_util
M src_moz/WindowControlImpl.cpp         // include ns_util instead of jni_util
                                        // also use new util_InitShareContext
                                        // function
M src_moz/WrapperFactoryImpl.cpp        // include ns_util instead of jni_util
R src_moz/jni_util.cpp                  // moved to ../src_share
R src_moz/jni_util.h                    // moved to ../src_share
R src_moz/jni_util_export.cpp           // moved to ../src_share
R src_moz/jni_util_export.h             // moved to ../src_share
M src_moz/nsActions.cpp                 // include ns_util instead of jni_util
                                        // also use new
util_DeallocateShareContext
M src_moz/nsActions.h                   // include ns_util instead of jni_util
A src_moz/ns_util.cpp                   // include jni_util.h
A src_moz/ns_util.h                     // include jni_util.h, changes to
                                        // WebshellInitContext struct
A src_moz/ns_util_export.cpp            // provide impls for methods in
                                        // jni_util_export.h

A src_share/Makefile.win
A src_share/bal_util.cpp
A src_share/bal_util.h
A src_share/jni_util.cpp
A src_share/jni_util.h
A src_share/jni_util_export.cpp
A src_share/jni_util_export.h

*****CVS exited normally with code 0*****
2000-08-03 21:32:54 +00:00

181 lines
3.9 KiB
C++

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* 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 Original Code is RaptorCanvas.
*
* The Initial Developer of the Original Code is Kirk Baker and
* Ian Wilkinson. Portions created by Kirk Baker and Ian Wilkinson are
* Copyright (C) 1999 Kirk Baker and Ian Wilkinson. All
* Rights Reserved.
*
* Contributor(s): Ed Burns <edburns@acm.org>
*
*/
/**
* Implementation for bal_util functions.
*/
#include "malloc.h"
#include "string.h"
#include "bal_util.h"
#include "wchar.h"
void JNICALL bal_jstring_newFromAscii(jstring *newStr, const char *value)
{
jint length;
jint i;
jstring p;
if (bnull == newStr) {
return;
}
length = bal_str_getLength(value);
*newStr = (jstring)bal_allocateMemory(sizeof(jchar) +
(length * sizeof(jchar)));
if (!(*newStr)) return;
p = *newStr;
for (i = 0; i < length; i++) {
/* Check ASCII range */
// OSL_ENSHURE( (*value & 0x80) == 0, "Found ASCII char > 127");
*(p++) = (jchar)*(value++);
}
*p = 0;
}
void JNICALL bal_jstring_newFromJcharArray(jstring *newStr, const jchar *value,
jsize len)
{
jint i;
jstring p;
*newStr = (jstring)bal_allocateMemory(sizeof(jchar) +
(len * sizeof(jchar)));
if (!(*newStr)) return;
p = *newStr;
for (i = 0; i < len; i++) {
/* Check ASCII range */
// OSL_ENSHURE( (*value & 0x80) == 0, "Found ASCII char > 127");
*(p++) = (jchar)*(value++);
}
*p = 0;
}
void JNICALL bal_str_newFromJstring(char **newStr, const jstring inValue)
{
jint length;
jint i;
char *p;
jstring value = inValue;
if (bnull == newStr) {
return;
}
length = bal_jstring_getLength(value);
*newStr = (char *)bal_allocateMemory(sizeof(char *) +
(length * sizeof(char *)));
if (!(*newStr)) return;
p = *newStr;
for (i = 0; i < length; i++) {
/* Check ASCII range */
// OSL_ENSHURE( (*value & 0x80) == 0, "Found ASCII char > 127");
*(p++) = (char)*(value++);
}
*p = 0;
}
jint JNICALL bal_str_getLength(const char *str)
{
jint result = -1;
const char * pTempStr = (char *)bal_findInMemory(str, '\0',
0x80000000);
result = pTempStr - str;
return result;
}
jint JNICALL bal_jstring_getLength(const jstring str)
{
jint result = -1;
const jstring pTempStr = bal_findInJstring(str, '\0');
result = pTempStr - str;
return result;
}
void JNICALL bal_jstring_release(jstring value)
{
bal_freeMemory(value);
}
void JNICALL bal_str_release(const char *str)
{
bal_freeMemory((void *)str);
}
void * JNICALL bal_allocateMemory(jint bytes)
{
void *result = bnull;
if (0 < bytes) {
result = malloc(bytes);
}
return result;
}
void JNICALL bal_freeMemory(void *MemA)
{
free(MemA);
MemA = bnull;
}
void * JNICALL bal_findInMemory(const void *MemA,
jchar ch,
jint bytes)
{
void *result = bnull;
result = memchr(MemA, ch, bytes);
return result;
}
jstring JNICALL bal_findInJstring(const jstring MemA,
jchar ch)
{
jstring result = bnull;
result = wcschr(MemA, ch);
return result;
}