Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-01 11:27:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 199518. Merge MSAA marshalling dlls into one dll. r=cls, sr=alecf

Browse Source
This commit is contained in:
aaronl%netscape.com 2003-04-08 05:12:01 +00:00
parent 92fc1f3b0f
commit 6cbbdca6d5
17 changed files with 112 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
accessible/public/msaa/.cvsignore Executable file
View File

@ -0,0 +1,20 @@
Makefile
AccessibleMarshal.dll
AccessibleMarshal.exp
AccessibleMarshal.ilk
AccessibleMarshal.lib
AccessibleMarshal.obj
accessiblemarshal.pdb
done_gen
ISimpleDOMDocument.h
ISimpleDOMDocument_i.c
ISimpleDOMDocument_i.obj
ISimpleDOMDocument_p.c
ISimpleDOMDocument_p.obj
ISimpleDOMNode.h
ISimpleDOMNode_i.c
ISimpleDOMNode_i.obj
ISimpleDOMNode_p.c
ISimpleDOMNode_p.obj
module.rc
module.res

24
accessible/public/msaa/AccessibleMarshal.c Executable file
View File

@ -0,0 +1,24 @@
#include <rpcproxy.h>
#ifdef __cplusplus
extern "C" {
#endif
EXTERN_PROXY_FILE( ISimpleDOMDocument )
EXTERN_PROXY_FILE( ISimpleDOMNode )
PROXYFILE_LIST_START
/* Start of list */
REFERENCE_PROXY_FILE( ISimpleDOMDocument ),
REFERENCE_PROXY_FILE( ISimpleDOMNode ),
/* End of list */
PROXYFILE_LIST_END
DLLDATA_ROUTINES( aProxyFileList, GET_DLL_CLSID )
#ifdef __cplusplus
} /*extern "C" */
#endif

0
accessible/public/msaa/ISimpleDOMDocument/ISimpleDOMDocument.def → accessible/public/msaa/AccessibleMarshal.def
View File

0
accessible/public/msaa/ISimpleDOMDocument/ISimpleDOMDocument.idl → accessible/public/msaa/ISimpleDOMDocument.idl
View File

84
accessible/public/msaa/ISimpleDOMDocument/Makefile.in
View File

@ -1,84 +0,0 @@
#
# 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 mozilla.org code
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 2001 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
#
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = accessibility
LIBRARY_NAME = ISimpleDOMDocumentMarshal
DEFFILE = $(srcdir)/ISimpleDOMDocument.def
DEFINES += -DREGISTER_PROXY_DLL -D_WIN32_WINNT=0x400
CSRCS = \
dlldata.c \
ISimpleDOMDocument_p.c \
ISimpleDOMDocument_i.c \
$(NULL)
OS_LIBS += \
kernel32.lib \
rpcndr.lib \
rpcns4.lib \
rpcrt4.lib \
oleaut32.lib \
$(NULL)
MIDL_GENERATED_FILES = \
ISimpleDOMDocument.h \
ISimpleDOMDocument_p.c \
ISimpleDOMDocument_i.c \
dlldata.c \
$(NULL)
SRCDIR_CSRCS = $(addprefix $(srcdir)/,$(CSRCS))
GARBAGE += $(MIDL_GENERATED_FILES) done_gen $(CSRCS) $(SRCDIR_CSRCS)
FORCE_SHARED_LIB = 1
LOCAL_INCLUDES = -I.
SRCS_IN_OBJDIR = 1
EXPORTS = \
ISimpleDOMDocument.h \
ISimpleDOMDocument_i.c \
$(NULL)
include $(topsrcdir)/config/rules.mk
$(MIDL_GENERATED_FILES): done_gen
done_gen: ISimpleDOMDocument.idl
$(RM) $(SRCDIR_CSRCS)
"$(MIDL)" $(srcdir)/ISimpleDOMDocument.idl
touch $@
export:: done_gen
# This marshall dll is also registered in the installer
register::
regsvr32 /s $(DIST)/bin/$(SHARED_LIBRARY)

0
accessible/public/msaa/ISimpleDOMNode/ISimpleDOMNode.idl → accessible/public/msaa/ISimpleDOMNode.idl
View File

7
accessible/public/msaa/ISimpleDOMNode/ISimpleDOMNode.def
View File

@ -1,7 +0,0 @@
LIBRARY ISimpleDOMNodeMarshal.dll
DESCRIPTION 'ISimpleDOMNode proxy/stub DLL - enables cross-process communication'
EXPORTS DllGetClassObject @1 PRIVATE
DllCanUnloadNow @2 PRIVATE
DllRegisterServer @4 PRIVATE
DllUnregisterServer @5 PRIVATE

