Changeset 4511 for trunk/src/comdlg32/filetitle.c

Timestamp:

Oct 21, 2000, 8:42:42 PM (25 years ago)

Author:

sandervl

Message:

Merged with latest Wine version (Wine 20001002 level (10-21-2000))

File:

• trunk/src/comdlg32/filetitle.c (modified) (4 diffs)

trunk/src/comdlg32/filetitle.c

@@ -1 @@
-/* $Id: filetitle.c,v 1.3 2000-08-02 15:11:59 bird Exp $ */
 /*
  * COMMDLG - File Dialogs
@@ -5 +4 @@
  * Copyright 1994 Martin Ayotte
  * Copyright 1996 Albrecht Kleine
- *
- * Corel WINE 20000324 level
  */
 
@@ -16 +13 @@
 #include "debugtools.h"
 
-#include "heap.h"       /* Has to go */
+#include "heap.h"       /* Has to go */
 
 DEFAULT_DEBUG_CHANNEL(commdlg)
@@ -22 +19 @@
 #include "cdlg.h"
 
-#ifdef __WIN32OS2__
-#include <misc.h>
-#endif
-
 /***********************************************************************
- *      GetFileTitleA           (COMDLG32.8)
+ *      GetFileTitleA           (COMDLG32.8)
  *
  */
 short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, UINT cbBuf)
 {
-        int i, len;
+        int i, len;
 
-        TRACE("(%p %p %d); \n", lpFile, lpTitle, cbBuf);
+        TRACE("(%p %p %d); \n", lpFile, lpTitle, cbBuf);
 
-        if(lpFile == NULL || (lpTitle == NULL))
-                return -1;
+        if(lpFile == NULL || lpTitle == NULL)
+                return -1;
 
-        len = strlen(lpFile);
+        len = strlen(lpFile);
 
-        if (len == 0)
-                return -1;
+        if (len == 0)
+                return -1;
 
-        if(strpbrk(lpFile, "*[]"))
-                return -1;
+        if(strpbrk(lpFile, "*[]"))
+                return -1;
 
-        len--;
+        len--;
 
-        if(lpFile[len] == '/' || lpFile[len] == '\\' || lpFile[len] == ':')
-                return -1;
+        if(lpFile[len] == '/' || lpFile[len] == '\\' || lpFile[len] == ':')
+                return -1;
 
-        for(i = len; i >= 0; i--)
-        {
-                if (lpFile[i] == '/' ||  lpFile[i] == '\\' ||  lpFile[i] == ':')
-                {
-                        i++;
-                        break;
-                }
-        }
+        for(i = len; i >= 0; i--)
+        {
+                if (lpFile[i] == '/' ||  lpFile[i] == '\\' ||  lpFile[i] == ':')
+                {
+                        i++;
+                        break;
+                }
+        }
 
-        if(i == -1)
-                i++;
+        if(i == -1)
+                i++;
 
-        TRACE("---> '%s' \n", &lpFile[i]);
+        TRACE("---> '%s' \n", &lpFile[i]);
+    
+        len = strlen(lpFile+i)+1;
+        if(cbBuf < len)
+                return len;
 
-        len = strlen(lpFile+i)+1;
-        if(cbBuf < len)
-                return len;
-
-        strncpy(lpTitle,&lpFile[i],len);
-        return 0;
+        strncpy(lpTitle, &lpFile[i], len);
+        return 0;
 }
 
 
 /***********************************************************************
- *      GetFileTitleW           (COMDLG32.9)
+ *      GetFileTitleW           (COMDLG32.9)
  *
  */
 short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, UINT cbBuf)
 {
-        LPSTR file = HEAP_strdupWtoA(GetProcessHeap(), 0, lpFile);      /* Has to go */
-        LPSTR title = HeapAlloc(GetProcessHeap(), 0, cbBuf);
-        short   ret;
+        LPSTR file = HEAP_strdupWtoA(GetProcessHeap(), 0, lpFile);      /* Has to go */
+        LPSTR title = HeapAlloc(GetProcessHeap(), 0, cbBuf);
+        short   ret;
 
-        ret = GetFileTitleA(file, title, cbBuf);
+        ret = GetFileTitleA(file, title, cbBuf);
 
-        lstrcpynAtoW(lpTitle, title, cbBuf);
-        HeapFree(GetProcessHeap(), 0, file);
-        HeapFree(GetProcessHeap(), 0, title);
-        return ret;
+        lstrcpynAtoW(lpTitle, title, cbBuf);
+        HeapFree(GetProcessHeap(), 0, file);
+        HeapFree(GetProcessHeap(), 0, title);
+        return ret;
 }
 
 
+#ifndef __WIN32OS2__
 /***********************************************************************
- *      GetFileTitle16          (COMMDLG.27)
+ *      GetFileTitle16          (COMMDLG.27)
  */
 short WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf)
 {
-        return GetFileTitleA(lpFile, lpTitle, cbBuf);
+        return GetFileTitleA(lpFile, lpTitle, cbBuf);
 }
+#endif