Changeset 8552

Timestamp:

Jun 2, 2002, 9:32:46 PM (23 years ago)

Author:

sandervl

Message:

Added automatic asii/unicode conversion to DragQueryFileA/W

File:

• trunk/src/shell32/shellole.c (modified) (2 diffs)

trunk/src/shell32/shellole.c

@@ -577 +577 @@
         lpDrop = (LPSTR) lpDropFileStruct + lpDropFileStruct->pFiles;
 
+    if(lpDropFileStruct->fWide == TRUE) {
+        LPWSTR lpszFileW = NULL;
+
+        if(lpszFile) {
+            lpszFileW = (LPWSTR) HeapAlloc(GetProcessHeap(), 0, lLength*sizeof(WCHAR));
+            if(lpszFileW == NULL) {
+                goto end;
+            }
+        }
+        i = DragQueryFileW(hDrop, lFile, lpszFileW, lLength);
+
+        if(lpszFileW) {
+            WideCharToMultiByte(CP_ACP, 0, lpszFileW, -1, lpszFile, lLength, 0, NULL);
+            HeapFree(GetProcessHeap(), 0, lpszFileW);
+        }
+        goto end;
+    }
+
         while (i++ < lFile)
         {
@@ -614 +632 @@
         if(!lpDropFileStruct) goto end;
 
+    if(lpDropFileStruct->fWide == FALSE) {
+        LPSTR lpszFileA = NULL;
+
+        if(lpszwFile) {
+            lpszFileA = (LPSTR) HeapAlloc(GetProcessHeap(), 0, lLength);
+            if(lpszFileA == NULL) {
+                goto end;
+            }
+        }
+        i = DragQueryFileA(hDrop, lFile, lpszFileA, lLength);
+
+        if(lpszFileA) {
+            MultiByteToWideChar(CP_ACP, 0, lpszFileA, -1, lpszwFile, lLength);
+            HeapFree(GetProcessHeap(), 0, lpszFileA);
+        }
+        goto end;
+    }
+
         lpwDrop = (LPWSTR) ((LPSTR)lpDropFileStruct + lpDropFileStruct->pFiles);