Changeset 31460 in webkit

Timestamp:

Mar 31, 2008 9:53:06 AM (16 years ago)

Author:

Adam Roben

Message:

Change PlatformFileTime on Windows to be time_t

This matches other platforms and our existing functions in
FileSystem.h. It will also let us get rid of PlatformFileTime
altogether.

Reviewed by Mitz Pettel.

• platform/FileSystem.h: Change PlatformFileTime to time_t on Windows.
• plugins/win/PluginDatabaseWin.cpp: (WebCore::addPluginsFromRegistry): Use getFileModificationTime to get the modification time to pass to PluginPackage::create. (WebCore::PluginDatabase::getPluginsInPaths): Ditto.
• plugins/win/PluginPackageWin.cpp: (WebCore::PluginPackage::hash): Updated to use m_lastModified as a time_t. (WebCore::PluginPackage::equal): Ditto.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/FileSystem.h (modified) (1 diff)
• plugins/win/PluginDatabaseWin.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-29  Adam Roben  <aroben@apple.com>
+
+        Change PlatformFileTime on Windows to be time_t
+
+        This matches other platforms and our existing functions in
+        FileSystem.h. It will also let us get rid of PlatformFileTime
+        altogether.
+
+        Reviewed by Mitz Pettel.
+
+        * platform/FileSystem.h: Change PlatformFileTime to time_t on Windows.
+        * plugins/win/PluginDatabaseWin.cpp:
+        (WebCore::addPluginsFromRegistry): Use getFileModificationTime to get
+        the modification time to pass to PluginPackage::create.
+        (WebCore::PluginDatabase::getPluginsInPaths): Ditto.
+        * plugins/win/PluginPackageWin.cpp:
+        (WebCore::PluginPackage::hash): Updated to use m_lastModified as a
+        time_t.
+        (WebCore::PluginPackage::equal): Ditto.
+
 2008-03-29  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/platform/FileSystem.h

@@ -48 +48 @@
 #if PLATFORM(WIN)
 typedef HANDLE PlatformFileHandle;
-typedef FILETIME PlatformFileTime;
+typedef time_t PlatformFileTime;
 typedef HMODULE PlatformModule;
 const PlatformFileHandle invalidPlatformFileHandle = INVALID_HANDLE_VALUE;

trunk/WebCore/plugins/win/PluginDatabaseWin.cpp

@@ -63 +63 @@
             continue;
 
-        WIN32_FILE_ATTRIBUTE_DATA attributes;
-        if (GetFileAttributesEx(pathStr, GetFileExInfoStandard, &attributes) == 0)
+        String path(pathStr, pathStrSize / sizeof(WCHAR) - 1);
+
+        time_t modifiedTime;
+        if (!getFileModificationTime(path, modifiedTime))
             continue;
 
-        RefPtr<PluginPackage> package = PluginPackage::createPackage(String(pathStr, pathStrSize / sizeof(WCHAR) - 1), attributes.ftLastWriteTime);
+        RefPtr<PluginPackage> package = PluginPackage::createPackage(path, modifiedTime);
 
         if (package)
@@ -109 +111 @@
             if (!uniqueFilenames.add(fullPath).second)
                 continue;
+
+            time_t modifiedTime;
+            if (!getFileModificationTime(fullPath, modifiedTime))
+                continue;
         
-            RefPtr<PluginPackage> pluginPackage = PluginPackage::createPackage(fullPath, findFileData.ftLastWriteTime);
+            RefPtr<PluginPackage> pluginPackage = PluginPackage::createPackage(fullPath, modifiedTime);
 
             if (pluginPackage) {