wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout Bug 709657 because it doesn't help our problem.

Browse Source
This commit is contained in:
Kyle Huey 2011-12-14 08:01:49 -05:00
parent 2aa4544938
commit 9468451f00
27 changed files with 1032 additions and 1326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/installer/package-manifest.in
View File

@ -51,9 +51,6 @@
#else
@BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
#endif
#ifdef XP_WIN
@BINPATH@/components/@DLL_PREFIX@uconvd@DLL_SUFFIX@
#endif
#ifdef XP_MACOSX
@BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
@BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@

96
intl/uconv/datamodule/Makefile.in
View File

@ -1,96 +0,0 @@
# vim:set noet ts=8:
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# 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 the Initial Developer are Copyright (C) 1998
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either of the GNU General Public License Version 2 or later (the "GPL"),
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = uconvd
LIBRARY_NAME = uconvd
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = UConvData
ifeq (WINNT,$(OS_TARGET))
FORCE_SHARED_LIB = 1
else
LIBXUL_LIBRARY = 1
endif
# To avoid conflict with OS/2 system uconv.dll
SHORT_LIBNAME = mzuconvd
CPPSRCS = \
nsUConvDataModule.cpp \
$(NULL)
LOCAL_INCLUDES = -I$(srcdir)/../util \
-I$(srcdir)/../ucvlatin \
-I$(srcdir)/../ucvibm \
-I$(srcdir)/../ucvja \
-I$(srcdir)/../ucvtw2 \
-I$(srcdir)/../ucvtw \
-I$(srcdir)/../ucvko \
-I$(srcdir)/../ucvcn \
$(NULL)
EXTRA_DSO_LDOPTS += \
$(XPCOM_GLUE_LDOPTS) \
$(XPCOM_LIBS) \
$(MOZ_JS_LIBS) \
$(NSPR_LIBS) \
$(MOZALLOC_LIB) \
$(NULL)
SHARED_LIBRARY_LIBS += \
../ucvlatin/$(LIB_PREFIX)ucvlatin_s.$(LIB_SUFFIX) \
../ucvibm/$(LIB_PREFIX)ucvibm_s.$(LIB_SUFFIX) \
../ucvja/$(LIB_PREFIX)ucvja_s.$(LIB_SUFFIX) \
../ucvtw2/$(LIB_PREFIX)ucvtw2_s.$(LIB_SUFFIX) \
../ucvtw/$(LIB_PREFIX)ucvtw_s.$(LIB_SUFFIX) \
../ucvko/$(LIB_PREFIX)ucvko_s.$(LIB_SUFFIX) \
../ucvcn/$(LIB_PREFIX)ucvcn_s.$(LIB_SUFFIX) \
$(NULL)
ifdef FORCE_SHARED_LIB
SHARED_LIBRARY_LIBS += \
../util/external/$(LIB_PREFIX)ucvxutil_s.$(LIB_SUFFIX) \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk

1089
intl/uconv/datamodule/nsUConvDataModule.cpp
View File

File diff suppressed because it is too large Load Diff

20
intl/uconv/src/Makefile.in
View File

@ -76,7 +76,25 @@ ifneq (,$(INTEL_ARCHITECTURE))
CPPSRCS += nsUTF8ToUnicodeSSE2.cpp
endif
LOCAL_INCLUDES = -I$(srcdir)/../util
LOCAL_INCLUDES = -I$(srcdir)/../util \
-I$(srcdir)/../ucvlatin \
-I$(srcdir)/../ucvibm \
-I$(srcdir)/../ucvja \
-I$(srcdir)/../ucvtw2 \
-I$(srcdir)/../ucvtw \
-I$(srcdir)/../ucvko \
-I$(srcdir)/../ucvcn \
$(NULL)
SHARED_LIBRARY_LIBS += \
../ucvlatin/$(LIB_PREFIX)ucvlatin_s.$(LIB_SUFFIX) \
../ucvibm/$(LIB_PREFIX)ucvibm_s.$(LIB_SUFFIX) \
../ucvja/$(LIB_PREFIX)ucvja_s.$(LIB_SUFFIX) \
../ucvtw2/$(LIB_PREFIX)ucvtw2_s.$(LIB_SUFFIX) \
../ucvtw/$(LIB_PREFIX)ucvtw_s.$(LIB_SUFFIX) \
../ucvko/$(LIB_PREFIX)ucvko_s.$(LIB_SUFFIX) \
../ucvcn/$(LIB_PREFIX)ucvcn_s.$(LIB_SUFFIX) \
$(NULL)
include $(topsrcdir)/config/rules.mk

