September 2015 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Revert changes from mozilla bug 1170522
by boklm＠torproject.org 29 Sep '15

29 Sep '15

commit fc2dc51c5fd378c3494222853a0800a427e86e82 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 29 16:09:33 2015 +0200 Revert changes from mozilla bug 1170522 --- ...fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch | 24 + ...0522-expose-whether-or-not-we-re-in-ta.mozpatch | 512 ++++++++++++++++++++ projects/instantbird/config | 4 + 3 files changed, 540 insertions(+) diff --git a/projects/instantbird/0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch b/projects/instantbird/0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch new file mode 100644 index 0000000..344e2ed --- /dev/null +++ b/projects/instantbird/0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch @@ -0,0 +1,24 @@ +From 464da9c6d7b576a9b92b2c2e26d52a9213e3f89d Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier <boklm(a)torproject.org> +Date: Tue, 29 Sep 2015 16:06:38 +0200 +Subject: [PATCH 1/2] Revert "no bug - fix case of nsIDocShell.h in + WindowsUIUtils.cpp" + +This reverts commit 02335958d9315e5620f030617e4a599209697054. +--- + widget/windows/WindowsUIUtils.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp +index 0c93d945cf30..98325f0eb055 100644 +--- a/widget/windows/WindowsUIUtils.cpp ++++ b/widget/windows/WindowsUIUtils.cpp +@@ -11,7 +11,7 @@ + + #include "nsIObserverService.h" + #include "nsIBaseWindow.h" +-#include "nsIDocShell.h" ++#include "nsIDocshell.h" + #include "nsIAppShellService.h" + #include "nsAppShellCID.h" + #include "nsIXULWindow.h" diff --git a/projects/instantbird/0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch b/projects/instantbird/0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch new file mode 100644 index 0000000..bf68c7c --- /dev/null +++ b/projects/instantbird/0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch @@ -0,0 +1,512 @@ +From 0fd6ae4f5947b5229b8c14704b893d95787e54a3 Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier <boklm(a)torproject.org> +Date: Tue, 29 Sep 2015 16:06:49 +0200 +Subject: [PATCH 2/2] Revert "Bug 1170522 - expose whether or not we're in + tablet mode to xul/js/css, r=jimm,ted" + +This reverts commit 6c7bdf65167060865d9f9a09c0aa3dae0d91680c. +--- + build/win32/mozconfig.vs2013-win64 | 2 +- + build/win64/mozconfig.vs2013 | 2 +- + toolkit/library/moz.build | 6 -- + widget/moz.build | 1 - + widget/nsIWindowsUIUtils.idl | 24 ----- + widget/nsWidgetsCID.h | 4 - + widget/windows/WindowsUIUtils.cpp | 174 ------------------------------------- + widget/windows/WindowsUIUtils.h | 29 ------- + widget/windows/moz.build | 1 - + widget/windows/mozwrlbase.h | 77 ---------------- + widget/windows/nsWidgetFactory.cpp | 6 -- + widget/windows/nsWindow.cpp | 16 ---- + 12 files changed, 2 insertions(+), 340 deletions(-) + delete mode 100644 widget/nsIWindowsUIUtils.idl + delete mode 100644 widget/windows/WindowsUIUtils.cpp + delete mode 100644 widget/windows/WindowsUIUtils.h + delete mode 100644 widget/windows/mozwrlbase.h + +diff --git a/build/win32/mozconfig.vs2013-win64 b/build/win32/mozconfig.vs2013-win64 +index 85821f0720aa..86a846cf670e 100644 +--- a/build/win32/mozconfig.vs2013-win64 ++++ b/build/win32/mozconfig.vs2013-win64 +@@ -2,7 +2,7 @@ _VSPATH="/c/tools/vs2013" + export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x86/Microsoft.VC120.CRT + + ## includes: win8.1 sdk includes, msvc std library, directx sdk for d3d9 ## +-export INCLUDE=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/um:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/winrt:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include ++export INCLUDE=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/um:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include + + ## libs: win8.1 sdk x86 (32-bit) libs, msvc (32-bit) std library, msvc atl libs, directx sdk (32-bit) for d3d9 ## + export LIBPATH=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/Lib/winv6.3/um/x86:${_VSPATH}/vc/lib:${_VSPATH}/vc/atlmfc/lib:/c/tools/sdks/dx10/lib +diff --git a/build/win64/mozconfig.vs2013 b/build/win64/mozconfig.vs2013 +index 5fbde2df738b..776c9183e522 100644 +--- a/build/win64/mozconfig.vs2013 ++++ b/build/win64/mozconfig.vs2013 +@@ -2,7 +2,7 @@ _VSPATH="/c/tools/vs2013" + export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x64/Microsoft.VC120.CRT + + ## includes: win8.1 sdk includes, msvc std library, directx sdk for d3d9 ## +-export INCLUDE=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/um:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/winrt:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include ++export INCLUDE=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/um:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include + + ## libs: win8.1 sdk x64 (64-bit) libs, msvc (64-bit) std library, msvc atl libs, directx sdk (64-bit) for d3d9 ## + export LIBPATH=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/Lib/winv6.3/um/x64:${_VSPATH}/vc/lib/amd64:${_VSPATH}/vc/atlmfc/lib/amd64:/c/tools/sdks/dx10/lib/x64 +diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build +index 62e03f45e154..fcd62bae854e 100644 +--- a/toolkit/library/moz.build ++++ b/toolkit/library/moz.build +@@ -33,12 +33,6 @@ def Libxul(name): + if CONFIG['MOZ_WEBRTC']: + DELAYLOAD_DLLS += ['msdmo.dll'] + +- if CONFIG['OS_ARCH'] == 'WINNT': +- DELAYLOAD_DLLS += [ +- 'api-ms-win-core-winrt-l1-1-0.dll', +- 'api-ms-win-core-winrt-string-l1-1-0.dll', +- ] +- + if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']: + LOCAL_INCLUDES += [ + '/widget/windows', +diff --git a/widget/moz.build b/widget/moz.build +index 373cf8b23da6..429da474c1ee 100644 +--- a/widget/moz.build ++++ b/widget/moz.build +@@ -26,7 +26,6 @@ if toolkit == 'windows': + 'nsITaskbarProgress.idl', + 'nsITaskbarTabPreview.idl', + 'nsITaskbarWindowPreview.idl', +- 'nsIWindowsUIUtils.idl', + 'nsIWinTaskbar.idl', + ] + elif toolkit == 'cocoa': +diff --git a/widget/nsIWindowsUIUtils.idl b/widget/nsIWindowsUIUtils.idl +deleted file mode 100644 +index 331562a67245..000000000000 +--- a/widget/nsIWindowsUIUtils.idl ++++ /dev/null +@@ -1,24 +0,0 @@ +-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- +- * +- * 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/. */ +- +-#include "nsISupports.idl" +- +- +-[scriptable, uuid(aa8a0ecf-96a1-418c-b80e-f24ae18bbedc)] +-interface nsIWindowsUIUtils : nsISupports +-{ +- /** +- * Whether the OS is currently in tablet mode. Always false on +- * non-Windows and on versions of Windows before win10 +- */ +- readonly attribute boolean inTabletMode; +- +- /** +- * Update the tablet mode state +- */ +- void updateTabletModeState(); +-}; +- +diff --git a/widget/nsWidgetsCID.h b/widget/nsWidgetsCID.h +index a428cdee2866..afafe93f24c0 100644 +--- a/widget/nsWidgetsCID.h ++++ b/widget/nsWidgetsCID.h +@@ -185,7 +185,3 @@ + #define NS_IMEPICKER_CID \ + { 0x8e5c35ef, 0xb65b, 0x47aa, \ + { 0xbb, 0x90, 0x5b, 0x89, 0x6d, 0x88, 0x24, 0x18 } } +- +-#define NS_WINDOWS_UIUTILS_CID \ +-{ 0xe04a55e8, 0xfee3, 0x4ea2, \ +- { 0xa9, 0x8b, 0x41, 0xd2, 0x62, 0x1a, 0xdc, 0x3c } } +diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp +deleted file mode 100644 +index 98325f0eb055..000000000000 +--- a/widget/windows/WindowsUIUtils.cpp ++++ /dev/null +@@ -1,174 +0,0 @@ +-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +-/* 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/. */ +- +-#include <windows.h> +-#include "mozwrlbase.h" +-#include "nsServiceManagerUtils.h" +- +-#include "WindowsUIUtils.h" +- +-#include "nsIObserverService.h" +-#include "nsIBaseWindow.h" +-#include "nsIDocshell.h" +-#include "nsIAppShellService.h" +-#include "nsAppShellCID.h" +-#include "nsIXULWindow.h" +-#include "mozilla/Services.h" +-#include "mozilla/WindowsVersion.h" +-#include "nsString.h" +-#include "nsIWidget.h" +- +-#include <windows.ui.viewmanagement.h> +- +-#pragma comment(lib, "runtimeobject.lib") +- +-using namespace mozilla; +-using namespace ABI::Windows::UI; +-using namespace ABI::Windows::UI::ViewManagement; +-using namespace Microsoft::WRL; +-using namespace Microsoft::WRL::Wrappers; +-using namespace ABI::Windows::Foundation; +- +-/* All of this is win10 stuff and we're compiling against win81 headers +- * for now, so we may need to do some legwork: */ +-#ifndef UserInteractionMode +-namespace ABI { +- namespace Windows { +- namespace UI { +- namespace ViewManagement { +- enum UserInteractionMode { +- UserInteractionMode_Mouse = 0, +- UserInteractionMode_Touch = 1 +- }; +- } +- } +- } +-} +- +-#endif +- +-#ifndef RuntimeClass_Windows_UI_ViewManagement_UIViewSettings +-#define RuntimeClass_Windows_UI_ViewManagement_UIViewSettings L"Windows.UI.ViewManagement.UIViewSettings" +-#endif +- +-#ifndef IUIViewSettings +-namespace ABI { +- namespace Windows { +- namespace UI { +- namespace ViewManagement { +- interface IUIViewSettings; +- MIDL_INTERFACE("C63657F6-8850-470D-88F8-455E16EA2C26") +- IUIViewSettings : public IInspectable +- { +- public: +- virtual HRESULT STDMETHODCALLTYPE get_UserInteractionMode(UserInteractionMode *value) = 0; +- }; +- +- extern const __declspec(selectany) IID & IID_IUIViewSettings = __uuidof(IUIViewSettings); +- } +- } +- } +-} +-#endif +- +-#ifndef IUIViewSettingsInterop +- +-typedef interface IUIViewSettingsInterop IUIViewSettingsInterop; +- +-MIDL_INTERFACE("3694dbf9-8f68-44be-8ff5-195c98ede8a6") +-IUIViewSettingsInterop : public IInspectable +-{ +-public: +- virtual HRESULT STDMETHODCALLTYPE GetForWindow(HWND hwnd, REFIID riid, void **ppv) = 0; +-}; +-#endif +- +-WindowsUIUtils::WindowsUIUtils() : +- mInTabletMode(eTabletModeUnknown) +-{ +-} +- +-WindowsUIUtils::~WindowsUIUtils() +-{ +-} +- +-/* +- * Implement the nsISupports methods... +- */ +-NS_IMPL_ISUPPORTS(WindowsUIUtils, +- nsIWindowsUIUtils) +- +-NS_IMETHODIMP +-WindowsUIUtils::GetInTabletMode(bool* aResult) +-{ +- if (mInTabletMode == eTabletModeUnknown) { +- UpdateTabletModeState(); +- } +- *aResult = mInTabletMode == eTabletModeOn; +- return NS_OK; +-} +- +-NS_IMETHODIMP +-WindowsUIUtils::UpdateTabletModeState() +-{ +- if (!IsWin10OrLater()) { +- return NS_OK; +- } +- +- nsCOMPtr<nsIAppShellService> appShell(do_GetService(NS_APPSHELLSERVICE_CONTRACTID)); +- nsCOMPtr<nsIXULWindow> hiddenWindow; +- +- nsresult rv = appShell->GetHiddenWindow(getter_AddRefs(hiddenWindow)); +- if (NS_FAILED(rv)) { +- return rv; +- } +- +- nsCOMPtr<nsIDocShell> docShell; +- rv = hiddenWindow->GetDocShell(getter_AddRefs(docShell)); +- if (NS_FAILED(rv) || !docShell) { +- return rv; +- } +- +- nsCOMPtr<nsIBaseWindow> baseWindow(do_QueryInterface(docShell)); +- +- if (!baseWindow) +- return NS_ERROR_FAILURE; +- +- nsCOMPtr<nsIWidget> widget; +- baseWindow->GetMainWidget(getter_AddRefs(widget)); +- +- if (!widget) +- return NS_ERROR_FAILURE; +- +- HWND winPtr = (HWND)widget->GetNativeData(NS_NATIVE_WINDOW); +- ComPtr<IUIViewSettingsInterop> uiViewSettingsInterop; +- +- HRESULT hr = GetActivationFactory( +- HStringReference(RuntimeClass_Windows_UI_ViewManagement_UIViewSettings).Get(), +- &uiViewSettingsInterop); +- if (SUCCEEDED(hr)) { +- ComPtr<IUIViewSettings> uiViewSettings; +- hr = uiViewSettingsInterop->GetForWindow(winPtr, IID_PPV_ARGS(&uiViewSettings)); +- if (SUCCEEDED(hr)) { +- UserInteractionMode mode; +- hr = uiViewSettings->get_UserInteractionMode(&mode); +- if (SUCCEEDED(hr)) { +- TabletModeState oldTabletModeState = mInTabletMode; +- mInTabletMode = (mode == UserInteractionMode_Touch) ? eTabletModeOn : eTabletModeOff; +- if (mInTabletMode != oldTabletModeState) { +- nsCOMPtr<nsIObserverService> observerService = +- mozilla::services::GetObserverService(); +- NS_NAMED_LITERAL_STRING(tabletMode, "tablet-mode"); +- NS_NAMED_LITERAL_STRING(normalMode, "normal-mode"); +- observerService->NotifyObservers(nullptr, "tablet-mode-change", +- ((mInTabletMode == eTabletModeOn) ? tabletMode.get() : normalMode.get())); +- } +- } +- } +- } +- +- return NS_OK; +-} +- +diff --git a/widget/windows/WindowsUIUtils.h b/widget/windows/WindowsUIUtils.h +deleted file mode 100644 +index a33c93a94f23..000000000000 +--- a/widget/windows/WindowsUIUtils.h ++++ /dev/null +@@ -1,29 +0,0 @@ +-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +-/* 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/. */ +- +-#ifndef mozilla_widget_WindowsUIUtils_h__ +-#define mozilla_widget_WindowsUIUtils_h__ +- +-#include "nsIWindowsUIUtils.h" +- +-enum TabletModeState { +- eTabletModeUnknown = 0, +- eTabletModeOff, +- eTabletModeOn +-}; +- +-class WindowsUIUtils final : public nsIWindowsUIUtils { +-public: +- NS_DECL_ISUPPORTS +- NS_DECL_NSIWINDOWSUIUTILS +- +- WindowsUIUtils(); +-protected: +- ~WindowsUIUtils(); +- +- TabletModeState mInTabletMode; +-}; +- +-#endif // mozilla_widget_WindowsUIUtils_h__ +diff --git a/widget/windows/moz.build b/widget/windows/moz.build +index 755e763553c1..fdb2fb70d28a 100644 +--- a/widget/windows/moz.build ++++ b/widget/windows/moz.build +@@ -63,7 +63,6 @@ SOURCES += [ + 'nsBidiKeyboard.cpp', + 'nsFilePicker.cpp', + 'nsWidgetFactory.cpp', +- 'WindowsUIUtils.cpp', + 'WinMouseScrollHandler.cpp', + ] + +diff --git a/widget/windows/mozwrlbase.h b/widget/windows/mozwrlbase.h +deleted file mode 100644 +index d82be8f0431d..000000000000 +--- a/widget/windows/mozwrlbase.h ++++ /dev/null +@@ -1,77 +0,0 @@ +-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +-/* 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/. */ +- +-#pragma once +- +-/* +- * Includes <wrl.h> and it's children. Defines imports needed by +- * corewrappers.h in the case where windows.h has already been +- * included w/WINVER < 0x600. Also ups WINVER/_WIN32_WINNT prior +- * to including wrl.h. Mozilla's build currently has WINVER set to +- * 0x502 for XP support. +- */ +- +-#if _WIN32_WINNT < 0x600 +- +-#include <windows.h> +- +-VOID +-WINAPI +-ReleaseSRWLockExclusive( +- _Inout_ PSRWLOCK SRWLock +- ); +- +-VOID +-WINAPI +-ReleaseSRWLockShared( +- _Inout_ PSRWLOCK SRWLock +- ); +- +-BOOL +-WINAPI +-InitializeCriticalSectionEx( +- _Out_ LPCRITICAL_SECTION lpCriticalSection, +- _In_ DWORD dwSpinCount, +- _In_ DWORD Flags +- ); +- +-VOID +-WINAPI +-InitializeSRWLock( +- _Out_ PSRWLOCK SRWLock +- ); +- +-VOID +-WINAPI +-AcquireSRWLockExclusive( +- _Inout_ PSRWLOCK SRWLock +- ); +- +-BOOLEAN +-WINAPI +-TryAcquireSRWLockExclusive( +- _Inout_ PSRWLOCK SRWLock +- ); +- +-BOOLEAN +-WINAPI +-TryAcquireSRWLockShared( +- _Inout_ PSRWLOCK SRWLock +- ); +- +-VOID +-WINAPI +-AcquireSRWLockShared( +- _Inout_ PSRWLOCK SRWLock +- ); +- +-#undef WINVER +-#undef _WIN32_WINNT +-#define WINVER 0x600 +-#define _WIN32_WINNT 0x600 +- +-#endif // _WIN32_WINNT < 0x600 +- +-#include <wrl.h> +diff --git a/widget/windows/nsWidgetFactory.cpp b/widget/windows/nsWidgetFactory.cpp +index f564d17ee6c6..b7cedbefe2cf 100644 +--- a/widget/windows/nsWidgetFactory.cpp ++++ b/widget/windows/nsWidgetFactory.cpp +@@ -44,8 +44,6 @@ + #include "JumpListBuilder.h" + #include "JumpListItem.h" + +-#include "WindowsUIUtils.h" +- + #ifdef NS_PRINTING + #include "nsDeviceContextSpecWin.h" + #include "nsPrintOptionsWin.h" +@@ -114,7 +112,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListItem) + NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListSeparator) + NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListLink) + NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListShortcut) +-NS_GENERIC_FACTORY_CONSTRUCTOR(WindowsUIUtils) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService) +@@ -153,7 +150,6 @@ NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTITEM_CID); + NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTSEPARATOR_CID); + NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTLINK_CID); + NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTSHORTCUT_CID); +-NS_DEFINE_NAMED_CID(NS_WINDOWS_UIUTILS_CID); + NS_DEFINE_NAMED_CID(NS_DRAGSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_BIDIKEYBOARD_CID); + #ifdef NS_PRINTING +@@ -186,7 +182,6 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = { + { &kNS_WIN_JUMPLISTSEPARATOR_CID, false, nullptr, JumpListSeparatorConstructor }, + { &kNS_WIN_JUMPLISTLINK_CID, false, nullptr, JumpListLinkConstructor }, + { &kNS_WIN_JUMPLISTSHORTCUT_CID, false, nullptr, JumpListShortcutConstructor }, +- { &kNS_WINDOWS_UIUTILS_CID, false, nullptr, WindowsUIUtilsConstructor }, + { &kNS_DRAGSERVICE_CID, false, nullptr, nsDragServiceConstructor, Module::MAIN_PROCESS_ONLY }, + { &kNS_BIDIKEYBOARD_CID, false, nullptr, nsBidiKeyboardConstructor }, + #ifdef NS_PRINTING +@@ -219,7 +214,6 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = { + { "@mozilla.org/windows-jumplistseparator;1", &kNS_WIN_JUMPLISTSEPARATOR_CID }, + { "@mozilla.org/windows-jumplistlink;1", &kNS_WIN_JUMPLISTLINK_CID }, + { "@mozilla.org/windows-jumplistshortcut;1", &kNS_WIN_JUMPLISTSHORTCUT_CID }, +- { "@mozilla.org/windows-ui-utils;1", &kNS_WINDOWS_UIUTILS_CID }, + { "@mozilla.org/widget/dragservice;1", &kNS_DRAGSERVICE_CID, Module::MAIN_PROCESS_ONLY }, + { "@mozilla.org/widget/bidikeyboard;1", &kNS_BIDIKEYBOARD_CID }, + #ifdef NS_PRINTING +diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp +index 0ab8bee04863..b616fb725cfd 100644 +--- a/widget/windows/nsWindow.cpp ++++ b/widget/windows/nsWindow.cpp +@@ -161,8 +161,6 @@ + #include "nsIWinTaskbar.h" + #define NS_TASKBAR_CONTRACTID "@mozilla.org/windows-taskbar;1" + +-#include "nsIWindowsUIUtils.h" +- + #include "nsWindowDefs.h" + + #include "nsCrashOnException.h" +@@ -4845,20 +4843,6 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam, + } + break; + +- case WM_SETTINGCHANGE: +- { +- if (IsWin10OrLater() && mWindowType == eWindowType_invisible && lParam) { +- auto lParamString = reinterpret_cast<const wchar_t*>(lParam); +- if (!wcscmp(lParamString, L"UserInteractionMode")) { +- nsCOMPtr<nsIWindowsUIUtils> uiUtils(do_GetService("@mozilla.org/windows-ui-utils;1")); +- if (uiUtils) { +- uiUtils->UpdateTabletModeState(); +- } +- } +- } +- } +- break; +- + case WM_NCCALCSIZE: + { + if (mCustomNonClient) { diff --git a/projects/instantbird/config b/projects/instantbird/config index ba71fa9..293d455 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -112,6 +112,10 @@ input_files: enable: '[% c("var/osx") %]' - filename: fix-mingw-build.patch enable: '[% c("var/windows") %]' + - filename: 0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch + enable: '[% c("var/windows") %]' + - filename: 0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch + enable: '[% c("var/windows") %]' - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch - filename: block-plugins.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch

