yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

browser(firefox): fix win compile (#3275)

Browse Source
This commit is contained in:
Dmitry Gozman 2020-08-03 14:42:16 -07:00 committed by GitHub
parent 5c4f06703d
commit e481f378f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser_patches/firefox/BUILD_NUMBER
View File

@ -1,2 +1,2 @@
1147 1148
Changed: dgozman@gmail.com Mon Aug 3 13:14:27 PDT 2020 Changed: dgozman@gmail.com Mon Aug 3 14:40:54 PDT 2020

12
browser_patches/firefox/juggler/pipe/nsRemoteDebuggingPipe.cpp
View File

@ -5,7 +5,7 @@
#include "nsRemoteDebuggingPipe.h" #include "nsRemoteDebuggingPipe.h"
#include <cstring> #include <cstring>
#if defined(OS_WIN) #if defined(_WIN32)
#include <io.h> #include <io.h>
#else #else
#include <stdio.h> #include <stdio.h>
@ -29,7 +29,7 @@ const int writeFD = 4;
const size_t kWritePacketSize = 1 << 16; const size_t kWritePacketSize = 1 << 16;
#if defined(OS_WIN) #if defined(_WIN32)
HANDLE readHandle; HANDLE readHandle;
HANDLE writeHandle; HANDLE writeHandle;
#endif #endif
@ -38,7 +38,7 @@ size_t ReadBytes(void* buffer, size_t size, bool exact_size)
{ {
size_t bytesRead = 0; size_t bytesRead = 0;
while (bytesRead < size) { while (bytesRead < size) {
#if defined(OS_WIN) #if defined(_WIN32)
DWORD sizeRead = 0; DWORD sizeRead = 0;
bool hadError = !ReadFile(readHandle, static_cast<char*>(buffer) + bytesRead, bool hadError = !ReadFile(readHandle, static_cast<char*>(buffer) + bytesRead,
size - bytesRead, &sizeRead, nullptr); size - bytesRead, &sizeRead, nullptr);
@ -66,7 +66,7 @@ void WriteBytes(const char* bytes, size_t size)
size_t length = size - totalWritten; size_t length = size - totalWritten;
if (length > kWritePacketSize) if (length > kWritePacketSize)
length = kWritePacketSize; length = kWritePacketSize;
#if defined(OS_WIN) #if defined(_WIN32)
DWORD bytesWritten = 0; DWORD bytesWritten = 0;
bool hadError = !WriteFile(writeHandle, bytes + totalWritten, static_cast<DWORD>(length), &bytesWritten, nullptr); bool hadError = !WriteFile(writeHandle, bytes + totalWritten, static_cast<DWORD>(length), &bytesWritten, nullptr);
#else #else
@ -105,7 +105,7 @@ nsresult nsRemoteDebuggingPipe::Init(nsIRemoteDebuggingPipeClient* aClient) {
MOZ_ALWAYS_SUCCEEDS(NS_NewNamedThread("Pipe Reader", getter_AddRefs(mReaderThread))); MOZ_ALWAYS_SUCCEEDS(NS_NewNamedThread("Pipe Reader", getter_AddRefs(mReaderThread)));
MOZ_ALWAYS_SUCCEEDS(NS_NewNamedThread("Pipe Writer", getter_AddRefs(mWriterThread))); MOZ_ALWAYS_SUCCEEDS(NS_NewNamedThread("Pipe Writer", getter_AddRefs(mWriterThread)));
#if defined(OS_WIN) #if defined(_WIN32)
readHandle = reinterpret_cast<HANDLE>(_get_osfhandle(readFD)); readHandle = reinterpret_cast<HANDLE>(_get_osfhandle(readFD));
writeHandle = reinterpret_cast<HANDLE>(_get_osfhandle(writeFD)); writeHandle = reinterpret_cast<HANDLE>(_get_osfhandle(writeFD));
#endif #endif
@ -124,7 +124,7 @@ nsresult nsRemoteDebuggingPipe::Stop() {
m_terminated = true; m_terminated = true;
mClient = nullptr; mClient = nullptr;
// Cancel pending synchronous read. // Cancel pending synchronous read.
#if defined(OS_WIN) #if defined(_WIN32)
CancelIoEx(readHandle, nullptr); CancelIoEx(readHandle, nullptr);
CloseHandle(readHandle); CloseHandle(readHandle);
#else #else