tor-commits August 2014

tor-commits@lists.torproject.org

21 participants
1599 discussions

[tor-browser/esr24] Automated checkin: version bump for firefox 24.7.0esr release. DONTBUILD CLOSED TREE a=release
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 5a45b0d0ddb1c96ca2ec0ce16f7d616d390aec3f Author: ffxbld <none@none> Date: Mon Jul 14 18:28:02 2014 -0400 Automated checkin: version bump for firefox 24.7.0esr release. DONTBUILD CLOSED TREE a=release --- browser/config/version.txt | 2 +- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/config/version.txt b/browser/config/version.txt index 60f1860..98b82b8 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -24.6.0esrpre +24.7.0esrpre diff --git a/config/milestone.txt b/config/milestone.txt index 71e3ef9..c293ee8 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.6.0 +24.7.0esrpre diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index 71e3ef9..c293ee8 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.6.0 +24.7.0esrpre

1 0

[tor-browser/esr24] Bug 701479 - Remove usage of EnumPrintersW to test if port is FILE:. nsDeviceContextSpecWin shouldn't start UI for asking for a filename nor query all possible printers. r=jimm, a=lsblakk
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 5c995e3f678a3e5a5cf5ec29abf0e811cc1a6707 Author: Oskar Eisemuth <dev_oskar(a)hotmail.com> Date: Tue Jan 28 16:31:20 2014 +0100 Bug 701479 - Remove usage of EnumPrintersW to test if port is FILE:. nsDeviceContextSpecWin shouldn't start UI for asking for a filename nor query all possible printers. r=jimm, a=lsblakk --- widget/windows/nsDeviceContextSpecWin.cpp | 196 ----------------------------- 1 file changed, 196 deletions(-) diff --git a/widget/windows/nsDeviceContextSpecWin.cpp b/widget/windows/nsDeviceContextSpecWin.cpp index 134d74f..1da105f 100644 --- a/widget/windows/nsDeviceContextSpecWin.cpp +++ b/widget/windows/nsDeviceContextSpecWin.cpp @@ -181,189 +181,6 @@ static PRUnichar * GetDefaultPrinterNameFromGlobalPrinters() return ToNewUnicode(printerName); } -//---------------------------------------------------------------- -static nsresult -EnumerateNativePrinters(DWORD aWhichPrinters, LPWSTR aPrinterName, bool& aIsFound, bool& aIsFile) -{ - DWORD dwSizeNeeded = 0; - DWORD dwNumItems = 0; - LPPRINTER_INFO_2W lpInfo = NULL; - - // Get buffer size - if (::EnumPrintersW(aWhichPrinters, NULL, 2, NULL, 0, &dwSizeNeeded, - &dwNumItems)) { - return NS_ERROR_FAILURE; - } - - // allocate memory - lpInfo = (LPPRINTER_INFO_2W) malloc(dwSizeNeeded); - if (!lpInfo) { - return NS_ERROR_OUT_OF_MEMORY; - } - - if (::EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 2, (LPBYTE)lpInfo, - dwSizeNeeded, &dwSizeNeeded, &dwNumItems) == 0) { - free(lpInfo); - return NS_OK; - } - - for (DWORD i = 0; i < dwNumItems; i++ ) { - if (wcscmp(lpInfo[i].pPrinterName, aPrinterName) == 0) { - aIsFound = true; - aIsFile = wcscmp(lpInfo[i].pPortName, L"FILE:") == 0; - break; - } - } - - free(lpInfo); - return NS_OK; -} - -//---------------------------------------------------------------- -static void -CheckForPrintToFileWithName(LPWSTR aPrinterName, bool& aIsFile) -{ - bool isFound = false; - aIsFile = false; - nsresult rv = EnumerateNativePrinters(PRINTER_ENUM_LOCAL, aPrinterName, isFound, aIsFile); - if (isFound) return; - - rv = EnumerateNativePrinters(PRINTER_ENUM_NETWORK, aPrinterName, isFound, aIsFile); - if (isFound) return; - - rv = EnumerateNativePrinters(PRINTER_ENUM_SHARED, aPrinterName, isFound, aIsFile); - if (isFound) return; - - rv = EnumerateNativePrinters(PRINTER_ENUM_REMOTE, aPrinterName, isFound, aIsFile); - if (isFound) return; -} - -static nsresult -GetFileNameForPrintSettings(nsIPrintSettings* aPS) -{ - // for testing -#ifdef DEBUG_rods - return NS_OK; -#endif - - nsresult rv; - - nsCOMPtr<nsIFilePicker> filePicker = do_CreateInstance("@mozilla.org/filepicker;1", &rv); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr<nsIStringBundleService> bundleService = - mozilla::services::GetStringBundleService(); - if (!bundleService) - return NS_ERROR_FAILURE; - nsCOMPtr<nsIStringBundle> bundle; - rv = bundleService->CreateBundle(NS_ERROR_GFX_PRINTER_BUNDLE_URL, getter_AddRefs(bundle)); - NS_ENSURE_SUCCESS(rv, rv); - - nsXPIDLString title; - rv = bundle->GetStringFromName(NS_LITERAL_STRING("PrintToFile").get(), getter_Copies(title)); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr<nsIWindowWatcher> wwatch = - (do_GetService(NS_WINDOWWATCHER_CONTRACTID, &rv)); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr<nsIDOMWindow> window; - wwatch->GetActiveWindow(getter_AddRefs(window)); - - rv = filePicker->Init(window, title, nsIFilePicker::modeSave); - NS_ENSURE_SUCCESS(rv, rv); - - rv = filePicker->AppendFilters(nsIFilePicker::filterAll); - NS_ENSURE_SUCCESS(rv, rv); - - PRUnichar* fileName; - aPS->GetToFileName(&fileName); - - if (fileName) { - if (*fileName) { - nsAutoString leafName; - nsCOMPtr<nsIFile> file(do_CreateInstance("@mozilla.org/file/local;1")); - if (file) { - rv = file->InitWithPath(nsDependentString(fileName)); - if (NS_SUCCEEDED(rv)) { - file->GetLeafName(leafName); - filePicker->SetDisplayDirectory(file); - } - } - if (!leafName.IsEmpty()) { - rv = filePicker->SetDefaultString(leafName); - } - NS_ENSURE_SUCCESS(rv, rv); - } - nsMemory::Free(fileName); - } - - int16_t dialogResult; - filePicker->Show(&dialogResult); - - if (dialogResult == nsIFilePicker::returnCancel) { - return NS_ERROR_ABORT; - } - - nsCOMPtr<nsIFile> localFile; - rv = filePicker->GetFile(getter_AddRefs(localFile)); - NS_ENSURE_SUCCESS(rv, rv); - - if (dialogResult == nsIFilePicker::returnReplace) { - // be extra safe and only delete when the file is really a file - bool isFile; - rv = localFile->IsFile(&isFile); - if (NS_SUCCEEDED(rv) && isFile) { - rv = localFile->Remove(false /* recursive delete */); - NS_ENSURE_SUCCESS(rv, rv); - } - } - - nsAutoString unicodePath; - rv = localFile->GetPath(unicodePath); - NS_ENSURE_SUCCESS(rv,rv); - - if (unicodePath.IsEmpty()) { - rv = NS_ERROR_ABORT; - } - - if (NS_SUCCEEDED(rv)) aPS->SetToFileName(unicodePath.get()); - - return rv; -} - -//---------------------------------------------------------------------------------- -static nsresult -CheckForPrintToFile(nsIPrintSettings* aPS, LPWSTR aPrinterName, PRUnichar* aUPrinterName) -{ - nsresult rv = NS_OK; - - if (!aPrinterName && !aUPrinterName) return rv; - - bool toFile; - CheckForPrintToFileWithName(aPrinterName?aPrinterName:aUPrinterName, toFile); - // Since the driver wasn't a "Print To File" Driver, check to see - // if the name of the file has been set to the special "FILE:" - if (!toFile) { - nsXPIDLString toFileName; - aPS->GetToFileName(getter_Copies(toFileName)); - if (toFileName) { - if (*toFileName) { - if (toFileName.EqualsLiteral("FILE:")) { - // this skips the setting of the "print to file" info below - // which we don't want to do. - return NS_OK; - } - } - } - } - aPS->SetPrintToFile(toFile); - if (toFile) { - rv = GetFileNameForPrintSettings(aPS); - } - return rv; -} - //---------------------------------------------------------------------------------- NS_IMETHODIMP nsDeviceContextSpecWin::Init(nsIWidget* aWidget, nsIPrintSettings* aPrintSettings, @@ -398,15 +215,6 @@ NS_IMETHODIMP nsDeviceContextSpecWin::Init(nsIWidget* aWidget, SetDriverName(driverName); SetDevMode(devMode); - if (!aIsPrintPreview) { - rv = CheckForPrintToFile(mPrintSettings, deviceName, nullptr); - if (NS_FAILED(rv)) { - nsCRT::free(deviceName); - nsCRT::free(driverName); - return NS_ERROR_FAILURE; - } - } - // clean up nsCRT::free(deviceName); nsCRT::free(driverName); @@ -437,10 +245,6 @@ NS_IMETHODIMP nsDeviceContextSpecWin::Init(nsIWidget* aWidget, NS_ASSERTION(printerName, "We have to have a printer name"); if (!printerName || !*printerName) return rv; - if (!aIsPrintPreview) { - CheckForPrintToFile(mPrintSettings, nullptr, printerName); - } - return GetDataFromPrinter(printerName, mPrintSettings); }