1 0

[tor-messenger-build/master] Ifdef performance_toolkit.xpt
by arlo＠torproject.org 29 Sep '15

29 Sep '15

commit e50a4c667cec1dadb18cf73f89d33343f17a8257 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Sep 29 15:17:55 2015 +0200 Ifdef performance_toolkit.xpt * https://bugzilla.mozilla.org/show_bug.cgi?id=1209505 --- projects/instantbird/config | 1 + .../ifdef-performance-toolkit-xpt.patch | 31 ++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index bd8b89c..ba71fa9 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -86,6 +86,7 @@ input_files: - filename: search-context-menu.patch - filename: search-preferences-xul.patch - filename: log-preferences-xul.patch + - filename: ifdef-performance-toolkit-xpt.patch - filename: branding/blistWindow.png - filename: branding/blistWindow16.png - filename: branding/blistWindow48.png diff --git a/projects/instantbird/ifdef-performance-toolkit-xpt.patch b/projects/instantbird/ifdef-performance-toolkit-xpt.patch new file mode 100644 index 0000000..863f9b7 --- /dev/null +++ b/projects/instantbird/ifdef-performance-toolkit-xpt.patch @@ -0,0 +1,31 @@ +# HG changeset patch +# User Arlo Breault <arlolra(a)gmail.com> +# Date 1443532131 -7200 +# Tue Sep 29 15:08:51 2015 +0200 +# Node ID 3c43eb71066949342af540518d3051565de9cb8a +# Parent e1a209673d05dc27dd5a8230b257b1ddcc1cb055 +Port bug 1164707 to /im + +diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in +--- a/im/installer/package-manifest.in ++++ b/im/installer/package-manifest.in +@@ -422,17 +422,19 @@ + #ifdef MOZ_WEBRTC + @RESPATH@/components/PeerConnection.js + @RESPATH@/components/PeerConnection.manifest + #endif + @RESPATH@/components/toolkit_asyncshutdown.xpt + @RESPATH@/components/toolkit_filewatcher.xpt + @RESPATH@/components/toolkit_formautofill.xpt + @RESPATH@/components/toolkit_osfile.xpt ++#ifdef NIGHTLY_BUILD + @RESPATH@/components/toolkit_perfmonitoring.xpt ++#endif + @RESPATH@/components/toolkit_xulstore.xpt + @RESPATH@/components/toolkitplaces.manifest + @RESPATH@/components/toolkitsearch.manifest + #ifdef UNIX_BUT_NOT_MAC + @RESPATH@/components/toolkitremote.xpt + #endif + #ifdef MOZ_GTK + @RESPATH@/components/filepicker.xpt

