mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-29 20:07:30 +09:00
misc fixs
This commit is contained in:
parent
ce73865643
commit
6be1c0968c
4 changed files with 22 additions and 30 deletions
|
|
@ -1648,7 +1648,7 @@ gfxWindowsPlatform::DwmCompositionEnabled()
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
//MOZ_ASSERT(WinUtils::dwmIsCompositionEnabledPtr);
|
MOZ_ASSERT(WinUtils::dwmIsCompositionEnabledPtr);
|
||||||
BOOL dwmEnabled = false;
|
BOOL dwmEnabled = false;
|
||||||
|
|
||||||
if (!WinUtils::dwmIsCompositionEnabledPtr || FAILED(WinUtils::dwmIsCompositionEnabledPtr(&dwmEnabled))) {
|
if (!WinUtils::dwmIsCompositionEnabledPtr || FAILED(WinUtils::dwmIsCompositionEnabledPtr(&dwmEnabled))) {
|
||||||
|
|
|
||||||
|
|
@ -333,34 +333,6 @@ bool LaunchApp(const std::wstring& cmdline,
|
||||||
startup_info.hStdInput = INVALID_HANDLE_VALUE;
|
startup_info.hStdInput = INVALID_HANDLE_VALUE;
|
||||||
bInheritHandles = TRUE;
|
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;
|
PROCESS_INFORMATION process_info;
|
||||||
BOOL createdOK = CreateProcess(NULL,
|
BOOL createdOK = CreateProcess(NULL,
|
||||||
const_cast<wchar_t*>(cmdline.c_str()), NULL, NULL,
|
const_cast<wchar_t*>(cmdline.c_str()), NULL, NULL,
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,26 @@ endif
|
||||||
endif
|
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
|
# 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
|
# too old to support Python pretty-printers; if this changes, we could make
|
||||||
# this 'ifdef GNU_CC'.
|
# this 'ifdef GNU_CC'.
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
#include "mozilla/TouchEvents.h"
|
#include "mozilla/TouchEvents.h"
|
||||||
|
|
||||||
// Desktop builds target apis for 502. Win8 Metro builds target 602.
|
// Desktop builds target apis for 502. Win8 Metro builds target 602.
|
||||||
#if WINVER < 0x0601
|
#if WINVER < 0x0602
|
||||||
|
|
||||||
DECLARE_HANDLE(HGESTUREINFO);
|
DECLARE_HANDLE(HGESTUREINFO);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue