skins2: assume Unicode filesystem on Windows
authorRémi Denis-Courmont <remi@remlab.net>
Tue, 18 Aug 2009 17:22:15 +0000 (20:22 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Tue, 18 Aug 2009 17:22:15 +0000 (20:22 +0300)
modules/gui/skins2/win32/win32_dragdrop.cpp

index 9d37ae4..9a9c3ab 100644 (file)
@@ -146,43 +146,22 @@ STDMETHODIMP Win32DragDrop::Drop( LPDATAOBJECT pDataObj, DWORD grfKeyState,
 
 void Win32DragDrop::HandleDrop( HDROP HDrop )
 {
-    if( GetVersion() < 0x80000000 )
-    {
-        // Use Unicode for Windows NT and above
-
-        // Get the number of dropped files
-        int nbFiles = DragQueryFileW( HDrop, 0xFFFFFFFF, NULL, 0 );
-
-        // For each dropped file
-        for( int i = 0; i < nbFiles; i++ )
-        {
-            // Get the name of the file
-            int nameLength = DragQueryFileW( HDrop, i, NULL, 0 ) + 1;
-            wchar_t *psz_fileName = new WCHAR[nameLength];
-            DragQueryFileW( HDrop, i, psz_fileName, nameLength );
-
-            // Add the file
-            CmdAddItem cmd(getIntf(),sFromWide(psz_fileName),m_playOnDrop);
-            cmd.execute();
+    // Get the number of dropped files
+    int nbFiles = DragQueryFileW( HDrop, 0xFFFFFFFF, NULL, 0 );
 
-            delete[] psz_fileName;
-        }
-    }
-    else
+    // For each dropped file
+    for( int i = 0; i < nbFiles; i++ )
     {
-        int nbFiles = DragQueryFile( HDrop, 0xFFFFFFFF, NULL, 0 );
-
-        for( int i = 0; i < nbFiles; i++ )
-        {
-            int nameLength = DragQueryFile( HDrop, i, NULL, 0 ) + 1;
-            char *psz_fileName = new char[nameLength];
-            DragQueryFile( HDrop, i, psz_fileName, nameLength );
+        // Get the name of the file
+        int nameLength = DragQueryFileW( HDrop, i, NULL, 0 ) + 1;
+        wchar_t *psz_fileName = new WCHAR[nameLength];
+        DragQueryFileW( HDrop, i, psz_fileName, nameLength );
 
-            CmdAddItem cmd(getIntf(),sFromLocale(psz_fileName),m_playOnDrop);
-            cmd.execute();
+        // Add the file
+        CmdAddItem cmd(getIntf(),sFromWide(psz_fileName),m_playOnDrop);
+        cmd.execute();
 
-            delete[] psz_fileName;
-        }
+        delete[] psz_fileName;
     }
 
     DragFinish( HDrop );