1 0

[tor-messenger-build/master] Update mingw-w64 version
by boklm＠torproject.org 29 Sep '15

29 Sep '15

commit d0e75f714cf86a9147feb9ac4f35e99c6c370e5f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 29 15:11:16 2015 +0200 Update mingw-w64 version --- projects/mingw-w64/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 20c76ef..5817f74 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 85b403445b2308fa6277aa26446da790866fe052 +git_hash: 548b1984042a1dd66cae95ad8c0003b5e5494a68 version: '[% c("abbrev") %]' remote_docker: 1 lsb_release:

1 0

[tor-messenger-build/master] Add libotr patch for bug.otr.im/issues/72
by arlo＠torproject.org 29 Sep '15

29 Sep '15

commit c59d2b146a0ea8427b1e7f62ab073c64a787eeba Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Sep 29 14:42:53 2015 +0200 Add libotr patch for bug.otr.im/issues/72 --- projects/libotr/bugs-otr-im-72.patch | 60 ++++++++++++++++++++++++++++++++++ projects/libotr/build | 1 + projects/libotr/config | 1 + 3 files changed, 62 insertions(+) diff --git a/projects/libotr/bugs-otr-im-72.patch b/projects/libotr/bugs-otr-im-72.patch new file mode 100644 index 0000000..a56dda3 --- /dev/null +++ b/projects/libotr/bugs-otr-im-72.patch @@ -0,0 +1,60 @@ +From f466e0c698d022cbd6ddb279e1ca4c84a0703b3b Mon Sep 17 00:00:00 2001 +From: David Goulet <dgoulet(a)ev0ke.net> +Date: Tue, 18 Aug 2015 09:32:19 +0200 +Subject: [PATCH] Fix: set to NULL the sendsmp pointer when handling SMP + +Also, for extra precaution, set the message pointer in +otrl_proto_create_data() to NULL at the beginning. + +Fixes #72 + +Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> +--- + src/message.c | 4 ++-- + src/proto.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/message.c b/src/message.c +index f17e5e1..9572fc9 100644 +--- a/src/message.c ++++ b/src/message.c +@@ -1502,7 +1502,7 @@ int otrl_message_receiving(OtrlUserState us, const OtrlMessageAppOps *ops, + unsigned char* nextmsg; + int nextmsglen; + OtrlTLV *sendtlv; +- char *sendsmp; ++ char *sendsmp = NULL; + otrl_sm_step3(context->smstate, tlv->data, + tlv->len, &nextmsg, &nextmsglen); + +@@ -1557,7 +1557,7 @@ int otrl_message_receiving(OtrlUserState us, const OtrlMessageAppOps *ops, + unsigned char* nextmsg; + int nextmsglen; + OtrlTLV *sendtlv; +- char *sendsmp; ++ char *sendsmp = NULL; + err = otrl_sm_step4(context->smstate, tlv->data, + tlv->len, &nextmsg, &nextmsglen); + /* Set trust level based on result */ +diff --git a/src/proto.c b/src/proto.c +index f560a82..a8813ab 100644 +--- a/src/proto.c ++++ b/src/proto.c +@@ -497,6 +497,8 @@ gcry_error_t otrl_proto_create_data(char **encmessagep, ConnContext *context, + char *msgdup; + int version = context->protocol_version; + ++ *encmessagep = NULL; ++ + /* Make sure we're actually supposed to be able to encrypt */ + if (context->msgstate != OTRL_MSGSTATE_ENCRYPTED || + context->context_priv->their_keyid == 0) { +@@ -511,8 +513,6 @@ gcry_error_t otrl_proto_create_data(char **encmessagep, ConnContext *context, + } + strcpy(msgdup, msg); + +- *encmessagep = NULL; +- + /* Header, msg flags, send keyid, recv keyid, counter, msg len, msg + * len of revealed mac keys, revealed mac keys, MAC */ + buflen = OTRL_HEADER_LEN + (version == 3 ? 8 : 0) diff --git a/projects/libotr/build b/projects/libotr/build old mode 100644 new mode 100755 index c0753d6..ecd94ee --- a/projects/libotr/build +++ b/projects/libotr/build @@ -12,6 +12,7 @@ cd $rootdir distdir=/var/tmp/dist/[% project %] tar xf libotr-[% c('version') %].tar.gz cd libotr-[% c('version') %] +patch -p1 < ../bugs-otr-im-72.patch ./configure --prefix=$distdir [% c("var/configure_opt") %] make -j4 [% IF c("var/windows") %]LDFLAGS='-no-undefined -lssp'[% END %] make prefix=$distdir install diff --git a/projects/libotr/config b/projects/libotr/config index 8ca4a78..73081c7 100644 --- a/projects/libotr/config +++ b/projects/libotr/config @@ -38,6 +38,7 @@ input_files: file_gpg_id: 1 sig_ext: asc gpg_keyring: libotr.gpg + - filename: bugs-otr-im-72.patch - project: libgcrypt name: libgcrypt - project: libgpg-error