990
intl/uconv/src/nsUConvModule.cpp
View File

File diff suppressed because it is too large Load Diff

3
intl/uconv/ucvcn/Makefile.in
View File

@ -45,9 +45,8 @@ include $(DEPTH)/config/autoconf.mk
MODULE = ucvcn
LIBRARY_NAME = ucvcn_s
FORCE_STATIC_LIB=1
ifneq (WINNT,$(OS_TARGET))
LIBXUL_LIBRARY = 1
endif
CPPSRCS = \
nsGB2312ToUnicodeV2.cpp \

1
intl/uconv/ucvcn/nsISO2022CNToUnicode.cpp
View File

@ -39,7 +39,6 @@
#include "nsUCSupport.h"
#include "nsICharsetConverterManager.h"
#include "nsIServiceManager.h"
#include "nsServiceManagerUtils.h"
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);

2
intl/uconv/ucvibm/Makefile.in
View File

@ -46,9 +46,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = ucvibm
LIBRARY_NAME = ucvibm_s
FORCE_STATIC_LIB = 1
ifneq (WINNT,$(OS_TARGET))
LIBXUL_LIBRARY = 1
endif
CPPSRCS = \

3
intl/uconv/ucvja/Makefile.in
View File

@ -46,9 +46,8 @@ include $(DEPTH)/config/autoconf.mk
MODULE = ucvja
LIBRARY_NAME = ucvja_s
FORCE_STATIC_LIB = 1
ifneq (WINNT,$(OS_TARGET))
LIBXUL_LIBRARY = 1
endif
CPPSRCS = \
nsJapaneseToUnicode.cpp \

1
intl/uconv/ucvja/nsJapaneseToUnicode.cpp
View File

@ -42,7 +42,6 @@
#include "nsICharsetConverterManager.h"
#include "nsIServiceManager.h"
#include "nsServiceManagerUtils.h"
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
#ifdef XP_OS2

3
intl/uconv/ucvko/Makefile.in
View File

@ -45,9 +45,8 @@ include $(DEPTH)/config/autoconf.mk
MODULE = ucvko
LIBRARY_NAME = ucvko_s
FORCE_STATIC_LIB=1
ifneq (WINNT,$(OS_TARGET))
LIBXUL_LIBRARY = 1
endif
CPPSRCS = \
nsEUCKRToUnicode.cpp \

1
intl/uconv/ucvko/nsISO2022KRToUnicode.cpp
View File

@ -39,7 +39,6 @@
#include "nsUCSupport.h"
#include "nsICharsetConverterManager.h"
#include "nsIServiceManager.h"
#include "nsServiceManagerUtils.h"
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);

3
intl/uconv/ucvlatin/Makefile.in
View File

@ -45,9 +45,8 @@ include $(DEPTH)/config/autoconf.mk
MODULE = ucvlatin
LIBRARY_NAME = ucvlatin_s
FORCE_STATIC_LIB = 1
ifneq (WINNT,$(OS_TARGET))
LIBXUL_LIBRARY = 1
endif
CPPSRCS = \
nsAsciiToUnicode.cpp \

3
intl/uconv/ucvtw/Makefile.in
View File

@ -45,9 +45,8 @@ include $(DEPTH)/config/autoconf.mk
MODULE = ucvtw
LIBRARY_NAME = ucvtw_s
FORCE_STATIC_LIB=1
ifneq (WINNT,$(OS_TARGET))
LIBXUL_LIBRARY = 1
endif
CPPSRCS = \
nsBIG5ToUnicode.cpp \

