misc fixs

gfx/thebes/gfxWindowsPlatform.cpp

@@ -1648,7 +1648,7 @@ gfxWindowsPlatform::DwmCompositionEnabled()
     return false;
   }
 
-  //MOZ_ASSERT(WinUtils::dwmIsCompositionEnabledPtr);
+  MOZ_ASSERT(WinUtils::dwmIsCompositionEnabledPtr);
   BOOL dwmEnabled = false;
 
   if (!WinUtils::dwmIsCompositionEnabledPtr || FAILED(WinUtils::dwmIsCompositionEnabledPtr(&dwmEnabled))) {

ipc/chromium/src/base/process_util_win.cc

@@ -333,34 +333,6 @@ bool LaunchApp(const std::wstring& cmdline,
     startup_info.hStdInput = INVALID_HANDLE_VALUE;
     bInheritHandles = TRUE;
   }
-
-  // setup our handle array first - if we end up with no handles that can
-  // be inherited we can avoid trying to do the ThreadAttributeList dance...
-  HANDLE handlesToInherit[2];
-  int handleCount = 0;
-  HANDLE stdOut = ::GetStdHandle(STD_OUTPUT_HANDLE);
-  HANDLE stdErr = ::GetStdHandle(STD_ERROR_HANDLE);
-
-  if (IsInheritableHandle(stdOut))
-    handlesToInherit[handleCount++] = stdOut;
-  if (stdErr != stdOut && IsInheritableHandle(stdErr))
-    handlesToInherit[handleCount++] = stdErr;
-
-  if (handleCount) {
-    lpAttributeList = CreateThreadAttributeList(handlesToInherit, handleCount);
-    if (lpAttributeList) {
-      // it's safe to inherit handles, so arrange for that...
-      startup_info.cb = sizeof(startup_info_ex);
-      startup_info.dwFlags |= STARTF_USESTDHANDLES;
-      startup_info.hStdOutput = stdOut;
-      startup_info.hStdError = stdErr;
-      startup_info.hStdInput = INVALID_HANDLE_VALUE;
-      startup_info_ex.lpAttributeList = lpAttributeList;
-      dwCreationFlags |= EXTENDED_STARTUPINFO_PRESENT;
-      bInheritHandles = TRUE;
-    }
-  }
-
   PROCESS_INFORMATION process_info;
   BOOL createdOK = CreateProcess(NULL,
                      const_cast<wchar_t*>(cmdline.c_str()), NULL, NULL,

toolkit/library/libxul.mk

@@ -24,6 +24,26 @@ endif
 endif
 endif
 
+ifdef MOZ_WEBRTC
+ifeq (WINNT,$(OS_TARGET))
+ifndef MOZ_HAS_WINSDK_WITH_D3D
+OS_LDFLAGS += \
+  -LIBPATH:'$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_D3D_CPU_SUFFIX)' \
+  $(NULL)
+endif
+endif
+endif
+
+ifdef MOZ_WEBRTC
+ifeq (WINNT,$(OS_TARGET))
+ifndef MOZ_HAS_WINSDK_WITH_D3D
+OS_LDFLAGS += \
+  -LIBPATH:'$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_D3D_CPU_SUFFIX)' \
+  $(NULL)
+endif
+endif
+endif
+
 # Generate GDB pretty printer-autoload files on Linux and Solaris. OSX's GDB is
 # too old to support Python pretty-printers; if this changes, we could make
 # this 'ifdef GNU_CC'.

widget/windows/nsWinGesture.h

@@ -18,7 +18,7 @@
 #include "mozilla/TouchEvents.h"
 
 // Desktop builds target apis for 502. Win8 Metro builds target 602.
-#if WINVER < 0x0601
+#if WINVER < 0x0602
 
 DECLARE_HANDLE(HGESTUREINFO);