1 0

[tor/master] Add a README for the trunnel directory
by nickm＠torproject.org 29 Sep '15

29 Sep '15

commit 62d6a8ef4db8b720bfb2786775fdf617dc8351be Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 29 13:43:12 2015 +0200 Add a README for the trunnel directory --- src/trunnel/README | 10 ++++++++++ src/trunnel/include.am | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/src/trunnel/README b/src/trunnel/README new file mode 100644 index 0000000..383272c --- /dev/null +++ b/src/trunnel/README @@ -0,0 +1,10 @@ +This directory contains code for use with, and code made by, the +automatic code generation tool "Trunnel". + +The .trunnel files are the inputs here; the .c and .h files are the outputs. +To regenerate the .c and .h files, run "scripts/codegen/run_trunnel.sh". + +For the Trunnel source code, and more documentation about using Trunnel, +see https://gitweb.torproject.org/trunnel.git , especially + https://gitweb.torproject.org/trunnel.git/tree/README +and https://gitweb.torproject.org/trunnel.git/tree/doc/trunnel.md diff --git a/src/trunnel/include.am b/src/trunnel/include.am index 9bf37fe..b1448b7 100644 --- a/src/trunnel/include.am +++ b/src/trunnel/include.am @@ -36,3 +36,7 @@ src_trunnel_libor_trunnel_testing_a_CPPFLAGS = -DTRUNNEL_LOCAL_H $(AM_CPPFLAGS) src_trunnel_libor_trunnel_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) noinst_HEADERS+= $(TRUNNELHEADERS) + +EXTRA_DIST += \ + src/trunnel/README +

