corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 784739) because of Windows build failures

Browse Source 
Backed out changeset 06ae36377cfa (bug 784739)
Backed out changeset e56f91d780df (bug 784739)
This commit is contained in:
Ehsan Akhgari
2013-04-02 23:04:49 -04:00
parent 9e6ee4a38d
commit 755333d3f2
10 changed files with 117 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
browser/metro/shell/commandexecutehandler/CEHHelper.cpp
View File

@@ -23,7 +23,7 @@ Log(const wchar_t *fmt, ...)
#if !defined(SHOW_CONSOLE)
return;
#endif
va_list a = nullptr;
va_list a = NULL;
wchar_t szDebugString[1024];
if(!lstrlenW(fmt))
return;
@@ -34,8 +34,8 @@ Log(const wchar_t *fmt, ...)
return;
DWORD len;
WriteConsoleW(sCon, szDebugString, lstrlenW(szDebugString), &len, nullptr);
WriteConsoleW(sCon, L"\n", 1, &len, nullptr);
WriteConsoleW(sCon, szDebugString, lstrlenW(szDebugString), &len, NULL);
WriteConsoleW(sCon, L"\n", 1, &len, NULL);
if (IsDebuggerPresent()) {
OutputDebugStringW(szDebugString);
@@ -53,7 +53,7 @@ SetupConsole()
int fd = _open_osfhandle(reinterpret_cast<intptr_t>(sCon), 0);
fp = _fdopen(fd, "w");
*stdout = *fp;
setvbuf(stdout, nullptr, _IONBF, 0);
setvbuf(stdout, NULL, _IONBF, 0);
}
#endif
@@ -104,19 +104,19 @@ IsDX10Available()
CComPtr<ID3D10Device1> device;
// Try for DX10.1
if (FAILED(createD3DDevice(adapter1, D3D10_DRIVER_TYPE_HARDWARE, nullptr,
if (FAILED(createD3DDevice(adapter1, D3D10_DRIVER_TYPE_HARDWARE, NULL,
D3D10_CREATE_DEVICE_BGRA_SUPPORT |
D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS,
D3D10_FEATURE_LEVEL_10_1,
D3D10_1_SDK_VERSION, &device))) {
// Try for DX10
if (FAILED(createD3DDevice(adapter1, D3D10_DRIVER_TYPE_HARDWARE, nullptr,
if (FAILED(createD3DDevice(adapter1, D3D10_DRIVER_TYPE_HARDWARE, NULL,
D3D10_CREATE_DEVICE_BGRA_SUPPORT |
D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS,
D3D10_FEATURE_LEVEL_10_0,
D3D10_1_SDK_VERSION, &device))) {
// Try for DX9.3 (we fall back to cairo and cairo has support for D3D 9.3)
if (FAILED(createD3DDevice(adapter1, D3D10_DRIVER_TYPE_HARDWARE, nullptr,
if (FAILED(createD3DDevice(adapter1, D3D10_DRIVER_TYPE_HARDWARE, NULL,
D3D10_CREATE_DEVICE_BGRA_SUPPORT |
D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS,
D3D10_FEATURE_LEVEL_9_3,