3
intl/uconv/ucvtw2/Makefile.in
View File

@ -45,9 +45,8 @@ include $(DEPTH)/config/autoconf.mk
MODULE = ucvtw2
LIBRARY_NAME = ucvtw2_s
FORCE_STATIC_LIB=1
ifneq (WINNT,$(OS_TARGET))
LIBXUL_LIBRARY = 1
endif
CPPSRCS = \
nsEUCTWToUnicode.cpp \

15
intl/uconv/util/Makefile.in
View File

@ -42,8 +42,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = external
MODULE = uconv
LIBRARY_NAME = ucvutil_s
EXPORT_LIBRARY = 1
@ -52,7 +50,18 @@ LIBXUL_LIBRARY = 1
MODULE_NAME = nsUCUtil
include $(srcdir)/objs.mk
CSRCS = \
ugen.c \
uscan.c \
umap.c \
$(NULL)
CPPSRCS = \
nsUCSupport.cpp \
nsUCConstructors.cpp \
nsUnicodeDecodeHelper.cpp \
nsUnicodeEncodeHelper.cpp \
$(NULL)
include $(topsrcdir)/config/rules.mk

57
intl/uconv/util/external/Makefile.in vendored
View File

@ -1,57 +0,0 @@
#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# 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 the Initial Developer are Copyright (C) 1998
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either of the GNU General Public License Version 2 or later (the "GPL"),
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = uconv
LIBRARY_NAME = ucvxutil_s
EXPORT_LIBRARY = 1
FORCE_STATIC_LIB = 1
MODULE_NAME = nsExternalUCUtil
VPATH += $(srcdir)/..
include $(srcdir)/../objs.mk
include $(topsrcdir)/config/rules.mk

12
intl/uconv/util/objs.mk
View File

@ -1,12 +0,0 @@
CSRCS = \
ugen.c \
uscan.c \
umap.c \
$(NULL)
CPPSRCS = \
nsUCSupport.cpp \
nsUCConstructors.cpp \
nsUnicodeDecodeHelper.cpp \
nsUnicodeEncodeHelper.cpp \
$(NULL)

1
testing/xpcshell/runxpcshelltests.py
View File