1 0

[tor/master] fix compilation; mark test fns static
by nickm＠torproject.org 29 Sep '15

29 Sep '15

commit d4212d581ae418dcb91eac6343359bb7deb90c0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 29 13:50:52 2015 +0200 fix compilation; mark test fns static --- src/test/test_address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index b442f4a..938f776 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -781,7 +781,7 @@ test_address_get_if_addrs6_list_no_internal(void *arg) static int called_get_interface_addresses_raw = 0; -smartlist_t * +static smartlist_t * mock_get_interface_addresses_raw_fail(int severity) { (void)severity; @@ -792,7 +792,7 @@ mock_get_interface_addresses_raw_fail(int severity) static int called_get_interface_address6_via_udp_socket_hack = 0; -int +static int mock_get_interface_address6_via_udp_socket_hack_fail(int severity, sa_family_t family, tor_addr_t *addr)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'
by nickm＠torproject.org 29 Sep '15

29 Sep '15

commit 003462432b1ddcd938031fb7f2f7a403125b0ccb Merge: 62d6a8e d4212d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 29 13:51:08 2015 +0200 Merge remote-tracking branch 'origin/maint-0.2.7' src/test/test_address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.7] fix compilation; mark test fns static
by nickm＠torproject.org 29 Sep '15

29 Sep '15

