File qt5-qtwebkit-fix-building-with-gcc-12.patch of Package mingw64-libqt5-qtwebkit

Overview Repositories Revisions Requests Users Attributes Meta

File qt5-qtwebkit-fix-building-with-gcc-12.patch of Package mingw64-libqt5-qtwebkit (Revision a87f6c7781a0504bb463c719b8a41738)

Currently displaying revision a87f6c7781a0504bb463c719b8a41738 , Show latest

diff -ur qtwebkit-opensource-src-5.9.1/Source/WTF/wtf/text/WTFString.cpp qtwebkit-opensource-src-5.9.1/Source/WTF/wtf/text/WTFString.cpp
--- qtwebkit-opensource-src-5.9.1/Source/WTF/wtf/text/WTFString.cpp     2017-06-16 14:46:36.000000000 +0200
+++ qtwebkit-opensource-src-5.9.1/Source/WTF/wtf/text/WTFString.cpp    2023-05-12 00:01:09.781734498 +0200
@@ -45,6 +45,12 @@
 using namespace std;
 
 // Construct a string with UTF-16 data.
+String::String(const wchar_t* characters, unsigned length)
+    : m_impl(characters ? StringImpl::create((const UChar *)characters, length) : 0)
+{
+}
+
+// Construct a string with UTF-16 data.
 String::String(const UChar* characters, unsigned length)
     : m_impl(characters ? StringImpl::create(characters, length) : 0)
 {
diff -ur qtwebkit-opensource-src-5.9.1/Source/WTF/wtf/text/WTFString.h qtwebkit-opensource-src-5.9.1/Source/WTF/wtf/text/WTFString.h
--- qtwebkit-opensource-src-5.9.1/Source/WTF/wtf/text/WTFString.h       2017-06-16 14:46:36.000000000 +0200
+++ qtwebkit-opensource-src-5.9.1/Source/WTF/wtf/text/WTFString.h      2023-05-11 23:18:11.562634760 +0200
@@ -101,6 +101,9 @@
     String() { }
 
     // Construct a string with UTF-16 data.
+    WTF_EXPORT_STRING_API String(const wchar_t* characters, unsigned length);
+
+    // Construct a string with UTF-16 data.
     WTF_EXPORT_STRING_API String(const UChar* characters, unsigned length);
 
     // Construct a string by copying the contents of a vector.  To avoid
diff -ur qtwebkit-opensource-src-5.9.1/Source/WebCore/plugins/win/PluginDatabaseWin.cpp qtwebkit-opensource-src-5.9.1/Source/WebCore/plugins/win/PluginDatabaseWin.cpp
--- qtwebkit-opensource-src-5.9.1/Source/WebCore/plugins/win/PluginDatabaseWin.cpp      2017-06-16 14:46:36.000000000 +0200
+++ qtwebkit-opensource-src-5.9.1/Source/WebCore/plugins/win/PluginDatabaseWin.cpp     2023-05-12 14:59:31.481985149 +0200
@@ -115,7 +115,7 @@
     for (Vector<String>::const_iterator it = m_pluginDirectories.begin(); it != end; ++it) {
         String pattern = *it + "\\*";
 
-        hFind = FindFirstFileW(pattern.charactersWithNullTermination().data(), &findFileData);
+        hFind = FindFirstFileW((LPCWSTR)pattern.charactersWithNullTermination().data(), &findFileData);
 
         if (hFind == INVALID_HANDLE_VALUE)
             continue;
@@ -215,7 +215,7 @@
             HKEY extensionsKey;
 
             // Try opening the key
-            result = RegOpenKeyEx(key, extensionsPath.charactersWithNullTermination().data(), 0, KEY_READ, &extensionsKey);
+            result = RegOpenKeyEx(key, (LPCWSTR)extensionsPath.charactersWithNullTermination().data(), 0, KEY_READ, &extensionsKey);
 
             if (result == ERROR_SUCCESS) {
                 // Now get the plugins directory
@@ -305,7 +305,7 @@
         DWORD acrobatInstallPathSize = sizeof(acrobatInstallPathStr);
 
         String acrobatPluginKeyPath = "Software\\Adobe\\Acrobat Reader\\" + latestAcrobatVersionString + "\\InstallPath";
-        result = getRegistryValue(HKEY_LOCAL_MACHINE, acrobatPluginKeyPath.charactersWithNullTermination().data(), 0, &type, acrobatInstallPathStr, &acrobatInstallPathSize);
+        result = getRegistryValue(HKEY_LOCAL_MACHINE, (LPCWSTR)acrobatPluginKeyPath.charactersWithNullTermination().data(), 0, &type, acrobatInstallPathStr, &acrobatInstallPathSize);
 
         if (result == ERROR_SUCCESS) {
             String acrobatPluginDirectory = String(acrobatInstallPathStr, acrobatInstallPathSize / sizeof(WCHAR) - 1) + "\\browser";
@@ -352,10 +352,10 @@
         DWORD useNewPluginSize;
 
         String javaPluginKeyPath = "Software\\JavaSoft\\Java Plug-in\\" + latestJavaVersionString;
-        result = getRegistryValue(HKEY_LOCAL_MACHINE, javaPluginKeyPath.charactersWithNullTermination().data(), L"UseNewJavaPlugin", &type, &useNewPluginValue, &useNewPluginSize);
+        result = getRegistryValue(HKEY_LOCAL_MACHINE, (LPCWSTR)javaPluginKeyPath.charactersWithNullTermination().data(), L"UseNewJavaPlugin", &type, &useNewPluginValue, &useNewPluginSize);
 
         if (result == ERROR_SUCCESS && useNewPluginValue == 1) {
-            result = getRegistryValue(HKEY_LOCAL_MACHINE, javaPluginKeyPath.charactersWithNullTermination().data(), L"JavaHome", &type, javaInstallPathStr, &javaInstallPathSize);
+            result = getRegistryValue(HKEY_LOCAL_MACHINE, (LPCWSTR)javaPluginKeyPath.charactersWithNullTermination().data(), L"JavaHome", &type, javaInstallPathStr, &javaInstallPathSize);
             if (result == ERROR_SUCCESS) {
                 String javaPluginDirectory = String(javaInstallPathStr, javaInstallPathSize / sizeof(WCHAR) - 1) + "\\bin\\new_plugin";
                 directories.append(javaPluginDirectory);
@@ -383,7 +383,7 @@
         if (!PathRemoveFileSpec(moduleFileNameStr))
             goto exit;
 
-        pluginsDirectory = String(moduleFileNameStr) + "\\Plugins";
+        pluginsDirectory = String((UCHAR*)moduleFileNameStr) + "\\Plugins";
     }
 exit:
     return pluginsDirectory;
@@ -400,10 +400,10 @@
     WCHAR macromediaDirectoryStr[MAX_PATH];
 
     PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Flash"));
-    directories.append(macromediaDirectoryStr);
+    directories.append((UCHAR*)macromediaDirectoryStr);
 
     PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Shockwave 10"));
-    directories.append(macromediaDirectoryStr);
+    directories.append((UCHAR*)macromediaDirectoryStr);
 #endif
 }
 
diff -ur qtwebkit-opensource-src-5.9.1/Source/WebCore/plugins/win/PluginPackageWin.cpp qtwebkit-opensource-src-5.9.1/Source/WebCore/plugins/win/PluginPackageWin.cpp
--- qtwebkit-opensource-src-5.9.1/Source/WebCore/plugins/win/PluginPackageWin.cpp       2017-06-16 14:46:36.000000000 +0200
+++ qtwebkit-opensource-src-5.9.1/Source/WebCore/plugins/win/PluginPackageWin.cpp      2023-05-12 15:08:02.752633582 +0200
@@ -47,7 +47,7 @@
     UINT bufferLength;
     String subInfo = "\\StringfileInfo\\040904E4\\" + info;
     bool retval = VerQueryValueW(versionInfoData,
-        const_cast<UChar*>(subInfo.charactersWithNullTermination().data()),
+        (LPCWSTR)subInfo.charactersWithNullTermination().data(),
         &buffer, &bufferLength);
     if (!retval || bufferLength == 0)
         return String();
@@ -173,13 +173,13 @@
 bool PluginPackage::fetchInfo()
 {
     DWORD versionInfoSize, zeroHandle;
-    versionInfoSize = GetFileVersionInfoSizeW(const_cast<UChar*>(m_path.charactersWithNullTermination().data()), &zeroHandle);
+    versionInfoSize = GetFileVersionInfoSizeW((LPCWSTR)m_path.charactersWithNullTermination().data(), &zeroHandle);
     if (versionInfoSize == 0)
         return false;
 
     OwnArrayPtr<char> versionInfoData = adoptArrayPtr(new char[versionInfoSize]);
 
-    if (!GetFileVersionInfoW(const_cast<UChar*>(m_path.charactersWithNullTermination().data()),
+    if (!GetFileVersionInfoW((LPCWSTR)m_path.charactersWithNullTermination().data(),
             0, versionInfoSize, versionInfoData.get()))
         return false;
 
@@ -244,7 +244,7 @@
         return true;
     } else {
 #if OS(WINCE)
-        m_module = ::LoadLibraryW(m_path.charactersWithNullTermination().data());
+        m_module = ::LoadLibraryW((LPCWSTR)m_path.charactersWithNullTermination().data());
 #else
         WCHAR currentPath[MAX_PATH];
 
@@ -253,11 +253,11 @@
 
         String path = m_path.substring(0, m_path.reverseFind('\\'));
 
-        if (!::SetCurrentDirectoryW(path.charactersWithNullTermination().data()))
+        if (!::SetCurrentDirectoryW((LPCWSTR)path.charactersWithNullTermination().data()))
             return false;
 
         // Load the library
-        m_module = ::LoadLibraryExW(m_path.charactersWithNullTermination().data(), 0, LOAD_WITH_ALTERED_SEARCH_PATH);
+        m_module = ::LoadLibraryExW((LPCWSTR)m_path.charactersWithNullTermination().data(), 0, LOAD_WITH_ALTERED_SEARCH_PATH);
 
         if (!::SetCurrentDirectoryW(currentPath)) {
             if (m_module)
diff -ur qtwebkit-opensource-src-5.9.1/Source/WebCore/plugins/win/PluginViewWin.cpp qtwebkit-opensource-src-5.9.1/Source/WebCore/plugins/win/PluginViewWin.cpp
--- qtwebkit-opensource-src-5.9.1/Source/WebCore/plugins/win/PluginViewWin.cpp  2017-06-16 14:46:36.000000000 +0200
+++ qtwebkit-opensource-src-5.9.1/Source/WebCore/plugins/win/PluginViewWin.cpp 2023-05-12 15:09:10.184399978 +0200
@@ -912,13 +912,13 @@
 
     // Get file info
     WIN32_FILE_ATTRIBUTE_DATA attrs;
-    if (GetFileAttributesExW(filename.charactersWithNullTermination().data(), GetFileExInfoStandard, &attrs) == 0)
+    if (GetFileAttributesExW((LPCWSTR)filename.charactersWithNullTermination().data(), GetFileExInfoStandard, &attrs) == 0)
         return NPERR_FILE_NOT_FOUND;
 
     if (attrs.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
         return NPERR_FILE_NOT_FOUND;
 
-    HANDLE fileHandle = CreateFileW(filename.charactersWithNullTermination().data(), FILE_READ_DATA, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
+    HANDLE fileHandle = CreateFileW((LPCWSTR)filename.charactersWithNullTermination().data(), FILE_READ_DATA, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
     
     if (fileHandle == INVALID_HANDLE_VALUE)
         return NPERR_FILE_NOT_FOUND;
diff -ur qtwebkit-opensource-src-5.9.1/Source/WebCore/plugins/win/PluginViewWin.cpp qtwebkit-opensource-src-5.9.1/Source/WebCore/plugins/win/PluginViewWin.cpp
--- qtwebkit-opensource-src-5.9.1/Source/WebCore/plugins/win/PluginViewWin.cpp     2017-06-16 14:46:36.000000000 +0200
+++ qtwebkit-opensource-src-5.9.1/Source/WebCore/plugins/win/PluginViewWin.cpp  2023-05-14 19:12:21.967667187 +0200
@@ -926,7 +926,7 @@
     buffer.resize(attrs.nFileSizeLow);
 
     DWORD bytesRead;
-    int retval = ReadFile(fileHandle, buffer.data(), attrs.nFileSizeLow, &bytesRead, 0);
+    int retval = ReadFile((HANDLE)fileHandle, buffer.data(), attrs.nFileSizeLow, &bytesRead, 0);
 
     CloseHandle(fileHandle);
 
diff -ur qtwebkit-opensource-src-5.9.1.orig/Source/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp qtwebkit-opensource-src-5.9.1/Source/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp
--- qtwebkit-opensource-src-5.9.1/Source/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp    2017-06-16 14:46:36.000000000 +0200
+++ qtwebkit-opensource-src-5.9.1/Source/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp 2023-05-21 13:23:26.958034693 +0200
@@ -45,7 +45,7 @@
         unsigned uniqueID = randomNumber() * std::numeric_limits<unsigned>::max();
         pipeName = String::format("\\\\.\\pipe\\com.apple.WebKit.%x", uniqueID);
 
-        serverIdentifier = ::CreateNamedPipe(pipeName.charactersWithNullTermination().data(),
+        serverIdentifier = ::CreateNamedPipe((LPCWSTR)pipeName.charactersWithNullTermination().data(),
                                              PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE | FILE_FLAG_OVERLAPPED,
                                              PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, 1, inlineMessageMaxSize, inlineMessageMaxSize,
                                              0, 0);
@@ -60,7 +60,7 @@
     if (!serverIdentifier)
         return false;
 
-    clientIdentifier = ::CreateFileW(pipeName.charactersWithNullTermination().data(), GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0);
+    clientIdentifier = ::CreateFileW((LPCWSTR)pipeName.charactersWithNullTermination().data(), GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0);
     if (!clientIdentifier) {
         ::CloseHandle(serverIdentifier);
         return false;

Places

File qt5-qtwebkit-fix-building-with-gcc-12.patch of Package mingw64-libqt5-qtwebkit (Revision a87f6c7781a0504bb463c719b8a41738)

Places