diff options
Diffstat (limited to 'Source/JavaScriptCore/os-win32')
-rw-r--r-- | Source/JavaScriptCore/os-win32/WinMain.cpp | 81 | ||||
-rw-r--r-- | Source/JavaScriptCore/os-win32/inttypes.h | 5 | ||||
-rw-r--r-- | Source/JavaScriptCore/os-win32/stdint.h | 67 |
3 files changed, 0 insertions, 153 deletions
diff --git a/Source/JavaScriptCore/os-win32/WinMain.cpp b/Source/JavaScriptCore/os-win32/WinMain.cpp deleted file mode 100644 index d4ff3e657..000000000 --- a/Source/JavaScriptCore/os-win32/WinMain.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) 2009 Patrick Gansterer (paroga@paroga.com) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - */ - -#include "config.h" -#include <wtf/Vector.h> -#include <winbase.h> -#include <winnls.h> -#include <wtf/UnusedParam.h> - -int main(int argc, char** argv); - -static inline char* convertToUtf8(LPCWSTR widecharString, int length) -{ - int requiredSize = WideCharToMultiByte(CP_UTF8, 0, widecharString, length, 0, 0, 0, 0); - char* multibyteString = new char[requiredSize + 1]; - - WideCharToMultiByte(CP_UTF8, 0, widecharString, length, multibyteString, requiredSize, 0, 0); - multibyteString[requiredSize] = '\0'; - - return multibyteString; -} - -int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) -{ - UNUSED_PARAM(hInstance); - UNUSED_PARAM(hPrevInstance); - UNUSED_PARAM(nCmdShow); - - Vector<char*> arguments; - TCHAR buffer[MAX_PATH]; - - int length = GetModuleFileNameW(0, buffer, MAX_PATH); - arguments.append(convertToUtf8(buffer, length)); - - WCHAR* commandLine = lpCmdLine; - while (commandLine[0] != '\0') { - int commandLineLength = 1; - WCHAR endChar = ' '; - - while (commandLine[0] == ' ') - ++commandLine; - - if (commandLine[0] == '\"') { - ++commandLine; - endChar = '\"'; - } - - while (commandLine[commandLineLength] != endChar && commandLine[commandLineLength] != '\0') - ++commandLineLength; - - arguments.append(convertToUtf8(commandLine, commandLineLength)); - - commandLine += commandLineLength; - if (endChar != ' ' && commandLine[0] != '\0') - ++commandLine; - } - - int res = main(arguments.size(), arguments.data()); - - for (size_t i = 0; i < arguments.size(); i++) - delete arguments[i]; - - return res; -} diff --git a/Source/JavaScriptCore/os-win32/inttypes.h b/Source/JavaScriptCore/os-win32/inttypes.h index af7390e98..5ecc2762a 100644 --- a/Source/JavaScriptCore/os-win32/inttypes.h +++ b/Source/JavaScriptCore/os-win32/inttypes.h @@ -38,11 +38,6 @@ #error "This inttypes.h file should only be compiled with MSVC" #endif -#ifdef WTF_COMPILER_MSVC7_OR_LOWER -// https://bugs.webkit.org/show_bug.cgi?id=76210 -#error "Visual Studio 2005 or newer is required" -#endif - #if _MSC_VER > 1000 #pragma once #endif diff --git a/Source/JavaScriptCore/os-win32/stdint.h b/Source/JavaScriptCore/os-win32/stdint.h deleted file mode 100644 index b5dff5660..000000000 --- a/Source/JavaScriptCore/os-win32/stdint.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (C) 2005, 2006 Apple Computer, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - */ - -#ifndef STDINT_WIN32_H -#define STDINT_WIN32_H - -#include <wtf/Platform.h> - -/* This file emulates enough of stdint.h on Windows to make JavaScriptCore and WebCore - compile using MSVC which does not ship with the stdint.h header. */ - -#if !COMPILER(MSVC) -#error "This stdint.h file should only be compiled with MSVC" -#endif - -#include <limits.h> - -typedef unsigned char uint8_t; -typedef signed char int8_t; -typedef unsigned short uint16_t; -typedef short int16_t; -typedef unsigned int uint32_t; -typedef int int32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) -#ifndef SIZE_MAX -#ifdef _WIN64 -#define SIZE_MAX _UI64_MAX -#else -#define SIZE_MAX _UI32_MAX -#endif -#endif -#endif - -#ifndef CASSERT -#define CASSERT(exp, name) typedef int dummy##name [(exp) ? 1 : -1]; -#endif - -CASSERT(sizeof(int8_t) == 1, int8_t_is_one_byte) -CASSERT(sizeof(uint8_t) == 1, uint8_t_is_one_byte) -CASSERT(sizeof(int16_t) == 2, int16_t_is_two_bytes) -CASSERT(sizeof(uint16_t) == 2, uint16_t_is_two_bytes) -CASSERT(sizeof(int32_t) == 4, int32_t_is_four_bytes) -CASSERT(sizeof(uint32_t) == 4, uint32_t_is_four_bytes) -CASSERT(sizeof(int64_t) == 8, int64_t_is_eight_bytes) -CASSERT(sizeof(uint64_t) == 8, uint64_t_is_eight_bytes) - -#endif |