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

Bug 556644 - 6. Don't do slash fixup for omnijar, r=bsmedberg a=blocking2.0

Browse Source
This commit is contained in:
Michael Wu 2010-08-11 18:11:18 -07:00
parent f90f4f45dd
commit c7b15f876d
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
xpcom/components/nsComponentManager.cpp
View File

@ -530,6 +530,10 @@ nsComponentManagerImpl::RegisterOmnijar(const char* aPath, bool aChromeOnly)
return;
nsCOMPtr<nsIInputStream> is = mManifestLoader->LoadEntry(aPath);
if (!is) {
LogMessage("Could not find omnijar manifest entry '%s'.", aPath);
return;
}
PRUint32 flen;
is->Available(&flen);
@ -652,10 +656,6 @@ nsComponentManagerImpl::ManifestManifest(ManifestProcessingContext& cx, int line
{
char* file = argv[0];
#ifdef TRANSLATE_SLASHES
TranslateSlashes(file);
#endif
#ifdef MOZ_OMNIJAR
if (cx.mPath) {
nsCAutoString manifest(cx.mPath);
@ -666,6 +666,9 @@ nsComponentManagerImpl::ManifestManifest(ManifestProcessingContext& cx, int line
else
#endif
{
#ifdef TRANSLATE_SLASHES
TranslateSlashes(file);
#endif
nsCOMPtr<nsIFile> cfile;
cx.mFile->GetParent(getter_AddRefs(cfile));
nsCOMPtr<nsILocalFile> clfile = do_QueryInterface(cfile);
@ -720,10 +723,6 @@ nsComponentManagerImpl::ManifestXPT(ManifestProcessingContext& cx, int lineno, c
{
char* file = argv[0];
#ifdef TRANSLATE_SLASHES
TranslateSlashes(file);
#endif
#ifdef MOZ_OMNIJAR
if (cx.mPath) {
nsCAutoString manifest(cx.mPath);
@ -742,6 +741,9 @@ nsComponentManagerImpl::ManifestXPT(ManifestProcessingContext& cx, int lineno, c
else
#endif
{
#ifdef TRANSLATE_SLASHES
TranslateSlashes(file);
#endif
nsCOMPtr<nsIFile> cfile;
cx.mFile->GetParent(getter_AddRefs(cfile));
nsCOMPtr<nsILocalFile> clfile = do_QueryInterface(cfile);
@ -763,10 +765,6 @@ nsComponentManagerImpl::ManifestComponent(ManifestProcessingContext& cx, int lin
char* id = argv[0];
char* file = argv[1];
#ifdef TRANSLATE_SLASHES
TranslateSlashes(file);
#endif
nsID cid;
if (!cid.Parse(id)) {
LogMessageWithContext(cx.mFile, cx.mPath, lineno,
@ -809,6 +807,9 @@ nsComponentManagerImpl::ManifestComponent(ManifestProcessingContext& cx, int lin
else
#endif
{
#ifdef TRANSLATE_SLASHES
TranslateSlashes(file);
#endif
nsCOMPtr<nsIFile> cfile;
cx.mFile->GetParent(getter_AddRefs(cfile));
nsCOMPtr<nsILocalFile> clfile = do_QueryInterface(cfile);