84
accessible/public/msaa/ISimpleDOMNode/Makefile.in
View File

@ -1,84 +0,0 @@
#
# 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 mozilla.org code
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 2001 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
#
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = accessibility
LIBRARY_NAME = ISimpleDOMNodeMarshal
DEFFILE = $(srcdir)/ISimpleDOMNode.def
DEFINES += -DREGISTER_PROXY_DLL -D_WIN32_WINNT=0x400
CSRCS = \
dlldata.c \
ISimpleDOMNode_p.c \
ISimpleDOMNode_i.c \
$(NULL)
OS_LIBS += \
kernel32.lib \
rpcndr.lib \
rpcns4.lib \
rpcrt4.lib \
oleaut32.lib \
$(NULL)
MIDL_GENERATED_FILES = \
ISimpleDOMNode.h \
ISimpleDOMNode_p.c \
ISimpleDOMNode_i.c \
dlldata.c \
$(NULL)
SRCDIR_CSRCS = $(addprefix $(srcdir)/,$(CSRCS))
GARBAGE += $(MIDL_GENERATED_FILES) done_gen $(CSRCS) $(SRCDIR_CSRCS)
FORCE_SHARED_LIB = 1
LOCAL_INCLUDES = -I.
SRCS_IN_OBJDIR = 1
EXPORTS = \
ISimpleDOMNode.h \
ISimpleDOMNode_i.c \
$(NULL)
include $(topsrcdir)/config/rules.mk
$(MIDL_GENERATED_FILES): done_gen
done_gen: ISimpleDOMNode.idl
$(RM) $(SRCDIR_CSRCS)
"$(MIDL)" $(srcdir)/ISimpleDOMNode.idl
touch $@
export:: done_gen
# This marshall dll is also registered in the installer
register::
regsvr32 /s $(DIST)/bin/$(SHARED_LIBRARY)

63
accessible/public/msaa/Makefile.in
View File

@ -39,17 +39,72 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
LIBRARY_NAME = AccessibleMarshal
MODULE = accessibility
XPIDL_MODULE= accessibility
GRE_MODULE = 1
XPIDL_MODULE = accessibility-msaa
GRE_MODULE = 1
DEFFILE = $(srcdir)/AccessibleMarshal.def
include $(DEPTH)/config/autoconf.mk
DIRS=ISimpleDOMNode ISimpleDOMDocument
XPIDLSRCS = \
nsIAccessibleWin32Object.idl \
$(NULL)
DEFINES += -DREGISTER_PROXY_DLL -D_WIN32_WINNT=0x400
GARBAGE += $(MIDL_GENERATED_FILES) done_gen dlldata.c
FORCE_SHARED_LIB = 1
SRCS_IN_OBJDIR = 1
CSRCS = \
AccessibleMarshal.c \
ISimpleDOMNode_p.c \
ISimpleDOMNode_i.c \
ISimpleDOMDocument_p.c \
ISimpleDOMDocument_i.c \
$(NULL)
MIDL_GENERATED_FILES = \
ISimpleDOMNode.h \
ISimpleDOMNode_p.c \
ISimpleDOMNode_i.c \
ISimpleDOMDocument.h \
ISimpleDOMDocument_p.c \
ISimpleDOMDocument_i.c \
$(NULL)
SRCDIR_CSRCS = $(addprefix $(srcdir)/,$(CSRCS))
OS_LIBS = \
kernel32.lib \
rpcndr.lib \
rpcns4.lib \
rpcrt4.lib \
oleaut32.lib \
$(NULL)
$(MIDL_GENERATED_FILES): done_gen
done_gen: ISimpleDOMNode.idl ISimpleDOMDocument.idl
"$(MIDL)" $(srcdir)/ISimpleDOMNode.idl
"$(MIDL)" $(srcdir)/ISimpleDOMDocument.idl
touch $@
EXPORTS = \
ISimpleDOMNode.h \
ISimpleDOMNode_i.c \
ISimpleDOMDocument.h \
ISimpleDOMDocument_i.c \
$(NULL)
export:: done_gen
# This marshall dll is also registered in the installer
register::
regsvr32 /s $(DIST)/bin/$(SHARED_LIBRARY)
include $(topsrcdir)/config/rules.mk

2
allmakefiles.sh
View File

@ -926,8 +926,6 @@ fi
accessible/Makefile
accessible/public/Makefile
accessible/public/msaa/Makefile
accessible/public/msaa/ISimpleDOMNode/Makefile
accessible/public/msaa/ISimpleDOMDocument/Makefile
accessible/src/Makefile
accessible/src/base/Makefile
accessible/src/html/Makefile