1 0

[tor-browser/esr24] Backed out changeset 810977d38c0d (bug 701479) for jetpack orange, DONTBUILD because strict backout and RyanVM says so.
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit c523f5c0036542fc1ed36b78e46b99f1f86c8728 Author: Gijs Kruitbosch <gijskruitbosch(a)gmail.com> Date: Tue Jul 15 14:46:52 2014 +0100 Backed out changeset 810977d38c0d (bug 701479) for jetpack orange, DONTBUILD because strict backout and RyanVM says so. --- widget/windows/nsDeviceContextSpecWin.cpp | 196 +++++++++++++++++++++++++++++ 1 file changed, 196 insertions(+) diff --git a/widget/windows/nsDeviceContextSpecWin.cpp b/widget/windows/nsDeviceContextSpecWin.cpp index 1da105f..134d74f 100644 --- a/widget/windows/nsDeviceContextSpecWin.cpp +++ b/widget/windows/nsDeviceContextSpecWin.cpp @@ -181,6 +181,189 @@ static PRUnichar * GetDefaultPrinterNameFromGlobalPrinters() return ToNewUnicode(printerName); } +//---------------------------------------------------------------- +static nsresult +EnumerateNativePrinters(DWORD aWhichPrinters, LPWSTR aPrinterName, bool& aIsFound, bool& aIsFile) +{ + DWORD dwSizeNeeded = 0; + DWORD dwNumItems = 0; + LPPRINTER_INFO_2W lpInfo = NULL; + + // Get buffer size + if (::EnumPrintersW(aWhichPrinters, NULL, 2, NULL, 0, &dwSizeNeeded, + &dwNumItems)) { + return NS_ERROR_FAILURE; + } + + // allocate memory + lpInfo = (LPPRINTER_INFO_2W) malloc(dwSizeNeeded); + if (!lpInfo) { + return NS_ERROR_OUT_OF_MEMORY; + } + + if (::EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 2, (LPBYTE)lpInfo, + dwSizeNeeded, &dwSizeNeeded, &dwNumItems) == 0) { + free(lpInfo); + return NS_OK; + } + + for (DWORD i = 0; i < dwNumItems; i++ ) { + if (wcscmp(lpInfo[i].pPrinterName, aPrinterName) == 0) { + aIsFound = true; + aIsFile = wcscmp(lpInfo[i].pPortName, L"FILE:") == 0; + break; + } + } + + free(lpInfo); + return NS_OK; +} + +//---------------------------------------------------------------- +static void +CheckForPrintToFileWithName(LPWSTR aPrinterName, bool& aIsFile) +{ + bool isFound = false; + aIsFile = false; + nsresult rv = EnumerateNativePrinters(PRINTER_ENUM_LOCAL, aPrinterName, isFound, aIsFile); + if (isFound) return; + + rv = EnumerateNativePrinters(PRINTER_ENUM_NETWORK, aPrinterName, isFound, aIsFile); + if (isFound) return; + + rv = EnumerateNativePrinters(PRINTER_ENUM_SHARED, aPrinterName, isFound, aIsFile); + if (isFound) return; + + rv = EnumerateNativePrinters(PRINTER_ENUM_REMOTE, aPrinterName, isFound, aIsFile); + if (isFound) return; +} + +static nsresult +GetFileNameForPrintSettings(nsIPrintSettings* aPS) +{ + // for testing +#ifdef DEBUG_rods + return NS_OK; +#endif + + nsresult rv; + + nsCOMPtr<nsIFilePicker> filePicker = do_CreateInstance("@mozilla.org/filepicker;1", &rv); + NS_ENSURE_SUCCESS(rv, rv); + + nsCOMPtr<nsIStringBundleService> bundleService = + mozilla::services::GetStringBundleService(); + if (!bundleService) + return NS_ERROR_FAILURE; + nsCOMPtr<nsIStringBundle> bundle; + rv = bundleService->CreateBundle(NS_ERROR_GFX_PRINTER_BUNDLE_URL, getter_AddRefs(bundle)); + NS_ENSURE_SUCCESS(rv, rv); + + nsXPIDLString title; + rv = bundle->GetStringFromName(NS_LITERAL_STRING("PrintToFile").get(), getter_Copies(title)); + NS_ENSURE_SUCCESS(rv, rv); + + nsCOMPtr<nsIWindowWatcher> wwatch = + (do_GetService(NS_WINDOWWATCHER_CONTRACTID, &rv)); + NS_ENSURE_SUCCESS(rv, rv); + + nsCOMPtr<nsIDOMWindow> window; + wwatch->GetActiveWindow(getter_AddRefs(window)); + + rv = filePicker->Init(window, title, nsIFilePicker::modeSave); + NS_ENSURE_SUCCESS(rv, rv); + + rv = filePicker->AppendFilters(nsIFilePicker::filterAll); + NS_ENSURE_SUCCESS(rv, rv); + + PRUnichar* fileName; + aPS->GetToFileName(&fileName); + + if (fileName) { + if (*fileName) { + nsAutoString leafName; + nsCOMPtr<nsIFile> file(do_CreateInstance("@mozilla.org/file/local;1")); + if (file) { + rv = file->InitWithPath(nsDependentString(fileName)); + if (NS_SUCCEEDED(rv)) { + file->GetLeafName(leafName); + filePicker->SetDisplayDirectory(file); + } + } + if (!leafName.IsEmpty()) { + rv = filePicker->SetDefaultString(leafName); + } + NS_ENSURE_SUCCESS(rv, rv); + } + nsMemory::Free(fileName); + } + + int16_t dialogResult; + filePicker->Show(&dialogResult); + + if (dialogResult == nsIFilePicker::returnCancel) { + return NS_ERROR_ABORT; + } + + nsCOMPtr<nsIFile> localFile; + rv = filePicker->GetFile(getter_AddRefs(localFile)); + NS_ENSURE_SUCCESS(rv, rv); + + if (dialogResult == nsIFilePicker::returnReplace) { + // be extra safe and only delete when the file is really a file + bool isFile; + rv = localFile->IsFile(&isFile); + if (NS_SUCCEEDED(rv) && isFile) { + rv = localFile->Remove(false /* recursive delete */); + NS_ENSURE_SUCCESS(rv, rv); + } + } + + nsAutoString unicodePath; + rv = localFile->GetPath(unicodePath); + NS_ENSURE_SUCCESS(rv,rv); + + if (unicodePath.IsEmpty()) { + rv = NS_ERROR_ABORT; + } + + if (NS_SUCCEEDED(rv)) aPS->SetToFileName(unicodePath.get()); + + return rv; +} + +//---------------------------------------------------------------------------------- +static nsresult +CheckForPrintToFile(nsIPrintSettings* aPS, LPWSTR aPrinterName, PRUnichar* aUPrinterName) +{ + nsresult rv = NS_OK; + + if (!aPrinterName && !aUPrinterName) return rv; + + bool toFile; + CheckForPrintToFileWithName(aPrinterName?aPrinterName:aUPrinterName, toFile); + // Since the driver wasn't a "Print To File" Driver, check to see + // if the name of the file has been set to the special "FILE:" + if (!toFile) { + nsXPIDLString toFileName; + aPS->GetToFileName(getter_Copies(toFileName)); + if (toFileName) { + if (*toFileName) { + if (toFileName.EqualsLiteral("FILE:")) { + // this skips the setting of the "print to file" info below + // which we don't want to do. + return NS_OK; + } + } + } + } + aPS->SetPrintToFile(toFile); + if (toFile) { + rv = GetFileNameForPrintSettings(aPS); + } + return rv; +} + //---------------------------------------------------------------------------------- NS_IMETHODIMP nsDeviceContextSpecWin::Init(nsIWidget* aWidget, nsIPrintSettings* aPrintSettings, @@ -215,6 +398,15 @@ NS_IMETHODIMP nsDeviceContextSpecWin::Init(nsIWidget* aWidget, SetDriverName(driverName); SetDevMode(devMode); + if (!aIsPrintPreview) { + rv = CheckForPrintToFile(mPrintSettings, deviceName, nullptr); + if (NS_FAILED(rv)) { + nsCRT::free(deviceName); + nsCRT::free(driverName); + return NS_ERROR_FAILURE; + } + } + // clean up nsCRT::free(deviceName); nsCRT::free(driverName); @@ -245,6 +437,10 @@ NS_IMETHODIMP nsDeviceContextSpecWin::Init(nsIWidget* aWidget, NS_ASSERTION(printerName, "We have to have a printer name"); if (!printerName || !*printerName) return rv; + if (!aIsPrintPreview) { + CheckForPrintToFile(mPrintSettings, nullptr, printerName); + } + return GetDataFromPrinter(printerName, mPrintSettings); }

