diff --git a/mozilla/java/Makefile.win b/mozilla/java/Makefile.win index 76b945191f2..6d64331aad0 100644 --- a/mozilla/java/Makefile.win +++ b/mozilla/java/Makefile.win @@ -50,7 +50,6 @@ DIRS = external \ DIRS = external \ util \ dom \ - xpcom \ webclient \ build !else diff --git a/mozilla/java/dom/jni/javaDOMEventsGlobals.cpp b/mozilla/java/dom/jni/javaDOMEventsGlobals.cpp index 933cf6072fa..b7ce1bf47ef 100644 --- a/mozilla/java/dom/jni/javaDOMEventsGlobals.cpp +++ b/mozilla/java/dom/jni/javaDOMEventsGlobals.cpp @@ -220,7 +220,7 @@ jobject JavaDOMEventsGlobals::CreateEventSubtype(JNIEnv *env, return NULL; } - char* buffer = eventType.ToNewUTF8String(); + char* buffer = (char *) eventType.GetBufferHandle(); if (isEventOfType(mouseEventTypes, buffer) == JNI_TRUE) { clazz = mouseEventClass; diff --git a/mozilla/java/dom/jni/makefile.win b/mozilla/java/dom/jni/makefile.win index 7f5b19f1612..dfc0191ff84 100755 --- a/mozilla/java/dom/jni/makefile.win +++ b/mozilla/java/dom/jni/makefile.win @@ -24,6 +24,27 @@ IGNORE_MANIFEST=1 DEFINES=-D_IMPL_NS_WEB -DWIN32_LEAN_AND_MEAN MODULE=javadomjni +LIBRARY_NAME=javadomjni +MODULE_NAME=nsJavaDOMJNI +REQUIRES = xpcom \ + javadom \ + string \ + embed_base \ + webBrowser_core \ + webshell \ + windowwatcher \ + profile \ + necko \ + docshell \ + dom \ + widget \ + uriloader \ + shistory \ + webbrowserpersist \ + content \ + gfx \ + $(NULL) +include <$(DEPTH)/config/config.mak> CPPSRCS= \ javaDOMGlobals.cpp \ @@ -92,12 +113,11 @@ JAVA_CLS= \ $(NULL) -LINCS= - -MAKE_OBJ_TYPE = DLL -DLLNAME = javadomjni -DLL=.\$(OBJDIR)\$(DLLNAME).dll -LIBRARY_NAME=javadomimpl +INCS= \ + -I$(JDKHOME)\include \ + -I$(JDKHOME)\include\win32 \ + $(INCS) \ + $(NULL) LCFLAGS = \ $(LCFLAGS) \ @@ -109,22 +129,24 @@ LLIBS= \ $(DIST)\lib\xpcom.lib \ $(LIBNSPR) -include <$(DEPTH)\config\config.mak> include <$(DEPTH)\config\rules.mak> JAVAH_PROG=$(JDKHOME)\bin\javah JAVAH_FLAGS=-jni -classpath $(CLASSPATH);$(JAVA_DESTPATH) +#CFLAGS = /E $(CFLAGS) + + export:: $(JAVAH_PROG) $(JAVAH_FLAGS) $(JAVA_CLS) install:: $(DLL) - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib + $(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin + $(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib clobber_all:: clobber clobber:: - rm -f $(DIST)\bin\$(DLLNAME).dll - rm -f $(DIST)\lib\$(DLLNAME).lib + rm -f $(DIST)\bin\$(LIBRARY_NAME).dll + rm -f $(DIST)\lib\$(LIBRARY_NAME).lib rm -f org_*.h diff --git a/mozilla/java/dom/jni/nativeDOMProxyListener.cpp b/mozilla/java/dom/jni/nativeDOMProxyListener.cpp index 571944a8005..9dabf80e903 100644 --- a/mozilla/java/dom/jni/nativeDOMProxyListener.cpp +++ b/mozilla/java/dom/jni/nativeDOMProxyListener.cpp @@ -46,7 +46,7 @@ NativeDOMProxyListener::~NativeDOMProxyListener() { JNIEnv *env; - if (vm->AttachCurrentThread( &env, NULL) != 0) + if (vm->AttachCurrentThread((void **) &env, NULL) != 0) PR_LOG(JavaDOMGlobals::log, PR_LOG_WARNING, ("NativeDOMProxyListener: Can't attach current thread to JVM\n")); @@ -64,7 +64,7 @@ NS_IMETHODIMP NativeDOMProxyListener::HandleEvent(nsIDOMEvent* aEvent) jobject jevent; JNIEnv *env; - if (vm->AttachCurrentThread( &env, NULL) != 0) { + if (vm->AttachCurrentThread((void **) &env, NULL) != 0) { PR_LOG(JavaDOMGlobals::log, PR_LOG_WARNING, ("NativeDOMProxyListener:HandleEvent Can't attach current thread to JVM\n")); return NS_ERROR_FAILURE; diff --git a/mozilla/java/dom/jni/nativeDOMProxyListener.h b/mozilla/java/dom/jni/nativeDOMProxyListener.h index a811d3aed2e..7ecc0a66d6f 100644 --- a/mozilla/java/dom/jni/nativeDOMProxyListener.h +++ b/mozilla/java/dom/jni/nativeDOMProxyListener.h @@ -1,8 +1,8 @@ #ifndef __JAVA_DOM_NATIVE_PROXY_LISTENER__ #define __JAVA_DOM_NATIVE_PROXY_LISTENER__ -#include"nsIDOMEventListener.h" -#include"jni.h" +#include "nsIDOMEventListener.h" +#include "jni.h" class NativeDOMProxyListener: public nsIDOMEventListener{ diff --git a/mozilla/java/dom/jni/org_mozilla_dom_events_EventImpl.cpp b/mozilla/java/dom/jni/org_mozilla_dom_events_EventImpl.cpp index 69d148bf27f..419a491c3fb 100644 --- a/mozilla/java/dom/jni/org_mozilla_dom_events_EventImpl.cpp +++ b/mozilla/java/dom/jni/org_mozilla_dom_events_EventImpl.cpp @@ -22,6 +22,7 @@ #include "prlog.h" #include "nsIDOMNode.h" #include"nsIDOMEvent.h" +#include"nsIDOMNSEvent.h" #include"nsIDOMEventTarget.h" #include"javaDOMEventsGlobals.h" #include "org_mozilla_dom_events_EventImpl.h" @@ -239,15 +240,21 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_dom_events_EventImpl_getType JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_preventBubble (JNIEnv *env, jobject jthis) { - nsIDOMEvent* event = (nsIDOMEvent*) + nsIDOMEvent* domEvent = (nsIDOMEvent*) env->GetLongField(jthis, JavaDOMEventsGlobals::eventPtrFID); - if (!event) { + if (!domEvent) { JavaDOMGlobals::ThrowException(env, "Event.preventBubble: NULL pointer"); return; } - nsresult rv = event->PreventBubble(); + nsCOMPtr event(do_QueryInterface(domEvent)); + nsresult rv = NS_ERROR_FAILURE; + + if (event) { + rv = event->PreventBubble(); + } + if (NS_FAILED(rv)) { JavaDOMGlobals::ThrowException(env, "Event.preventBubble: failed", rv); @@ -262,15 +269,21 @@ JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_preventBubble JNIEXPORT void JNICALL Java_org_mozilla_dom_events_EventImpl_preventCapture (JNIEnv *env, jobject jthis) { - nsIDOMEvent* event = (nsIDOMEvent*) + nsIDOMEvent* domEvent = (nsIDOMEvent*) env->GetLongField(jthis, JavaDOMEventsGlobals::eventPtrFID); - if (!event) { + if (!domEvent) { JavaDOMGlobals::ThrowException(env, "Event.preventCapture: NULL pointer"); return; } - nsresult rv = event->PreventCapture(); + nsCOMPtr event(do_QueryInterface(domEvent)); + nsresult rv = NS_ERROR_FAILURE; + + if (event) { + rv = event->PreventCapture(); + } + if (NS_FAILED(rv)) { JavaDOMGlobals::ThrowException(env, "Event.preventCapture: failed", rv); diff --git a/mozilla/java/dom/src/makefile.win b/mozilla/java/dom/src/makefile.win index 84268a8b169..ceced573ba0 100644 --- a/mozilla/java/dom/src/makefile.win +++ b/mozilla/java/dom/src/makefile.win @@ -20,15 +20,33 @@ # Contributor(s): DEPTH=..\..\.. -IGNORE_MANIFEST=1 DEFINES=-D_IMPL_NS_WEB -DWIN32_LEAN_AND_MEAN !ifdef JAVA_DOM_OJI_ENABLE DEFINES=$(DEFINES) -DJAVA_DOM_OJI_ENABLE !endif + MODULE=javadom -IS_COMPONENT=1 -LIBRARY_NAME=libjavadom +LIBRARY_NAME=javadom +MODULE_NAME=nsJavaDOM +REQUIRES = xpcom \ + string \ + embed_base \ + webBrowser_core \ + webshell \ + windowwatcher \ + profile \ + necko \ + docshell \ + dom \ + widget \ + uriloader \ + shistory \ + webbrowserpersist \ + content \ + gfx \ + $(NULL) +include <$(DEPTH)/config/config.mak> CPPSRCS= \ !ifdef JAVA_DOM_OJI_ENABLE @@ -53,15 +71,6 @@ LINCS= \ -I$(JDKHOME)\include\win32 !endif -MAKE_OBJ_TYPE = DLL -DLLNAME = javadom -DLL=.\$(OBJDIR)\$(DLLNAME).dll - -LCFLAGS = \ - $(LCFLAGS) \ - $(DEFINES) \ - $(NULL) - LLIBS= \ !ifdef JAVA_DOM_OJI_ENABLE $(DIST)\lib\oji.lib \ @@ -71,16 +80,9 @@ LLIBS= \ $(DIST)\lib\xpcom.lib \ $(LIBNSPR) -include <$(DEPTH)\config\config.mak> - include <$(DEPTH)\config\rules.mak> -install:: $(DLL) - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib - -clobber_all:: clobber - -clobber:: - rm -f $(DIST)\bin\components\$(DLLNAME).dll - rm -f $(DIST)\lib\$(DLLNAME).lib +LCFLAGS = \ + $(LCFLAGS) \ + $(DEFINES) \ + $(NULL) diff --git a/mozilla/java/dom/src/nsJavaDOMImpl.cpp b/mozilla/java/dom/src/nsJavaDOMImpl.cpp index f12b40dc0f4..a29385965fd 100644 --- a/mozilla/java/dom/src/nsJavaDOMImpl.cpp +++ b/mozilla/java/dom/src/nsJavaDOMImpl.cpp @@ -299,12 +299,16 @@ NS_IMETHODIMP nsJavaDOMImpl::OnProgressChange(nsIWebProgress *aWebProgress, JNIEnv* env = NULL; if (Init(&env) == PR_FALSE) return NS_ERROR_FAILURE; - + + nsCString urlSpecString; char* urlSpec = (char*) ""; nsIURI* url = nsnull; nsCOMPtr channel = do_QueryInterface(request); - if (channel && NS_SUCCEEDED(channel->GetURI(&url))) - url->GetSpec(&urlSpec); + if (channel && NS_SUCCEEDED(channel->GetURI(&url)) && + NS_SUCCEEDED(url->GetSpec(urlSpecString))) { + urlSpec = (char *) urlSpecString.GetBufferHandle(); + } + jstring jURL = env->NewStringUTF(urlSpec); if (!jURL) return NS_ERROR_FAILURE; // PENDING(edburns): this leaks. @@ -336,10 +340,13 @@ NS_IMETHODIMP nsJavaDOMImpl::OnStatusChange(nsIWebProgress *aWebProgress, if (Init(&env) == PR_FALSE) return NS_ERROR_FAILURE; char* urlSpec = (char*) ""; + nsCString urlSpecString; nsIURI* url = nsnull; nsCOMPtr channel = do_QueryInterface(request); - if (channel && NS_SUCCEEDED(channel->GetURI(&url))) - url->GetSpec(&urlSpec); + if (channel && NS_SUCCEEDED(channel->GetURI(&url)) && + NS_SUCCEEDED(url->GetSpec(urlSpecString))) { + urlSpec = (char *) urlSpecString.GetBufferHandle(); + } jstring jURL = env->NewStringUTF(urlSpec); if (!jURL) return NS_ERROR_FAILURE; // PENDING(edburns): this leaks @@ -402,10 +409,14 @@ NS_IMETHODIMP nsJavaDOMImpl::doEndDocumentLoad(nsIWebProgress *aWebProgress, if (Init(&env) == PR_FALSE) return NS_ERROR_FAILURE; char* urlSpec = (char*) ""; + nsCString urlSpecString; nsIURI* url = nsnull; nsCOMPtr channel = do_QueryInterface(request); - if (channel && NS_SUCCEEDED(channel->GetURI(&url))) - url->GetSpec(&urlSpec); + if (channel && NS_SUCCEEDED(channel->GetURI(&url)) && + NS_SUCCEEDED(url->GetSpec(urlSpecString))) { + urlSpec = (char *) urlSpecString.GetBufferHandle(); + } + jstring jURL = env->NewStringUTF(urlSpec); if (!jURL) return NS_ERROR_FAILURE; @@ -432,10 +443,14 @@ NS_IMETHODIMP nsJavaDOMImpl::doStartURLLoad(nsIWebProgress *aWebProgress, if (Init(&env) == PR_FALSE) return NS_ERROR_FAILURE; char* urlSpec = (char*) ""; + nsCString urlSpecString; nsIURI* url = nsnull; nsCOMPtr channel = do_QueryInterface(request); - if (channel && NS_SUCCEEDED(channel->GetURI(&url))) - url->GetSpec(&urlSpec); + if (channel && NS_SUCCEEDED(channel->GetURI(&url)) && + NS_SUCCEEDED(url->GetSpec(urlSpecString))) { + urlSpec = (char *) urlSpecString.GetBufferHandle(); + } + jstring jURL = env->NewStringUTF(urlSpec); if (!jURL) return NS_ERROR_FAILURE; @@ -470,11 +485,15 @@ NS_IMETHODIMP nsJavaDOMImpl::doEndURLLoad(nsIWebProgress *aWebProgress, JNIEnv* env = NULL; if (Init(&env) == PR_FALSE) return NS_ERROR_FAILURE; + nsCString urlSpecString; char* urlSpec = (char*) ""; nsIURI* url = nsnull; nsCOMPtr channel = do_QueryInterface(request); - if (channel && NS_SUCCEEDED(channel->GetURI(&url))) - url->GetSpec(&urlSpec); + if (channel && NS_SUCCEEDED(channel->GetURI(&url)) && + NS_SUCCEEDED(url->GetSpec(urlSpecString))) { + urlSpec = (char *) urlSpecString.GetBufferHandle(); + } + jstring jURL = env->NewStringUTF(urlSpec); if (!jURL) return NS_ERROR_FAILURE; diff --git a/mozilla/java/webclient/Makefile.win b/mozilla/java/webclient/Makefile.win index a96f193aac7..69eeffe7a1d 100644 --- a/mozilla/java/webclient/Makefile.win +++ b/mozilla/java/webclient/Makefile.win @@ -35,8 +35,7 @@ IGNORE_MANIFEST=1 #//------------------------------------------------------------------------ DEPTH = ..\.. -DIRS = import \ - classes_spec \ +DIRS = classes_spec \ src_share \ $(NULL) diff --git a/mozilla/java/webclient/classes_spec/Makefile.win b/mozilla/java/webclient/classes_spec/Makefile.win index 4598a24aaa7..74c4ab71eea 100644 --- a/mozilla/java/webclient/classes_spec/Makefile.win +++ b/mozilla/java/webclient/classes_spec/Makefile.win @@ -46,7 +46,6 @@ include <$(DEPTH)\java\config\localdefs.mak> JAR_WEBCLIENT_CLASSES = \ org\mozilla\webclient \ - org\mozilla\webclient\stubs \ org\mozilla\webclient\wrapper_native \ org\mozilla\webclient\wrapper_native\win32 \ org\mozilla\webclient\test \ diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/ProfileManagerImpl.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/ProfileManagerImpl.java index 996aa62efb9..9d5cce5a89b 100644 --- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/ProfileManagerImpl.java +++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/ProfileManagerImpl.java @@ -33,130 +33,66 @@ import org.mozilla.webclient.WrapperFactory; import org.mozilla.webclient.UnimplementedException; -import org.mozilla.xpcom.*; -import org.mozilla.webclient.stubs.*; public class ProfileManagerImpl extends ImplObjectNative implements ProfileManager { // local variables -private nsIXPIDLServiceManager serviceMgr; -private nsIProfile profileStub; -private CID nsProfileCID = new CID("02b0625b-e7f3-11d2-9f5a-006008a6efe9"); - public ProfileManagerImpl(WrapperFactory yourFactory, BrowserControl yourBrowserControl) { super(yourFactory, yourBrowserControl); - // Make whatever native calls are required to initialize the - // BlackConnect Profile module here - InterfaceRegistry.register(nsIProfile.class); - serviceMgr = org.mozilla.xpcom.Components.getServiceManager(); - nsISupports profile = serviceMgr.getService(nsProfileCID, nsIProfile.IID); - profileStub = (nsIProfile) profile.queryInterface(nsIProfile.IID); } public int GetProfileCount() { - myFactory.throwExceptionIfNotInitialized(); - - int count; - synchronized(myBrowserControl) { - count = profileStub.getProfileCount(); - } - return count; + return -1; } public String [] GetProfileList(int [] length) { - myFactory.throwExceptionIfNotInitialized(); - String [] list = null; - synchronized(myBrowserControl) { - list = profileStub.getProfileList(length); - } return list; } public boolean ProfileExists(String profileName) { - myFactory.throwExceptionIfNotInitialized(); - boolean exists = false; - synchronized(myBrowserControl) { - exists = profileStub.profileExists(profileName); - } return exists; } public String GetCurrentProfile() { - myFactory.throwExceptionIfNotInitialized(); - String currProfile = null; - synchronized(myBrowserControl) { - currProfile = profileStub.getCurrentProfile(); - } return currProfile; } public void SetCurrentProfile(String profileName) { - myFactory.throwExceptionIfNotInitialized(); - - synchronized(myBrowserControl) { - profileStub.setCurrentProfile(profileName); - } } public void CreateNewProfile(String profileName, String nativeProfileDir, String langcode, boolean useExistingDir) { - myFactory.throwExceptionIfNotInitialized(); - - System.out.println("\nIn ProfileManager CreateNewProfile\n"); - synchronized(myBrowserControl) { - profileStub.createNewProfile(profileName, nativeProfileDir, langcode, useExistingDir); - } } public void RenameProfile(String currName, String newName) { - myFactory.throwExceptionIfNotInitialized(); - - synchronized(myBrowserControl) { - profileStub.renameProfile(currName, newName); - } } public void DeleteProfile(String profileName, boolean canDeleteFiles) { - myFactory.throwExceptionIfNotInitialized(); - - synchronized(myBrowserControl) { - profileStub.deleteProfile(profileName, canDeleteFiles); - } } public void CloneProfile(String currName) { - myFactory.throwExceptionIfNotInitialized(); - - synchronized(myBrowserControl) { - profileStub.cloneProfile(currName); - } } protected void finalize() { - if (profileStub != null) { - //Release any service that we may be holding on to - nsISupports obj = (nsISupports) profileStub.queryInterface(nsISupports.IID); - serviceMgr.releaseService(nsProfileCID, obj); - } } } diff --git a/mozilla/java/webclient/src_moz/CBrowserContainer.cpp b/mozilla/java/webclient/src_moz/CBrowserContainer.cpp index 45807d269ac..314aef26898 100644 --- a/mozilla/java/webclient/src_moz/CBrowserContainer.cpp +++ b/mozilla/java/webclient/src_moz/CBrowserContainer.cpp @@ -30,6 +30,7 @@ #include "nsIWebBrowser.h" #include "nsIWebBrowserFocus.h" #include "nsIRequest.h" +#include "nsIInterfaceRequestorUtils.h" #include "nsIDOMNamedNodeMap.h" #include "nsIDOMWindow.h" #include "nsIDocShellTreeItem.h" @@ -271,8 +272,8 @@ NS_IMETHODIMP CBrowserContainer::ConfirmEx(const PRUnichar *dialogTitle, // This array contains the button strings that are dynamically // allocated and need to be freed. const PRUnichar *buttonStringsToFree[maxButtons]; - nsCRT::memset(buttonStringsToFree, nsnull, - maxButtons * sizeof(PRUnichar *)); + memset(buttonStringsToFree, nsnull, + maxButtons * sizeof(PRUnichar *)); PRInt32 numberButtons = 0; @@ -315,7 +316,7 @@ NS_IMETHODIMP CBrowserContainer::ConfirmEx(const PRUnichar *dialogTitle, // localization bundle. In this case, we must copy the // string and free it. tempStr = buttonTextStr.get(); - strings[buttonOffset + i].uniStr = tempStr.ToNewUnicode(); + strings[buttonOffset + i].uniStr = ToNewUnicode(tempStr); buttonStringsToFree[i] = strings[buttonOffset + i].uniStr; } else { @@ -901,25 +902,19 @@ NS_IMETHODIMP CBrowserContainer::OnStartURIOpen(nsIURI *aURI, PRBool *_retval) return NS_ERROR_NOT_IMPLEMENTED; } -NS_IMETHODIMP CBrowserContainer::GetProtocolHandler(nsIURI *aURI, nsIProtocolHandler **_retval) +NS_IMETHODIMP CBrowserContainer::DoContent(const char *aContentType, PRBool aIsContentPreferred, nsIRequest *aRequest, nsIStreamListener **aContentHandler, PRBool *_retval) { return NS_ERROR_NOT_IMPLEMENTED; } -NS_IMETHODIMP CBrowserContainer::DoContent(const char *aContentType, nsURILoadCommand aCommand, nsIRequest *request, nsIStreamListener **aContentHandler, PRBool *_retval) +NS_IMETHODIMP CBrowserContainer::IsPreferred(const char *aContentType, char **aDesiredContentType, PRBool *_retval) { return NS_ERROR_NOT_IMPLEMENTED; } -NS_IMETHODIMP CBrowserContainer::IsPreferred(const char *aContentType, nsURILoadCommand aCommand, char **aDesiredContentType, PRBool *_retval) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - - -NS_IMETHODIMP CBrowserContainer::CanHandleContent(const char *aContentType, nsURILoadCommand aCommand, char **aDesiredContentType, PRBool *_retval) +NS_IMETHODIMP CBrowserContainer::CanHandleContent(const char *aContentType, PRBool aIsContentPreferred, char **aDesiredContentType, PRBool *_retval) { return NS_ERROR_NOT_IMPLEMENTED; } @@ -1008,17 +1003,20 @@ CBrowserContainer::SizeShellTo(nsIDocShellTreeItem* aShell, return NS_OK; } -NS_IMETHODIMP CBrowserContainer::GetNewWindow(PRInt32 aChromeFlags, - nsIDocShellTreeItem** aDocShellTreeItem) -{ - - return NS_ERROR_NOT_IMPLEMENTED; -} - /////////////////////////////////////////////////////////////////////////////// // nsIBaseWindow +NS_IMETHODIMP CBrowserContainer::GetEnabled(PRBool *aEnabled) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP CBrowserContainer::SetEnabled(PRBool aEnabled) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + NS_IMETHODIMP CBrowserContainer::InitWindow(nativeWindow parentNativeWindow, nsIWidget * parentWidget, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy) { @@ -1145,15 +1143,6 @@ CBrowserContainer::SetFocus(void) } -NS_IMETHODIMP -CBrowserContainer::FocusAvailable(nsIBaseWindow *aCurrentFocus, - PRBool aForward, - PRBool *aTookFocus) -{ - return NS_ERROR_FAILURE; -} - - NS_IMETHODIMP CBrowserContainer::GetTitle(PRUnichar * *aTitle) { @@ -1220,14 +1209,6 @@ CBrowserContainer::SetChromeFlags(PRUint32 aChromeFlags) return NS_ERROR_FAILURE; } -NS_IMETHODIMP -CBrowserContainer::CreateBrowserWindow(PRUint32 chromeMask, PRInt32 aX, - PRInt32 aY, PRInt32 aCX, PRInt32 aCY, -nsIWebBrowser **aWebBrowser) -{ - return NS_ERROR_FAILURE; -} - NS_IMETHODIMP CBrowserContainer::SizeBrowserTo(PRInt32 aCX, PRInt32 aCY) { @@ -1728,8 +1709,9 @@ nsresult JNICALL CBrowserContainer::takeActionOnNode(nsCOMPtr curren nodeName = nodeInfo; if (prLogModuleInfo) { - nsAutoCString nodeInfoCStr(nodeName); - PR_LOG(prLogModuleInfo, 4, ("%s", (const char *)nodeInfoCStr)); + char * nodeInfoCStr = ToNewCString(nodeName); + PR_LOG(prLogModuleInfo, 4, ("%s", nodeInfoCStr)); + nsMemory::Free(nodeInfoCStr); } rv = currentNode->GetNodeValue(nodeInfo); @@ -1741,8 +1723,9 @@ nsresult JNICALL CBrowserContainer::takeActionOnNode(nsCOMPtr curren nodeValue = nodeInfo; if (prLogModuleInfo) { - nsAutoCString nodeInfoCStr(nodeValue); + char * nodeInfoCStr = ToNewCString(nodeName); PR_LOG(prLogModuleInfo, 4, ("%s", (const char *)nodeInfoCStr)); + nsMemory::Free(nodeInfoCStr); } jNodeName = ::util_NewString(env, nodeName.get(), @@ -1791,9 +1774,10 @@ nsresult JNICALL CBrowserContainer::takeActionOnNode(nsCOMPtr curren nodeName = nodeInfo; if (prLogModuleInfo) { - nsAutoCString nodeInfoCStr(nodeName); + char * nodeInfoCStr = ToNewCString(nodeName); PR_LOG(prLogModuleInfo, 4, ("attribute[%d], %s", i, (const char *)nodeInfoCStr)); + nsMemory::Free(nodeInfoCStr); } rv = currentNode->GetNodeValue(nodeInfo); @@ -1805,9 +1789,10 @@ nsresult JNICALL CBrowserContainer::takeActionOnNode(nsCOMPtr curren nodeValue = nodeInfo; if (prLogModuleInfo) { - nsAutoCString nodeInfoCStr(nodeValue); + char * nodeInfoCStr = ToNewCString(nodeName); PR_LOG(prLogModuleInfo, 4, ("attribute[%d] %s", i,(const char *)nodeInfoCStr)); + nsMemory::Free(nodeInfoCStr); } jNodeName = ::util_NewString(env, nodeName.get(), nodeName.Length()); diff --git a/mozilla/java/webclient/src_moz/CurrentPageActionEvents.cpp b/mozilla/java/webclient/src_moz/CurrentPageActionEvents.cpp index 01a8a06475a..0d915878f79 100644 --- a/mozilla/java/webclient/src_moz/CurrentPageActionEvents.cpp +++ b/mozilla/java/webclient/src_moz/CurrentPageActionEvents.cpp @@ -42,6 +42,9 @@ #include "nsIInterfaceRequestor.h" #include "nsCOMPtr.h" #include "nsIServiceManager.h" +#include "nsIURI.h" +#include "nsIHistoryEntry.h" +#include "nsString.h" wsCopySelectionEvent::wsCopySelectionEvent(WebShellInitContext *yourInitContext) : nsActionEvent(), @@ -241,13 +244,16 @@ wsGetURLEvent::handleEvent () if (NS_FAILED(rv)) { return result; } + + nsCString urlSpecString; - rv = URI->GetSpec(¤tURL); + rv = URI->GetSpec(urlSpecString); if (NS_FAILED(rv)) { - return result; - } - - result = (void *) currentURL; + return result; + } + currentURL = (char *) urlSpecString.GetBufferHandle(); + + result = (void *) currentURL; } return result; } // handleEvent() diff --git a/mozilla/java/webclient/src_moz/HistoryActionEvents.cpp b/mozilla/java/webclient/src_moz/HistoryActionEvents.cpp index da3b5272c91..f2a784f19a1 100644 --- a/mozilla/java/webclient/src_moz/HistoryActionEvents.cpp +++ b/mozilla/java/webclient/src_moz/HistoryActionEvents.cpp @@ -33,6 +33,9 @@ #include "HistoryActionEvents.h" #include "ns_util.h" +#include "nsIHistoryEntry.h" +#include "nsIURI.h" +#include "nsString.h" /* * wsCanBackEvent @@ -254,7 +257,7 @@ wsGetURLForIndexEvent::handleEvent () nsresult rv; nsISHistory* sHistory; rv = mInitContext->webNavigation->GetSessionHistory(&sHistory); - char *indexURL = nsnull; + const char *indexURL = nsnull; nsIHistoryEntry * Entry; rv = sHistory->GetEntryAtIndex(mHistoryIndex, PR_FALSE, &Entry); @@ -268,12 +271,15 @@ wsGetURLForIndexEvent::handleEvent () if (NS_FAILED(rv)) { return result; } - - rv = URI->GetSpec(&indexURL); + + nsCString urlSpecString; + + rv = URI->GetSpec(urlSpecString); if (NS_FAILED(rv)) { return result; } + indexURL = urlSpecString.get(); result = (void *) indexURL; } return result; diff --git a/mozilla/java/webclient/src_moz/HistoryImpl.cpp b/mozilla/java/webclient/src_moz/HistoryImpl.cpp index 69c8a3ac3e9..f9dc15d97b9 100644 --- a/mozilla/java/webclient/src_moz/HistoryImpl.cpp +++ b/mozilla/java/webclient/src_moz/HistoryImpl.cpp @@ -269,7 +269,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl { JNIEnv * pEnv = env; jobject jobj = obj; - char * charResult = nsnull; + const char * charResult = nsnull; jstring urlString = nsnull; WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr; @@ -284,7 +284,8 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl new wsGetURLForIndexEvent(initContext, historyIndex); PLEvent * event = (PLEvent*) *actionEvent; - charResult = (char *) ::util_PostSynchronousEvent(initContext, event); + charResult = (const char *) ::util_PostSynchronousEvent(initContext, + event); if (charResult != nsnull) { urlString = ::util_NewStringUTF(env, (const char *) charResult); @@ -293,8 +294,6 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl ::util_ThrowExceptionToJava(env, "raptorWebShellGetURL Exception: GetURL() returned nsnull"); return nsnull; } - - nsCRT::free(charResult); } return urlString; diff --git a/mozilla/java/webclient/src_moz/InputStreamShim.cpp b/mozilla/java/webclient/src_moz/InputStreamShim.cpp index 75f9c7a9ad3..1e7c37ea0b8 100644 --- a/mozilla/java/webclient/src_moz/InputStreamShim.cpp +++ b/mozilla/java/webclient/src_moz/InputStreamShim.cpp @@ -88,7 +88,7 @@ NS_IMETHODIMP_(nsrefcnt) InputStreamShim::Release(void) return mRefCnt; } -NS_IMPL_QUERY_INTERFACE(InputStreamShim, NS_GET_IID(nsIInputStream)) +NS_IMPL_QUERY_INTERFACE1(InputStreamShim, nsIInputStream) nsresult InputStreamShim::doReadFromJava() { @@ -223,7 +223,7 @@ InputStreamShim::doRead(void) return NS_ERROR_FAILURE; } // copy the old buffer into the new buffer - nsCRT::memcpy(tBuffer, mBuffer, mBufferLength); + memcpy(tBuffer, mBuffer, mBufferLength); // delete the old buffer delete [] mBuffer; // update mBuffer; @@ -364,13 +364,13 @@ InputStreamShim::Read(char* aBuffer, PRUint32 aCount, PRUint32 *aNumRead) if (mAvailableForMozilla) { if (aCount <= (mCountFromJava - mCountFromMozilla)) { // what she's asking for is less than or equal to what we have - nsCRT::memcpy(aBuffer, (mBuffer + mCountFromMozilla), aCount); + memcpy(aBuffer, (mBuffer + mCountFromMozilla), aCount); mCountFromMozilla += aCount; *aNumRead = aCount; } else { // what she's asking for is more than what we have - nsCRT::memcpy(aBuffer, (mBuffer + mCountFromMozilla), + memcpy(aBuffer, (mBuffer + mCountFromMozilla), (mCountFromJava - mCountFromMozilla)); *aNumRead = (mCountFromJava - mCountFromMozilla); diff --git a/mozilla/java/webclient/src_moz/Makefile.win b/mozilla/java/webclient/src_moz/Makefile.win index 9aa1c9e94b6..375a18a78d2 100644 --- a/mozilla/java/webclient/src_moz/Makefile.win +++ b/mozilla/java/webclient/src_moz/Makefile.win @@ -20,14 +20,38 @@ # Contributor(s): DEPTH=..\..\.. -IGNORE_MANIFEST=1 - -MAKE_OBJ_TYPE = DLL - -MODULE=webclient DIRS=win32 +MODULE=webclient +REQUIRES = xpcom \ + layout \ + shistory \ + appcomps \ + appshell \ + pref \ + locale \ + intl \ + rdf \ + bookmarks \ + content \ + editor \ + string \ + embed_base \ + webBrowser_core \ + webshell \ + windowwatcher \ + profile \ + necko \ + docshell \ + dom \ + widget \ + uriloader \ + webbrowserpersist \ + gfx \ + $(NULL) +LIBRARY_NAME=webclient +MODULE_NAME=nsWebClient OBJS = \ .\$(OBJDIR)\ns_util.obj \ @@ -57,27 +81,13 @@ OBJS = \ .\$(OBJDIR)\PreferencesImpl.obj \ .\$(OBJDIR)\PreferencesActionEvents.obj \ .\$(OBJDIR)\ISupportsPeer.obj \ - .\win32\$(OBJDIR)\Win32BrowserControlCanvas.obj \ + .\win32\$(OBJDIR)\Win32BrowserControlCanvas.obj \ $(NULL) - -LCFLAGS = \ - -DDEBUG_RAPTOR_CANVAS \ +SUB_LIBRARIES= \ + $(DIST)\lib\wc_win32.lib \ $(NULL) -!ifdef BAL_INTERFACE -LCFLAGS = \ - $(LCFLAGS) \ - -DBAL_INTERFACE \ - $(NULL) - -DLLNAME = webclient_bal -!else -DLLNAME = webclient -!endif - -DLL=.\$(OBJDIR)\$(DLLNAME).dll - LLIBS = \ $(DIST)\lib\baseembed_s.lib \ $(DIST)\lib\raptorbasewidget_s.lib \ @@ -97,7 +107,6 @@ WIN_LIBS= \ version.lib \ $(NULL) - !ifdef BAL_INTERFACE LLIBS = $(LLIBS) \ $(DIST)\lib\wc_share_bal.lib \ @@ -108,7 +117,6 @@ LLIBS = $(LLIBS) \ $(NULL) !endif -include <$(DEPTH)\config\rules.mak> !ifdef BAL_INTERFACE INCS = \ @@ -129,13 +137,25 @@ INCS = \ $(INCS) \ $(NULL) -!CMDSWITCHES -S +LCFLAGS = \ + -DDEBUG_RAPTOR_CANVAS \ + $(NULL) + +!ifdef BAL_INTERFACE +LCFLAGS = \ + $(LCFLAGS) \ + -DBAL_INTERFACE \ + $(NULL) +!endif + +include <$(DEPTH)\config\rules.mak> +#!CMDSWITCHES -S # generate the jni header buildRunems: - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib + $(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin + $(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib copy $(DIST)\bin\windbgdlg.exe $(JDKHOME)\bin !ifdef BAL_INTERFACE !else @@ -153,9 +173,12 @@ clobber_all:: clobber clobber:: - rm -f $(DIST)\bin\$(DLLNAME).dll + rm -f $(DIST)\bin\$(DLL).dll !ifdef PACKAGE_BUILD rm -f runem_win_commercial.bat !else rm -f runem.bat !endif + +edburns: + echo $(DLL) $(MAKE_OBJ_TYPE) $(LIBRARY_NAME) $(EXPORT_LIBRARY) diff --git a/mozilla/java/webclient/src_moz/NativeEventThread.cpp b/mozilla/java/webclient/src_moz/NativeEventThread.cpp index 2448c9a3b86..c057c2bad45 100644 --- a/mozilla/java/webclient/src_moz/NativeEventThread.cpp +++ b/mozilla/java/webclient/src_moz/NativeEventThread.cpp @@ -52,7 +52,6 @@ #include "nsCOMPtr.h" // to get nsIBaseWindow from webshell //nsIDocShell is included in ns_util.h #include "nsIEventQueueService.h" // for PLEventQueue -#include "nsRepository.h" #include "nsIServiceManager.h" // for do_GetService #include "nsISHistory.h" // for sHistory #include "nsIThread.h" // for PRThread @@ -413,8 +412,6 @@ int processEventLoop(WebShellInitContext * initContext) } } } - // Do idle stuff - ::NS_DoIdleEmbeddingStuff(); #endif ::PR_Sleep(PR_INTERVAL_NO_WAIT); @@ -495,9 +492,6 @@ void DoMozInitialization(WebShellInitContext * initContext) // If this fails, it just goes to stdout/stderr } - gComponentManager->RegisterComponentLib(kSHistoryCID, nsnull, - nsnull, APPSHELL_DLL, - PR_FALSE, PR_FALSE); // handle the profile manager nonsense nsCOMPtr cmdLine =do_GetService(kCmdLineServiceCID); nsCOMPtr profile = do_GetService(NS_PROFILE_CONTRACTID); diff --git a/mozilla/java/webclient/src_moz/NativeEventThreadActionEvents.cpp b/mozilla/java/webclient/src_moz/NativeEventThreadActionEvents.cpp index 234fcaba79d..5b376adf7dd 100644 --- a/mozilla/java/webclient/src_moz/NativeEventThreadActionEvents.cpp +++ b/mozilla/java/webclient/src_moz/NativeEventThreadActionEvents.cpp @@ -29,6 +29,8 @@ #include "NativeEventThreadActionEvents.h" +#include "nsIInterfaceRequestorUtils.h" + static NS_DEFINE_IID(kWebShellCID, NS_WEB_SHELL_CID); static NS_DEFINE_IID(kIWebShellIID, NS_IWEB_SHELL_IID); @@ -118,21 +120,20 @@ wsRealizeBrowserEvent::handleEvent () // set the docloaderobserver PENDING(edburns): how to we make our // presence as a nsIWebProgressListener know?n - + + printf("Creation Done.....\n"); + // Get the WebNavigation Object from the DocShell + nsCOMPtr webNav(do_QueryInterface(mInitContext->docShell)); + mInitContext->webNavigation = webNav; + if (nsnull == gHistory) { - rv = gComponentManager->CreateInstance(kSHistoryCID, nsnull, - kISHistoryIID, - (void**)&gHistory); + rv = webNav->GetSessionHistory((nsISHistory **)&gHistory); if (NS_FAILED(rv)) { mInitContext->initFailCode = kHistoryWebShellError; return (void *) rv; } } - printf("Creation Done.....\n"); - // Get the WebNavigation Object from the DocShell - nsCOMPtr webNav(do_QueryInterface(mInitContext->docShell)); - mInitContext->webNavigation = webNav; // Set the History // mInitContext->webNavigation->SetSessionHistory(gHistory); diff --git a/mozilla/java/webclient/src_moz/NavigationActionEvents.cpp b/mozilla/java/webclient/src_moz/NavigationActionEvents.cpp index 37d9b4c29af..5dc35994183 100644 --- a/mozilla/java/webclient/src_moz/NavigationActionEvents.cpp +++ b/mozilla/java/webclient/src_moz/NavigationActionEvents.cpp @@ -67,7 +67,9 @@ wsLoadURLEvent::handleEvent () printf ("+++++++++++++++++++++ Thread Id ---- %p\n\n", threadId); if (mWebNavigation && mURL) { - nsresult rv = mWebNavigation->LoadURI(mURL->get(), nsIWebNavigation::LOAD_FLAGS_NONE); + nsresult rv = mWebNavigation->LoadURI(mURL->get(), + nsIWebNavigation::LOAD_FLAGS_NONE, + nsnull, nsnull, nsnull); } return nsnull; } // handleEvent() diff --git a/mozilla/java/webclient/src_moz/NavigationImpl.cpp b/mozilla/java/webclient/src_moz/NavigationImpl.cpp index 46e82951b42..8ec37779d03 100644 --- a/mozilla/java/webclient/src_moz/NavigationImpl.cpp +++ b/mozilla/java/webclient/src_moz/NavigationImpl.cpp @@ -205,8 +205,8 @@ JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_NavigationImpl if (postHeadersChars && postDataChars) { headersAndData = new char[postHeadersLength + postDataLength + 1]; if (headersAndData) { - nsCRT::memcpy(headersAndData, postHeadersChars, postHeadersLength); - nsCRT::memcpy((headersAndData + postHeadersLength), + memcpy(headersAndData, postHeadersChars, postHeadersLength); + memcpy((headersAndData + postHeadersLength), postDataChars, postDataLength); headersAndData[postHeadersLength + postDataLength] = '\0'; // free the existing postHeadersChars and postDataChars diff --git a/mozilla/java/webclient/src_moz/PreferencesActionEvents.cpp b/mozilla/java/webclient/src_moz/PreferencesActionEvents.cpp index 2f1bb54df13..fe45bc1fec5 100644 --- a/mozilla/java/webclient/src_moz/PreferencesActionEvents.cpp +++ b/mozilla/java/webclient/src_moz/PreferencesActionEvents.cpp @@ -61,7 +61,7 @@ void prefEnumerator(const char *name, void *closure) nsAutoString prefValueAuto; const PRInt32 bufLen = 20; char buf[bufLen]; - nsCRT::memset(buf, 0, bufLen); + memset(buf, 0, bufLen); nsCOMPtr prefs(do_GetService(kPrefServiceCID)); if (nsnull == props || !prefs) { diff --git a/mozilla/java/webclient/src_moz/PromptActionEvents.cpp b/mozilla/java/webclient/src_moz/PromptActionEvents.cpp index 484179d9417..ecd963a6125 100644 --- a/mozilla/java/webclient/src_moz/PromptActionEvents.cpp +++ b/mozilla/java/webclient/src_moz/PromptActionEvents.cpp @@ -27,6 +27,7 @@ #include "PromptActionEvents.h" #include "ns_util.h" +#include "nsReadableUtils.h" #include "nsString2.h" // for nsAutoString wsPromptUsernameAndPasswordEvent::wsPromptUsernameAndPasswordEvent(WebShellInitContext *yourInitContext, @@ -83,7 +84,7 @@ void *wsPromptUsernameAndPasswordEvent::handleEvent() if (user) { userJchar = ::util_GetStringChars(env, user); autoUser = (PRUnichar *) userJchar; - *mOutUser = autoUser.ToNewUnicode(); + *mOutUser = ToNewUnicode(autoUser); ::util_ReleaseStringChars(env, user, userJchar); } @@ -93,7 +94,7 @@ void *wsPromptUsernameAndPasswordEvent::handleEvent() if (password) { passwordJchar = ::util_GetStringChars(env, password); autoPassword = (PRUnichar *) passwordJchar; - *mOutPwd = autoPassword.ToNewUnicode(); + *mOutPwd = ToNewUnicode(autoPassword); ::util_ReleaseStringChars(env, password, passwordJchar); } @@ -177,7 +178,7 @@ void *wsPromptUniversalDialogEvent::handleEvent() &(mInitContext->shareContext)); edit1Jchar = ::util_GetStringChars(env, edit1); autoEdit1 = (PRUnichar *) edit1Jchar; - *mFieldOne = autoEdit1.ToNewUnicode(); + *mFieldOne = ToNewUnicode(autoEdit1); ::util_ReleaseStringChars(env, edit1, edit1Jchar); } @@ -189,7 +190,7 @@ void *wsPromptUniversalDialogEvent::handleEvent() &(mInitContext->shareContext)); edit2Jchar = ::util_GetStringChars(env, edit2); autoEdit2 = (PRUnichar *) edit2Jchar; - *mFieldTwo = autoEdit2.ToNewUnicode(); + *mFieldTwo = ToNewUnicode(autoEdit2); ::util_ReleaseStringChars(env, edit2, edit2Jchar); } diff --git a/mozilla/java/webclient/src_moz/RDFActionEvents.cpp b/mozilla/java/webclient/src_moz/RDFActionEvents.cpp index e1598c6707a..b092ba0bf03 100644 --- a/mozilla/java/webclient/src_moz/RDFActionEvents.cpp +++ b/mozilla/java/webclient/src_moz/RDFActionEvents.cpp @@ -46,6 +46,7 @@ #include "wsRDFObserver.h" #include "nsString.h" // for nsCAutoString +#include "nsReadableUtils.h" static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID); static NS_DEFINE_CID(kSupportsArrayCID, NS_SUPPORTSARRAY_CID); @@ -111,7 +112,7 @@ wsNewRDFNodeEvent::handleEvent () JNIEnv *env = (JNIEnv*) JNU_GetEnv(gVm, JNI_VERSION); // PENDING(edburns): does this leak? - PRUnichar *uriUni = uri.ToNewUnicode(); + PRUnichar *uriUni = ToNewUnicode(uri); rv = gRDF->GetUnicodeResource(uriUni, getter_AddRefs(newNode)); nsCRT::free(uriUni); diff --git a/mozilla/java/webclient/src_moz/win32/Makefile.win b/mozilla/java/webclient/src_moz/win32/Makefile.win index 3cc578cbab0..dd997857522 100755 --- a/mozilla/java/webclient/src_moz/win32/Makefile.win +++ b/mozilla/java/webclient/src_moz/win32/Makefile.win @@ -21,34 +21,35 @@ DEPTH=..\..\..\.. MODULE=wc_win32 -include <$(DEPTH)/config/config.mak> - -OBJS = \ - .\$(OBJDIR)\Win32BrowserControlCanvas.obj \ - $(NULL) - -LCFLAGS = \ - -DDEBUG_RAPTOR_CANVAS \ - $(NULL) +REQUIRES = xpcom \ + layout \ + appcomps \ + string \ + embed_base \ + webBrowser_core \ + webshell \ + windowwatcher \ + profile \ + necko \ + docshell \ + dom \ + widget \ + uriloader \ + shistory \ + webbrowserpersist \ + content \ + gfx \ + $(NULL) !ifdef BAL_INTERFACE -LCFLAGS = \ - $(LCFLAGS) \ - -DBAL_INTERFACE \ - $(NULL) - LIBRARY_NAME = wc_win32_bal !else LIBRARY_NAME = wc_win32 !endif -LLIBS = \ - $(NULL) - -WIN_LIBS = \ - version.lib - -include <$(DEPTH)\config\rules.mak> +CPP_OBJS = \ + .\$(OBJDIR)\Win32BrowserControlCanvas.obj \ + $(NULL) INCS=-I.. -I..\..\src_share $(INCS) @@ -66,9 +67,35 @@ INCS = \ $(NULL) !endif +LCFLAGS = \ + -DDEBUG_RAPTOR_CANVAS \ + $(NULL) + +!ifdef BAL_INTERFACE +LCFLAGS = \ + $(LCFLAGS) \ + -DBAL_INTERFACE \ + $(NULL) +!endif + +LLIBS = \ + $(NULL) + +WIN_LIBS = \ + version.lib + +include <$(DEPTH)\config\rules.mak> + !CMDSWITCHES -S +export:: libs + +libs:: $(LIBRARY) + $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib + + +clobber:: + rm -f $(DIST)\lib\$(LIBRARY_NAME).lib + clobber_all:: clobber -edburns: - @echo $(INCS)