@ -312,7 +312,6 @@ class XPCShellTests(object):
On a remote system, this is more complex and we need to overload this function.
"""
cmd = wrapCommand(cmd)
print cmd
proc = Popen(cmd, stdout=stdout, stderr=stderr,
env=env, cwd=cwd)
return proc

6
toolkit/library/Makefile.in
View File

@ -200,12 +200,6 @@ COMPONENT_LIBS += \
windowds \
$(NULL)
ifneq (WINNT,$(OS_ARCH))
COMPONENT_LIBS += \
uconvd \
$(NULL)
endif
ifdef BUILD_CTYPES
COMPONENT_LIBS += \
jsctypes \

7
toolkit/library/nsStaticXULComponents.cpp
View File

@ -205,15 +205,8 @@
#endif
#endif
#ifdef XP_WIN
#define UCONV_DATA_MODULE
#else
#define UCONV_DATA_MODULE MODULE(nsUConvDataModule)
#endif
#define XUL_MODULES \
MODULE(nsUConvModule) \
UCONV_DATA_MODULE \
MODULE(nsI18nModule) \
MODULE(nsChardetModule) \
UNIVERSALCHARDET_MODULE \

8
toolkit/toolkit-tiers.mk
View File

@ -237,18 +237,10 @@ ifdef APP_LIBXUL_DIRS
tier_platform_dirs += $(APP_LIBXUL_DIRS)
endif
ifneq (WINNT,$(OS_ARCH))
tier_platform_dirs += intl/uconv/datamodule
endif
tier_platform_dirs += toolkit/library
tier_platform_dirs += xpcom/stub
ifeq (WINNT,$(OS_ARCH))
tier_platform_dirs += intl/uconv/datamodule
endif
ifdef NS_TRACE_MALLOC
tier_platform_dirs += tools/trace-malloc
endif

4
xpcom/build/nsXPCOM.h
View File

@ -67,7 +67,6 @@
# define NS_CycleCollectorForget NS_CycleCollectorForget_P
# define NS_CycleCollectorSuspect2 NS_CycleCollectorSuspect2_P
# define NS_CycleCollectorForget2 NS_CycleCollectorForget2_P
# define NS_IsCycleCollectorThread NS_IsCycleCollectorThread_P
#endif
#include "nscore.h"
@ -405,9 +404,6 @@ NS_CycleCollectorSuspect2(nsISupports *n);
XPCOM_API(bool)
NS_CycleCollectorForget2(nsPurpleBufferEntry *e);
XPCOM_API(bool)
NS_IsCycleCollectorThread();
#endif
/**

3
xpcom/glue/BlockingResourceBase.h
View File

@ -345,7 +345,6 @@ private:
return PR_SUCCESS;
}
public:
/**
* Shutdown
* Free static members.
@ -357,8 +356,6 @@ public:
sDeadlockDetector = 0;
}
private:
# ifdef MOZILLA_INTERNAL_API
// so it can call BlockingResourceBase::Shutdown()
friend void LogTerm();

4
xpcom/glue/DeadlockDetector.h
View File

@ -225,11 +225,9 @@ private:
mFirstSeen(CallStack::kNone),
mOrderedLT() // FIXME bug 456272: set to empirical
{ // dep size?
MOZ_COUNT_CTOR(OrderingEntry);
}
~OrderingEntry()
{
MOZ_COUNT_DTOR(OrderingEntry);
}
CallStack mFirstSeen; // first site from which the resource appeared
@ -369,7 +367,6 @@ public:
mLock = PR_NewLock();
if (!mLock)
NS_RUNTIMEABORT("couldn't allocate deadlock detector lock");
MOZ_COUNT_CTOR(DeadlockDetector);
}
/**
@ -381,7 +378,6 @@ public:
{
PL_HashTableDestroy(mOrdering);
PR_DestroyLock(mLock);
MOZ_COUNT_DTOR(DeadlockDetector);
}
/**

9
xpcom/glue/nsCycleCollectorUtils.h
View File

@ -40,9 +40,10 @@
#include "nscore.h"
#include "mozilla/threads/nsThreadIDs.h"
#if defined(MOZILLA_INTERNAL_API) && !defined(XPCOM_MAKING_STUB)
#if defined(MOZILLA_INTERNAL_API)
#define NS_IsCycleCollectorThread NS_IsCycleCollectorThread_P
#if defined(XP_WIN)
XPCOM_API(bool) NS_IsCycleCollectorThread();
bool NS_IsCycleCollectorThread();
#elif defined(NS_TLS)
// Defined in nsThreadManager.cpp.
extern NS_TLS mozilla::threads::ID gTLSThreadID;
@ -51,10 +52,10 @@ inline bool NS_IsCycleCollectorThread()
return gTLSThreadID == mozilla::threads::CycleCollector;
}
#else
XPCOM_API(bool) NS_IsCycleCollectorThread();
NS_COM_GLUE bool NS_IsCycleCollectorThread();
#endif
#else
XPCOM_API(bool) NS_IsCycleCollectorThread();
NS_COM_GLUE bool NS_IsCycleCollectorThread();
#endif
#endif /* nsCycleCollectorUtils_h__ */

11
xpcom/stub/nsXPComStub.cpp
View File

@ -35,8 +35,6 @@
*
* ***** END LICENSE BLOCK ***** */
#define XPCOM_MAKING_STUB
#include "nsXPCOM.h"
#include "nsXPCOMPrivate.h"
#include "nsXPCOMStrings.h"
@ -561,12 +559,3 @@ NS_CycleCollectorForget2(nsPurpleBufferEntry* e)
{
return NS_CycleCollectorForget2_P(e);
}
#ifdef XP_WIN
#undef NS_IsCycleCollectorThread
EXPORT_XPCOM_API(bool)
NS_IsCycleCollectorThread()
{
return NS_IsCycleCollectorThread_P();
}
#endif