1 0

[tor-browser/esr24] Bug 1035551 - Add an in-tree config for marionette tests. r=ahal, a=NPOTB
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 916f79ab0a7251d4ff7206cb05e80832f326d552 Author: Chris Manchester <cmanchester(a)mozilla.com> Date: Mon Jul 14 16:02:39 2014 -0400 Bug 1035551 - Add an in-tree config for marionette tests. r=ahal, a=NPOTB --- testing/config/mozharness/marionette.py | 57 +++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/testing/config/mozharness/marionette.py b/testing/config/mozharness/marionette.py new file mode 100644 index 0000000..6794bbc --- /dev/null +++ b/testing/config/mozharness/marionette.py @@ -0,0 +1,57 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +config = { + "marionette_desktop_options": [ + "--type=%(type)s", + "--log-raw=%(raw_log_file)s", + "--binary=%(binary)s", + "--address=%(address)s", + ], + "marionette_emulator_options": [ + "--type=%(type)s", + "--log-raw=%(raw_log_file)s", + "--logcat-dir=%(logcat_dir)s", + "--emulator=%(emulator)s", + "--homedir=%(homedir)s", + ], + "webapi_emulator_options": [ + "--type=%(type)s", + "--log-raw=%(raw_log_file)s", + "--symbols-path=%(symbols_path)s", + "--logcat-dir=%(logcat_dir)s", + "--emulator=%(emulator)s", + "--homedir=%(homedir)s", + ], + # This combination is not currently run. + "webapi_desktop_options": [ + ], + "gaiatest_emulator_options": [ + "--restart", + "--timeout=%(timeout)s", + "--type=%(type)s", + "--testvars=%(testvars)s", + "--profile=%(profile)s", + "--symbols-path=%(symbols_path)s", + "--xml-output=%(xml_output)s", + "--html-output=%(html_output)s", + "--log-raw=%(raw_log_file)s", + "--logcat-dir=%(logcat_dir)s", + "--emulator=%(emulator)s", + "--homedir=%(homedir)s", + ], + "gaiatest_desktop_options": [ + "--restart", + "--timeout=%(timeout)s", + "--type=%(type)s", + "--testvars=%(testvars)s", + "--profile=%(profile)s", + "--symbols-path=%(symbols_path)s", + "--xml-output=%(xml_output)s", + "--html-output=%(html_output)s", + "--log-raw=%(raw_log_file)s", + "--binary=%(binary)s", + "--address=%(address)s", + ], +}

1 0

[tor-browser/esr24] Automated checkin: version bump for thunderbird 24.7.0 release. DONTBUILD CLOSED TREE a=release
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 89942ba11cfb2d441346036501aaeaa2102036c8 Author: tbirdbld <none@none> Date: Thu Jul 17 09:53:59 2014 -0400 Automated checkin: version bump for thunderbird 24.7.0 release. DONTBUILD CLOSED TREE a=release --- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/milestone.txt b/config/milestone.txt index c293ee8..20c6f99 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.7.0esrpre +24.7.0 diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index c293ee8..20c6f99 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.7.0esrpre +24.7.0

1 0

[tor-browser/esr24] Bug 1035551 - Remove the new logging information that doesn't apply to non-trunk branches. a=NPOTB
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit f76cfea47677dbed4d3dfa93e1f1e3c22d8640de Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Thu Jul 17 13:32:11 2014 -0400 Bug 1035551 - Remove the new logging information that doesn't apply to non-trunk branches. a=NPOTB --- testing/config/mozharness/marionette.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/testing/config/mozharness/marionette.py b/testing/config/mozharness/marionette.py index 6794bbc..f0cee5b 100644 --- a/testing/config/mozharness/marionette.py +++ b/testing/config/mozharness/marionette.py @@ -5,20 +5,17 @@ config = { "marionette_desktop_options": [ "--type=%(type)s", - "--log-raw=%(raw_log_file)s", "--binary=%(binary)s", "--address=%(address)s", ], "marionette_emulator_options": [ "--type=%(type)s", - "--log-raw=%(raw_log_file)s", "--logcat-dir=%(logcat_dir)s", "--emulator=%(emulator)s", "--homedir=%(homedir)s", ], "webapi_emulator_options": [ "--type=%(type)s", - "--log-raw=%(raw_log_file)s", "--symbols-path=%(symbols_path)s", "--logcat-dir=%(logcat_dir)s", "--emulator=%(emulator)s", @@ -36,7 +33,6 @@ config = { "--symbols-path=%(symbols_path)s", "--xml-output=%(xml_output)s", "--html-output=%(html_output)s", - "--log-raw=%(raw_log_file)s", "--logcat-dir=%(logcat_dir)s", "--emulator=%(emulator)s", "--homedir=%(homedir)s", @@ -50,7 +46,6 @@ config = { "--symbols-path=%(symbols_path)s", "--xml-output=%(xml_output)s", "--html-output=%(html_output)s", - "--log-raw=%(raw_log_file)s", "--binary=%(binary)s", "--address=%(address)s", ],

1 0

[tor-browser/esr24] No bug, Automated HSTS preload list update from host bld-linux64-spot-028 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit e21dc00b35394cf43ff83c2634c9edafd4659966 Author: ffxbld <none@none> Date: Sat Jul 19 03:13:17 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-028 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 7 ++----- security/manager/boot/src/nsSTSPreloadList.inc | 7 ++++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 90da6bf..f83a8d9 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -63,7 +63,7 @@ intercom.io: did not receive HSTS header iop.intuit.com: max-age too low: 86400 irccloud.com: did not receive HSTS header jitsi.org: did not receive HSTS header -jottit.com: did not receive HSTS header +jottit.com: could not connect to host keymaster.lookout.com: did not receive HSTS header kiwiirc.com: max-age too low: 5256000 ledgerscope.net: did not receive HSTS header @@ -92,7 +92,7 @@ platform.lookout.com: could not connect to host play.google.com: did not receive HSTS header prodpad.com: did not receive HSTS header profiles.google.com: did not receive HSTS header -rapidresearch.me: did not receive HSTS header +rapidresearch.me: could not connect to host riseup.net: did not receive HSTS header sah3.net: could not connect to host saturngames.co.uk: did not receive HSTS header @@ -101,10 +101,8 @@ security.google.com: did not receive HSTS header semenkovich.com: did not receive HSTS header serverdensity.io: did not receive HSTS header shops.neonisi.com: could not connect to host -silentcircle.com: did not receive HSTS header silentcircle.org: could not connect to host simon.butcher.name: max-age too low: 2629743 -simple.com: did not receive HSTS header sites.google.com: did not receive HSTS header sol.io: could not connect to host souyar.de: could not connect to host @@ -131,7 +129,6 @@ www.elanex.biz: did not receive HSTS header www.gmail.com: did not receive HSTS header www.googlemail.com: did not receive HSTS header www.greplin.com: could not connect to host -www.intercom.io: did not receive HSTS header www.jitsi.org: did not receive HSTS header www.lastpass.com: did not receive HSTS header www.ledgerscope.net: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index dd480ac..96dbe38 100644 --- a/security/manager/boot/src/nsSTSPreloadList.inc +++ b/security/manager/boot/src/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include "mozilla/StandardInteger.h" -const PRTime gPreloadListExpirationTime = INT64_C(1416045947439000); +const PRTime gPreloadListExpirationTime = INT64_C(1416650838534000); class nsSTSPreload { @@ -84,6 +84,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "feedbin.com", false }, { "fiken.no", true }, { "fj.simple.com", false }, + { "flynn.io", true }, { "forum.linode.com", false }, { "forum.quantifiedself.com", true }, { "gernert-server.de", true }, @@ -101,6 +102,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "imouto.my", false }, { "inertianetworks.com", true }, { "itriskltd.com", true }, + { "jackyyf.com", false }, { "keeperapp.com", true }, { "keepersecurity.com", true }, { "keyerror.com", true }, @@ -178,7 +180,9 @@ static const nsSTSPreload kSTSPreloadList[] = { { "securityheaders.com", true }, { "seifried.org", true }, { "shodan.io", true }, + { "silentcircle.com", true }, { "simbolo.co.uk", false }, + { "simple.com", false }, { "skydrive.live.com", false }, { "squareup.com", false }, { "stage.wepay.com", false }, @@ -235,6 +239,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.gov.uk", false }, { "www.grc.com", false }, { "www.heliosnet.com", true }, + { "www.intercom.io", false }, { "www.irccloud.com", false }, { "www.linode.com", false }, { "www.lookout.com", false },

1 0

[tor-browser/esr24] No bug, Automated blocklist update from host bld-linux64-spot-028 - a=blocklist-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit aeebbf3830ed46152e585a4ab11928e877c1ca58 Author: ffxbld <none@none> Date: Sat Jul 19 03:13:18 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-028 - a=blocklist-update --- browser/app/blocklist.xml | 65 ++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 19 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 6deef11..ea097e3 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1405034316000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1405723700000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -262,6 +262,10 @@ <pref>browser.search.defaultenginename</pref> </prefs> </emItem> + <emItem blockID="i7" id="{2224e955-00e9-4613-a844-ce69fccaae91}"> + <prefs> + </prefs> + </emItem> <emItem blockID="i174" id="info(a)thebflix.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -280,10 +284,11 @@ <prefs> </prefs> </emItem> - <emItem blockID="i172" id="info(a)bflix.info"> - <versionRange minVersion="0" maxVersion="*" severity="3"> + <emItem blockID="i670" id="/^({ad9a41d2-9a49-4fa6-a79e-71a0785364c8})|(ffxtlbr(a)mysearchdial\.com)$/"> + <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> + <pref>browser.search.defaultenginename</pref> </prefs> </emItem> <emItem blockID="i93" id="{68b8676b-99a5-46d1-b390-22411d8bcd61}"> @@ -782,6 +787,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i668" id="/^(matchersite(pro(src)?)?\@matchersite(pro(src)?)?\.com)|((pro)?sitematcher(_src|pro|site|sitesrc)?\@(pro)?sitematcher(_src|pro|site|sitesrc)?\.com)$/"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i440" id="{2d069a16-fca1-4e81-81ea-5d5086dcbd0c}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -906,8 +917,10 @@ <prefs> </prefs> </emItem> - <emItem blockID="i7" id="{2224e955-00e9-4613-a844-ce69fccaae91}"> - <prefs> + <emItem blockID="i172" id="info(a)bflix.info"> + <versionRange minVersion="0" maxVersion="*" severity="3"> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i525" id="/^({65f9f6b7-2dae-46fc-bfaf-f88e4af1beca}|{9ed31f84-c8b3-4926-b950-dff74047ff79}|{0134af61-7a0c-4649-aeca-90d776060cb3}|{02edb56b-9b33-435b-b7df-b2843273a694}|{da51d4f6-3e7e-4ef8-b400-9198e0874606}|{b24577db-155e-4077-bb37-3fdd3c302bb5})$/"> @@ -1907,7 +1920,8 @@ <versionRange minVersion="0.1" maxVersion="17.0.1" /> </targetApplication> </versionRange> - </pluginItem> + <infoURL>https://get.adobe.com/flashplayer/</infoURL> + </pluginItem> <pluginItem blockID="p102"> <match name="filename" exp="npmozax\.dll" /> <versionRange minVersion="0" maxVersion="*"></versionRange> </pluginItem> @@ -1977,35 +1991,40 @@ <versionRange minVersion="4.0" maxVersion="16.*" /> </targetApplication> </versionRange> - </pluginItem> + <infoURL>https://get.adobe.com/flashplayer/</infoURL> + </pluginItem> <pluginItem blockID="p176"> <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="10.3" maxVersion="10.3.183.18.999" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="19.0a1" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + <infoURL>https://get.adobe.com/flashplayer/</infoURL> + </pluginItem> <pluginItem blockID="p176"> <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="10.3" maxVersion="10.3.183.18.999" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0.4" maxVersion="17.0.*" /> </targetApplication> </versionRange> - </pluginItem> + <infoURL>https://get.adobe.com/flashplayer/</infoURL> + </pluginItem> <pluginItem blockID="p178"> <match name="filename" exp="(NPSWF[0-9_]*\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="11.0" maxVersion="11.7.700.169" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="19.0a1" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + <infoURL>https://get.adobe.com/flashplayer/</infoURL> + </pluginItem> <pluginItem blockID="p178"> <match name="filename" exp="(NPSWF[0-9_]*\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="11.0" maxVersion="11.7.700.169" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0.4" maxVersion="17.0.*" /> </targetApplication> </versionRange> - </pluginItem> + <infoURL>https://get.adobe.com/flashplayer/</infoURL> + </pluginItem> <pluginItem blockID="p180"> <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 7 Update 0" maxVersion="Java 7 Update 11" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> @@ -2101,28 +2120,32 @@ <versionRange minVersion="18.0a1" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + <infoURL>https://get.adobe.com/flashplayer/</infoURL> + </pluginItem> <pluginItem blockID="p260"> <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="0" maxVersion="10.2.9999" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0.4" maxVersion="17.0.*" /> </targetApplication> </versionRange> - </pluginItem> + <infoURL>https://get.adobe.com/flashplayer/</infoURL> + </pluginItem> <pluginItem blockID="p290"> <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="10.3.183.19" maxVersion="10.3.183.66" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="19.0a1" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + <infoURL>https://get.adobe.com/flashplayer/</infoURL> + </pluginItem> <pluginItem blockID="p290"> <match name="filename" exp="(NPSWF32\.dll)|(Flash\ Player\.plugin)" /> <versionRange minVersion="10.3.183.19" maxVersion="10.3.183.66" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0.4" maxVersion="17.0.*" /> </targetApplication> </versionRange> - </pluginItem> + <infoURL>https://get.adobe.com/flashplayer/</infoURL> + </pluginItem> <pluginItem blockID="p292"> <match name="filename" exp="JavaAppletPlugin\.plugin" /> <versionRange minVersion="Java 7 Update 12" maxVersion="Java 7 Update 15" severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> @@ -2185,28 +2208,32 @@ <versionRange minVersion="19.0a1" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + <infoURL>https://get.adobe.com/flashplayer/</infoURL> + </pluginItem> <pluginItem blockID="p330"> <match name="description" exp="^Shockwave Flash (([1-9]\.[0-9]+)|(10\.([0-2]|(3 r(([0-9][0-9]?)|1(([0-7][0-9])|8[0-2]))))))( |$)" /> <match name="filename" exp="libflashplayer\.so" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0.4" maxVersion="17.0.*" /> </targetApplication> </versionRange> - </pluginItem> + <infoURL>https://get.adobe.com/flashplayer/</infoURL> + </pluginItem> <pluginItem blockID="p332"> <match name="description" exp="^Shockwave Flash 11.(0|1) r[0-9]{1,3}$" /> <match name="filename" exp="libflashplayer\.so" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="19.0a1" maxVersion="*" /> </targetApplication> </versionRange> - </pluginItem> + <infoURL>https://get.adobe.com/flashplayer/</infoURL> + </pluginItem> <pluginItem blockID="p332"> <match name="description" exp="^Shockwave Flash 11.(0|1) r[0-9]{1,3}$" /> <match name="filename" exp="libflashplayer\.so" /> <versionRange severity="0" vulnerabilitystatus="1"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> <versionRange minVersion="17.0.4" maxVersion="17.0.*" /> </targetApplication> </versionRange> - </pluginItem> + <infoURL>https://get.adobe.com/flashplayer/</infoURL> + </pluginItem> <pluginItem blockID="p366"> <match name="filename" exp="Scorch\.plugin" /> <versionRange minVersion="6.2.0" maxVersion="6.2.0" severity="1"></versionRange> </pluginItem>

1 0

[tor-browser/esr24] No bug, Automated blocklist update from host bld-linux64-spot-307 - a=blocklist-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 5a2ca37b664e41d6081f5853ca04d5a7cd489fba Author: ffxbld <none@none> Date: Sat Jul 26 03:12:07 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-307 - a=blocklist-update --- browser/app/blocklist.xml | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index ea097e3..5308769 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1405723700000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1406149943000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -39,6 +39,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i646" id="{e1aaa9f8-4500-47f1-9a0a-b02bd60e4076}"> + <versionRange minVersion="178.7.0" maxVersion="178.7.0" severity="3"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i107" os="WINNT" id="{ABDE892B-13A8-4d1b-88E6-365A6E755758}"> <versionRange minVersion="0" maxVersion="15.0.5" severity="1"> </versionRange> @@ -123,8 +129,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i660" id="youplayer(a)addons.mozilla.org"> - <versionRange minVersion="79.9.8" maxVersion="208.0.1" severity="3"> + <emItem blockID="i674" id="crossriderapp12555(a)crossrider.com"> + <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> </prefs> @@ -458,6 +464,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i672" id="/^(saamazon@mybrowserbar\.com)|(saebay@mybrowserbar\.com)$/"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i543" id="{badea1ae-72ed-4f6a-8c37-4db9a4ac7bc9}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -739,8 +751,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i642" id="{bee6eb20-01e0-ebd1-da83-080329fb9a3a}"> - <versionRange minVersion="40.10.1" maxVersion="44.10.1" severity="3"> + <emItem blockID="i660" id="youplayer(a)addons.mozilla.org"> + <versionRange minVersion="79.9.8" maxVersion="208.0.1" severity="3"> </versionRange> <prefs> </prefs> @@ -757,8 +769,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i646" id="{e1aaa9f8-4500-47f1-9a0a-b02bd60e4076}"> - <versionRange minVersion="178.7.0" maxVersion="178.7.0" severity="3"> + <emItem blockID="i678" id="{C4A4F5A0-4B89-4392-AFAC-D58010E349AF}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> </prefs> @@ -1245,8 +1257,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i540" id="/^(ffxtlbr@mixidj\.com|{c0c2693d-2ee8-47b4-9df7-b67a0ee31988}|{67097627-fd8e-4f6b-af4b-ecb65e50112e}|{f6f0f973-a4a3-48cf-9a7a-b7a69c30d71a}|{a3d0e35f-f1da-4ccb-ae77-e9d27777e68d}|{1122b43d-30ee-403f-9bfa-3cc99b0caddd})$/"> - <versionRange minVersion="0" maxVersion="*" severity="3"> + <emItem blockID="i676" id="SpecialSavings(a)SpecialSavings.com"> + <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> </prefs> @@ -1427,6 +1439,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i642" id="{bee6eb20-01e0-ebd1-da83-080329fb9a3a}"> + <versionRange minVersion="40.10.1" maxVersion="44.10.1" severity="3"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i586" id="jid1-0xtMKhXFEs4jIg@jetpack"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -1845,6 +1863,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i540" id="/^(ffxtlbr@mixidj\.com|{c0c2693d-2ee8-47b4-9df7-b67a0ee31988}|{67097627-fd8e-4f6b-af4b-ecb65e50112e}|{f6f0f973-a4a3-48cf-9a7a-b7a69c30d71a}|{a3d0e35f-f1da-4ccb-ae77-e9d27777e68d}|{1122b43d-30ee-403f-9bfa-3cc99b0caddd})$/"> + <versionRange minVersion="0" maxVersion="*" severity="3"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i455" id="7d51fb17-b199-4d8f-894e-decaff4fc36a(a)a298838b-7f50-4c7c-9277-df6abbd42a0c.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange>

1 0

29 Aug '14

commit 470c1bc46464e1a745063c76f742a9575c4d5077 Author: Oskar Eisemuth <dev_oskar(a)hotmail.com> Date: Tue Jan 28 16:31:20 2014 +0100 Bug 701479 - Remove usage of EnumPrintersW to test if port is FILE:. nsDeviceContextSpecWin shouldn't start UI for asking for a filename nor query all possible printers. r=jimm, a=lsblakk --- widget/windows/nsDeviceContextSpecWin.cpp | 196 ----------------------------- 1 file changed, 196 deletions(-) diff --git a/widget/windows/nsDeviceContextSpecWin.cpp b/widget/windows/nsDeviceContextSpecWin.cpp index 134d74f..1da105f 100644 --- a/widget/windows/nsDeviceContextSpecWin.cpp +++ b/widget/windows/nsDeviceContextSpecWin.cpp @@ -181,189 +181,6 @@ static PRUnichar * GetDefaultPrinterNameFromGlobalPrinters() return ToNewUnicode(printerName); } -//---------------------------------------------------------------- -static nsresult -EnumerateNativePrinters(DWORD aWhichPrinters, LPWSTR aPrinterName, bool& aIsFound, bool& aIsFile) -{ - DWORD dwSizeNeeded = 0; - DWORD dwNumItems = 0; - LPPRINTER_INFO_2W lpInfo = NULL; - - // Get buffer size - if (::EnumPrintersW(aWhichPrinters, NULL, 2, NULL, 0, &dwSizeNeeded, - &dwNumItems)) { - return NS_ERROR_FAILURE; - } - - // allocate memory - lpInfo = (LPPRINTER_INFO_2W) malloc(dwSizeNeeded); - if (!lpInfo) { - return NS_ERROR_OUT_OF_MEMORY; - } - - if (::EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 2, (LPBYTE)lpInfo, - dwSizeNeeded, &dwSizeNeeded, &dwNumItems) == 0) { - free(lpInfo); - return NS_OK; - } - - for (DWORD i = 0; i < dwNumItems; i++ ) { - if (wcscmp(lpInfo[i].pPrinterName, aPrinterName) == 0) { - aIsFound = true; - aIsFile = wcscmp(lpInfo[i].pPortName, L"FILE:") == 0; - break; - } - } - - free(lpInfo); - return NS_OK; -} - -//---------------------------------------------------------------- -static void -CheckForPrintToFileWithName(LPWSTR aPrinterName, bool& aIsFile) -{ - bool isFound = false; - aIsFile = false; - nsresult rv = EnumerateNativePrinters(PRINTER_ENUM_LOCAL, aPrinterName, isFound, aIsFile); - if (isFound) return; - - rv = EnumerateNativePrinters(PRINTER_ENUM_NETWORK, aPrinterName, isFound, aIsFile); - if (isFound) return; - - rv = EnumerateNativePrinters(PRINTER_ENUM_SHARED, aPrinterName, isFound, aIsFile); - if (isFound) return; - - rv = EnumerateNativePrinters(PRINTER_ENUM_REMOTE, aPrinterName, isFound, aIsFile); - if (isFound) return; -} - -static nsresult -GetFileNameForPrintSettings(nsIPrintSettings* aPS) -{ - // for testing -#ifdef DEBUG_rods - return NS_OK; -#endif - - nsresult rv; - - nsCOMPtr<nsIFilePicker> filePicker = do_CreateInstance("@mozilla.org/filepicker;1", &rv); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr<nsIStringBundleService> bundleService = - mozilla::services::GetStringBundleService(); - if (!bundleService) - return NS_ERROR_FAILURE; - nsCOMPtr<nsIStringBundle> bundle; - rv = bundleService->CreateBundle(NS_ERROR_GFX_PRINTER_BUNDLE_URL, getter_AddRefs(bundle)); - NS_ENSURE_SUCCESS(rv, rv); - - nsXPIDLString title; - rv = bundle->GetStringFromName(NS_LITERAL_STRING("PrintToFile").get(), getter_Copies(title)); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr<nsIWindowWatcher> wwatch = - (do_GetService(NS_WINDOWWATCHER_CONTRACTID, &rv)); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr<nsIDOMWindow> window; - wwatch->GetActiveWindow(getter_AddRefs(window)); - - rv = filePicker->Init(window, title, nsIFilePicker::modeSave); - NS_ENSURE_SUCCESS(rv, rv); - - rv = filePicker->AppendFilters(nsIFilePicker::filterAll); - NS_ENSURE_SUCCESS(rv, rv); - - PRUnichar* fileName; - aPS->GetToFileName(&fileName); - - if (fileName) { - if (*fileName) { - nsAutoString leafName; - nsCOMPtr<nsIFile> file(do_CreateInstance("@mozilla.org/file/local;1")); - if (file) { - rv = file->InitWithPath(nsDependentString(fileName)); - if (NS_SUCCEEDED(rv)) { - file->GetLeafName(leafName); - filePicker->SetDisplayDirectory(file); - } - } - if (!leafName.IsEmpty()) { - rv = filePicker->SetDefaultString(leafName); - } - NS_ENSURE_SUCCESS(rv, rv); - } - nsMemory::Free(fileName); - } - - int16_t dialogResult; - filePicker->Show(&dialogResult); - - if (dialogResult == nsIFilePicker::returnCancel) { - return NS_ERROR_ABORT; - } - - nsCOMPtr<nsIFile> localFile; - rv = filePicker->GetFile(getter_AddRefs(localFile)); - NS_ENSURE_SUCCESS(rv, rv); - - if (dialogResult == nsIFilePicker::returnReplace) { - // be extra safe and only delete when the file is really a file - bool isFile; - rv = localFile->IsFile(&isFile); - if (NS_SUCCEEDED(rv) && isFile) { - rv = localFile->Remove(false /* recursive delete */); - NS_ENSURE_SUCCESS(rv, rv); - } - } - - nsAutoString unicodePath; - rv = localFile->GetPath(unicodePath); - NS_ENSURE_SUCCESS(rv,rv); - - if (unicodePath.IsEmpty()) { - rv = NS_ERROR_ABORT; - } - - if (NS_SUCCEEDED(rv)) aPS->SetToFileName(unicodePath.get()); - - return rv; -} - -//---------------------------------------------------------------------------------- -static nsresult -CheckForPrintToFile(nsIPrintSettings* aPS, LPWSTR aPrinterName, PRUnichar* aUPrinterName) -{ - nsresult rv = NS_OK; - - if (!aPrinterName && !aUPrinterName) return rv; - - bool toFile; - CheckForPrintToFileWithName(aPrinterName?aPrinterName:aUPrinterName, toFile); - // Since the driver wasn't a "Print To File" Driver, check to see - // if the name of the file has been set to the special "FILE:" - if (!toFile) { - nsXPIDLString toFileName; - aPS->GetToFileName(getter_Copies(toFileName)); - if (toFileName) { - if (*toFileName) { - if (toFileName.EqualsLiteral("FILE:")) { - // this skips the setting of the "print to file" info below - // which we don't want to do. - return NS_OK; - } - } - } - } - aPS->SetPrintToFile(toFile); - if (toFile) { - rv = GetFileNameForPrintSettings(aPS); - } - return rv; -} - //---------------------------------------------------------------------------------- NS_IMETHODIMP nsDeviceContextSpecWin::Init(nsIWidget* aWidget, nsIPrintSettings* aPrintSettings, @@ -398,15 +215,6 @@ NS_IMETHODIMP nsDeviceContextSpecWin::Init(nsIWidget* aWidget, SetDriverName(driverName); SetDevMode(devMode); - if (!aIsPrintPreview) { - rv = CheckForPrintToFile(mPrintSettings, deviceName, nullptr); - if (NS_FAILED(rv)) { - nsCRT::free(deviceName); - nsCRT::free(driverName); - return NS_ERROR_FAILURE; - } - } - // clean up nsCRT::free(deviceName); nsCRT::free(driverName); @@ -437,10 +245,6 @@ NS_IMETHODIMP nsDeviceContextSpecWin::Init(nsIWidget* aWidget, NS_ASSERTION(printerName, "We have to have a printer name"); if (!printerName || !*printerName) return rv; - if (!aIsPrintPreview) { - CheckForPrintToFile(mPrintSettings, nullptr, printerName); - } - return GetDataFromPrinter(printerName, mPrintSettings); }

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
160
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2014