commit d4212d581ae418dcb91eac6343359bb7deb90c0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 29 13:50:52 2015 +0200 fix compilation; mark test fns static --- src/test/test_address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index b442f4a..938f776 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -781,7 +781,7 @@ test_address_get_if_addrs6_list_no_internal(void *arg) static int called_get_interface_addresses_raw = 0; -smartlist_t * +static smartlist_t * mock_get_interface_addresses_raw_fail(int severity) { (void)severity; @@ -792,7 +792,7 @@ mock_get_interface_addresses_raw_fail(int severity) static int called_get_interface_address6_via_udp_socket_hack = 0; -int +static int mock_get_interface_address6_via_udp_socket_hack_fail(int severity, sa_family_t family, tor_addr_t *addr)

1 0

[tor/master] Fix past changelog spelling again!
by nickm＠torproject.org 29 Sep '15

29 Sep '15

commit 22a912755faba6ef1315f701b358b005906a3100 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 29 12:49:23 2015 +0200 Fix past changelog spelling again! --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0191717..46005a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,7 +61,7 @@ Changes in version 0.2.7.3-rc - 2015-09-25 Fixes bug 16685; bugfix on 0.2.7.2-alpha. Reported by "s7r". o Minor features (client-side privacy): - - New KeyepAliveIsolateSOCKSAuth option to indefinitely extend circuit + - New KeepAliveIsolateSOCKSAuth option to indefinitely extend circuit lifespan when IsolateSOCKSAuth and streams with SOCKS authentication are attached to the circuit. This allows applications like TorBrowser to manage circuit lifetime on their

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'
by nickm＠torproject.org 29 Sep '15

29 Sep '15

commit aaf748435cb6e42922bf5948b04b4679bbf649b1 Merge: efff55b 22a9127 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 29 12:49:59 2015 +0200 Merge remote-tracking branch 'origin/maint-0.2.7' ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0