1
embedding/config/basebrowser-installer-win.pkg
View File

@ -90,6 +90,7 @@ components\imglib2.dll
; see http://www.mozilla.org/projects/ui/accessibility/vendors-win.html
components\accessibility.dll
components\accessibility.xpt
components\accessibility-msaa.xpt
; caps (JavaScript security)
components\caps.dll

1
embedding/config/basebrowser-win
View File

@ -93,6 +93,7 @@ components\imglib2.dll
; see http://www.mozilla.org/projects/ui/accessibility/vendors-win.html
components\accessibility.dll
components\accessibility.xpt
components\accessibility-msaa.xpt
; caps (JavaScript security)
components\caps.dll

5
xpinstall/packager/build/win/mozilla/XPI_JSTs/browser.jst
View File

@ -462,10 +462,7 @@ if(verifyDiskSpace(fProgram, srDest))
// check return value
if( err == SUCCESS )
{
fileToRegister = getFolder(fProgram, "ISimpleDOMNodeMarshal.dll");
err2 = File.windowsRegisterServer(fileToRegister);
logComment("windowsRegisterServer() returned: " + err2);
fileToRegister = getFolder(fProgram, "ISimpleDOMDocumentMarshal.dll");
fileToRegister = getFolder(fProgram, "AccessibleMarshal.dll");
err2 = File.windowsRegisterServer(fileToRegister);
logComment("windowsRegisterServer() returned: " + err2);
updateWinReg(); // Finish registering above marshalling dll's

4
xpinstall/packager/packages-os2
View File

@ -75,7 +75,6 @@ bin/mozturbo.exe
bin/regxpcom.exe
bin/xpicleanup.exe
bin/res/cmessage.txt
;bin/components/accessibility.dll
bin/components/access.dll
bin/components/accessibility.xpt
;bin/components/AcctIdl.dll
@ -263,8 +262,7 @@ bin/components/progressDlg.xpt
bin/components/nsDownloadProgressListener.js
;bin/components/transformiix.dll
bin/components/t8iix.dll
;bin/ISimpleDOMNodeMarshal.dll
;bin/ISimpleDOMDocumentMarshal.dll
;bin/AccessibleMarshal.dll
;bin/components/nsSetDefaultBrowser.js
bin/components/typeaheadfind.xpt
bin/components/typahead.dll

1
xpinstall/packager/packages-static-win
View File

@ -76,6 +76,7 @@ bin\nsldappr32v50.dll
bin\components\mozldap.xpt
bin\components\accessibility.xpt
bin\components\accessibility-msaa.xpt
bin\components\AcctIdl.xpt
bin\components\appshell.xpt
bin\components\autocomplete.xpt

3
xpinstall/packager/packages-win
View File

@ -149,8 +149,7 @@ bin\components\nsKillAll.js
bin\components\progressDlg.xpt
bin\components\transformiix.dll
bin\components\dom_xpath.xpt
bin\ISimpleDOMNodeMarshal.dll
bin\ISimpleDOMDocumentMarshal.dll
bin\AccessibleMarshal.dll
bin\components\nsSetDefaultBrowser.js
bin\components\typeaheadfind.xpt
bin\components\typeaheadfind.dll

7
xpinstall/packager/windows/browser.jst
View File

@ -383,6 +383,8 @@ function upgradeCleanup()
deleteThisFile("Program", "gkwidget.dll");
deleteThisFile("Program", "jpeg3250.dll");
deleteThisFile("Program", "mozreg.dll");
deleteThisFile("Program", "ISimpleDOMNode.dll");
deleteThisFile("Program", "ISimpleDOMDocument.dll");
deleteThisFile("Program", "defaults/pref/config.js");
deleteThisFile("Program", "defaults/pref/initpref.js");
deleteThisFile("Program", "defaults/pref/psm-glue.js");
@ -624,10 +626,7 @@ if(verifyDiskSpace(fProgram, srDest))
// check return value
if( err == SUCCESS )
{
fileToRegister = getFolder(fProgram, "ISimpleDOMNodeMarshal.dll");
err2 = File.windowsRegisterServer(fileToRegister);
logComment("windowsRegisterServer() returned: " + err2);
fileToRegister = getFolder(fProgram, "ISimpleDOMDocumentMarshal.dll");
fileToRegister = getFolder(fProgram, "AccessibleMarshal.dll");
err2 = File.windowsRegisterServer(fileToRegister);
logComment("windowsRegisterServer() returned: " + err2);
updateWinReg(); // Finish registering above marshalling dll's