Changeset 5583 for trunk/src

Timestamp:

Apr 24, 2001, 10:37:25 PM (24 years ago)

Author:

sandervl

Message:

Wine resync

Location:

trunk/src/comdlg32

Files:

• colordlg.c (modified) (3 diffs)
• comdlgguid.cpp (modified) (2 diffs)
• filedlg.c (modified) (6 diffs)
• filedlg95.c (modified) (44 diffs)
• filedlgbrowser.c (modified) (10 diffs)
• fontdlg.c (modified) (1 diff)
• makefile (modified) (2 diffs)

trunk/src/comdlg32/colordlg.c

@@ -870 +870 @@
    if (!(lpp->lpcc->Flags & CC_SHOWHELP))
       ShowWindow( GetDlgItem(hDlg,0x40e), SW_HIDE);
-   lpp->msetrgb = RegisterWindowMessageA(SETRGBSTRING);
+   lpp->msetrgb = RegisterWindowMessageA(SETRGBSTRINGA);
 
 #if 0
@@ -1057 +1057 @@
 
           case 0x40e:           /* Help! */ /* The Beatles, 1965  ;-) */
-               i = RegisterWindowMessageA(HELPMSGSTRING);
+               i = RegisterWindowMessageA(HELPMSGSTRINGA);
 #ifndef __WIN32OS2__
                if (lpp->lpcc16)
@@ -1081 +1081 @@
 
           case IDOK :
-                cokmsg = RegisterWindowMessageA(COLOROKSTRING);
+                cokmsg = RegisterWindowMessageA(COLOROKSTRINGA);
 #ifndef __WIN32OS2__
                 if (lpp->lpcc16)

trunk/src/comdlg32/comdlgguid.cpp

@@ -1 @@
-/* $Id: comdlgguid.cpp,v 1.1 1999-11-02 19:09:42 sandervl Exp $ */
+/* $Id: comdlgguid.cpp,v 1.2 2001-04-24 20:37:24 sandervl Exp $ */
 
 /*****************************************************************************
@@ -25 +25 @@
 #include <wine/obj_shellextinit.h>
 #include <wine/obj_shellbrowser.h>
+#include <wine/obj_serviceprovider.h>
 #include <docobj.h>
 

trunk/src/comdlg32/filedlg.c

@@ -135 +135 @@
         if (!hNet) hNet = LoadImageA(0, MAKEINTRESOURCEA(OIC_NETWORK), IMAGE_ICON, 16, 16, LR_SHARED);
 #else
-        if (!hFolder) hFolder = LoadIconA(0, MAKEINTRESOURCEA(OIC_FOLDER));
-        if (!hFolder2) hFolder2 = LoadIconA(0, MAKEINTRESOURCEA(OIC_FOLDER2));
-        if (!hFloppy) hFloppy = LoadIconA(0, MAKEINTRESOURCEA(OIC_FLOPPY));
-        if (!hHDisk) hHDisk = LoadIconA(0, MAKEINTRESOURCEA(OIC_HDISK));
-        if (!hCDRom) hCDRom = LoadIconA(0, MAKEINTRESOURCEA(OIC_CDROM));
-        if (!hNet) hNet = LoadIconA(0, MAKEINTRESOURCEA(OIC_NETWORK));
+        HINSTANCE inst = GetModuleHandleA( "comdlg32.dll" );
+        if (!inst)
+        {
+            ERR( "cannot get comdlg32.dll instance\n" );
+            return FALSE;
+        }
+        hFolder  = LoadImageA( inst, "FOLDER", IMAGE_ICON, 16, 16, LR_SHARED );
+        hFolder2 = LoadImageA( inst, "FOLDER2", IMAGE_ICON, 16, 16, LR_SHARED );
+        hFloppy  = LoadImageA( inst, "FLOPPY", IMAGE_ICON, 16, 16, LR_SHARED );
+        hHDisk   = LoadImageA( inst, "HDISK", IMAGE_ICON, 16, 16, LR_SHARED );
+        hCDRom   = LoadImageA( inst, "CDROM", IMAGE_ICON, 16, 16, LR_SHARED );
+        hNet     = LoadImageA( inst, "NETWORK", IMAGE_ICON, 16, 16, LR_SHARED );
 #endif
         if (hFolder == 0 || hFolder2 == 0 || hFloppy == 0 || 
@@ -1318 +1324 @@
     else
         lfs->open = FALSE;
-    lfs->lbselchstring = RegisterWindowMessageA(LBSELCHSTRING);
-    lfs->fileokstring = RegisterWindowMessageA(FILEOKSTRING);
+    lfs->lbselchstring = RegisterWindowMessageA(LBSELCHSTRINGA);
+    lfs->fileokstring = RegisterWindowMessageA(FILEOKSTRINGA);
     switch(type)
     {
@@ -1677 +1683 @@
 {
     BOOL  newlook = TRUE; /* FIXME: TWEAK_WineLook */
+    COMDLG32_SetCommDlgExtendedError(0);
 
 #ifdef __WIN32OS2__
@@ -1712 +1719 @@
 {
     BOOL  newlook = TRUE; /* FIXME: TWEAK_WineLook */
+    COMDLG32_SetCommDlgExtendedError(0);
 
 #ifdef __WIN32OS2__
@@ -1747 +1755 @@
 {
     BOOL  newlook = TRUE; /* FIXME: TWEAK_WineLook */
+    COMDLG32_SetCommDlgExtendedError(0);
 
 #ifdef __WIN32OS2__
@@ -1782 +1791 @@
 {
     BOOL  newlook = TRUE; /* FIXME: TWEAK_WineLook */
+    COMDLG32_SetCommDlgExtendedError(0);
 
 #ifdef __WIN32OS2__

trunk/src/comdlg32/filedlg95.c

@@ -45 +45 @@
 #define MapHModuleSL(a) a
 #define MapHModuleLS(a) a
+#define snprintf  wsnprintfA
 #endif
 
@@ -54 +55 @@
 #include "winbase.h"
 #include "ntddk.h"
-#include "wine/winestring.h"
-#include "ldt.h"
+#include "winnls.h"
 #include "heap.h"
 #include "commdlg.h"
@@ -62 +62 @@
 #include "debugtools.h"
 #include "cderr.h"
-#include "tweak.h"
-#include "winnls.h"
 #include "shellapi.h"
 #include "shlguid.h"
@@ -75 +73 @@
 (OFN_CREATEPROMPT | OFN_DONTADDTORECENT |\
 OFN_ENABLEINCLUDENOTIFY | OFN_ENABLESIZING | OFN_EXTENSIONDIFFERENT |\
-OFN_NODEREFERENCELINKS | OFN_NOREADONLYRETURN | \
+OFN_NODEREFERENCELINKS | OFN_NOREADONLYRETURN |\
 OFN_NOTESTFILECREATE | OFN_OVERWRITEPROMPT /*| OFN_USEMONIKERS*/)
 
@@ -257 +255 @@
     if (IsHooked(fodInfos))
     {
-      fodInfos->HookMsg.fileokstring = RegisterWindowMessageA(FILEOKSTRING);
-      fodInfos->HookMsg.lbselchstring = RegisterWindowMessageA(LBSELCHSTRING);
-      fodInfos->HookMsg.helpmsgstring = RegisterWindowMessageA(HELPMSGSTRING);
-      fodInfos->HookMsg.sharevistring = RegisterWindowMessageA(SHAREVISTRING);
+      fodInfos->HookMsg.fileokstring = RegisterWindowMessageA(FILEOKSTRINGA);
+      fodInfos->HookMsg.lbselchstring = RegisterWindowMessageA(LBSELCHSTRINGA);
+      fodInfos->HookMsg.helpmsgstring = RegisterWindowMessageA(HELPMSGSTRINGA);
+      fodInfos->HookMsg.sharevistring = RegisterWindowMessageA(SHAREVISTRINGA);
     }
     
@@ -368 +366 @@
   if(arg) \
   { \
+    DWORD _len = WideCharToMultiByte( CP_ACP, 0, arg, -1, NULL, 0, NULL, NULL ); \
     save = arg; \
-    arg =  MemAlloc(lstrlenW(arg)); \
-    lstrcpyWtoA((LPSTR)arg, save); \
+    arg =  MemAlloc(_len); \
+    WideCharToMultiByte( CP_ACP, 0, save, -1, (LPSTR)arg, _len, NULL, NULL ); \
   }
 
@@ -391 +390 @@
   if(arg) \
   { \
-    lstrcpynAtoW(save, (LPCSTR)arg, len); \
+    MultiByteToWideChar( CP_ACP, 0, (LPCSTR)(arg), -1, (save), (len) ); \
     MemFree(arg); \
     arg = save; \
@@ -401 +400 @@
   FileOpenDlgInfos *fodInfos;
   HINSTANCE hInstance;
+  
+  /* out arguments */
+  LPWSTR lpstrFile = NULL;
+  LPWSTR lpstrFileTitle = NULL;
 #ifdef __WIN32OS2__
   LPSTR lpstrSavDir = NULL;
 #endif
-  /* out arguments */
-  LPWSTR lpstrFile = NULL;
-  LPWSTR lpstrFileTitle = NULL;
 
   /* in/out arguments */
@@ -430 +430 @@
   {
     LPCWSTR  s;
-    LPSTR x, y;
-    int n;
+    LPSTR y;
+    int n, len;
 
     lpstrFilter = ofn->lpstrFilter;
@@ -438 +438 @@
     s = ofn->lpstrFilter;
     
-    while (*s) s = s+lstrlenW(s)+1;
+    while (*s) s = s+strlenW(s)+1;
     s++;
     n = s - ofn->lpstrFilter; /* already divides by 2. ptr magic */
-    x = y = (LPSTR)MemAlloc(n);
-    s = (LPWSTR)ofn->lpstrFilter;
-    while (*s)
-    {
-      lstrcpyWtoA(x,s);
-      x+=strlen(x)+1;
-      s+=lstrlenW(s)+1;
-    }
-    *x=0;
+    len = WideCharToMultiByte( CP_ACP, 0, ofn->lpstrFilter, n, NULL, 0, NULL, NULL );
+    y = (LPSTR)MemAlloc(len);
+    WideCharToMultiByte( CP_ACP, 0, ofn->lpstrFilter, n, y, len, NULL, NULL );
 #ifdef __WIN32OS2__
     ofn->lpstrFilter = (LPWSTR)y;
@@ -461 +455 @@
   {
     LPWSTR  s;
-    LPSTR x,y;
-    int n;
+    LPSTR y;
+    int n, len;
 
     lpstrCustomFilter = ofn->lpstrCustomFilter;
     /* filter is a list...  title\0ext\0......\0\0 */
     s = ofn->lpstrCustomFilter;
-    while (*s) s = s+lstrlenW(s)+1;
+    while (*s) s = s+strlenW(s)+1;
     s++;
     n = s - ofn->lpstrCustomFilter;
-    x = y = (LPSTR)MemAlloc(n);
-    s = ofn->lpstrCustomFilter;
-    while (*s)
-    {
-      lstrcpyWtoA(x,s);
-      x+=strlen(x)+1;
-      s+=lstrlenW(s)+1;
-    }
-    *x=0;
+    len = WideCharToMultiByte( CP_ACP, 0, ofn->lpstrCustomFilter, n, NULL, 0, NULL, NULL );
+    y = (LPSTR)MemAlloc(len);
+    WideCharToMultiByte( CP_ACP, 0, ofn->lpstrCustomFilter, n, y, len, NULL, NULL );
 #ifdef __WIN32OS2__
     ofn->lpstrCustomFilter = (LPWSTR)y;
@@ -791 +779 @@
 
     if(fodInfos->ofnInfos->Flags & OFN_UNICODE)
-      FIXME("sending OPENFILENAMEA structure. Hook is expecting OPENFILENAMEW!");
+      FIXME("sending OPENFILENAMEA structure. Hook is expecting OPENFILENAMEW!\n");
 
     if(fodInfos->DlgInfos.hwndCustomDlg)
@@ -826 +814 @@
         case CDM_GETFILEPATH:
             GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
-            lpstrFileSpec = (LPSTR)COMDLG32_PathFindFileNameA(lpstrPath);
+            lpstrFileSpec = (LPSTR)PathFindFileNameA(lpstrPath);
             if (lpstrFileSpec==lpstrPath) 
             {
                 char lpstrCurrentDir[MAX_PATH];
                 /* Prepend the current path */
-                COMDLG32_SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrCurrentDir);
+                SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrCurrentDir);
                 if ((LPSTR)lParam!=NULL)
-                    wsnprintfA((LPSTR)lParam,(int)wParam,"%s\\%s",lpstrCurrentDir,lpstrPath);
+                    snprintf((LPSTR)lParam,(int)wParam,"%s\\%s",lpstrCurrentDir,lpstrPath);
                 reqSize=strlen(lpstrCurrentDir)+1+strlen(lpstrPath)+1;
             } 
@@ -845 +833 @@
 
         case CDM_GETFOLDERPATH:
-            COMDLG32_SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrPath);
+            SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrPath);
             if ((LPSTR)lParam!=NULL)
                 lstrcpynA((LPSTR)lParam,lpstrPath,(int)wParam);
@@ -852 +840 @@
         case CDM_GETSPEC:
             reqSize=GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
-            lpstrFileSpec = (LPSTR)COMDLG32_PathFindFileNameA(lpstrPath);
+            lpstrFileSpec = (LPSTR)PathFindFileNameA(lpstrPath);
             if ((LPSTR)lParam!=NULL)
                 lstrcpynA((LPSTR)lParam, lpstrFileSpec, (int)wParam);
@@ -898 +886 @@
          FILEDLG95_FillControls(hwnd, wParam, lParam);
          SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE);
+         SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM,
+                      0,0,0,0, SWP_NOMOVE|SWP_NOSIZE);
          return 0;
        }
@@ -1037 +1027 @@
   if(fodInfos->ofnInfos->lpstrFile)
   {
-      LPSTR lpstrFile = COMDLG32_PathFindFileNameA(fodInfos->ofnInfos->lpstrFile);
+      LPSTR lpstrFile = PathFindFileNameA(fodInfos->ofnInfos->lpstrFile);
       SetDlgItemTextA(hwnd, IDC_FILENAME, lpstrFile);
   }
@@ -1238 +1228 @@
   lpstrFile[0] = '\0';
   
-  COMDLG32_SHGetPathFromIDListA( fodInfos->ShellInfos.pidlAbsCurrent, lpstrPathSpec );
+  SHGetPathFromIDListA( fodInfos->ShellInfos.pidlAbsCurrent, lpstrPathSpec );
 
   if ( !(fodInfos->ofnInfos->Flags & OFN_NOVALIDATE) &&
@@ -1351 +1341 @@
 
   /* Get the current directory name */
-  if (!COMDLG32_SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent, lpstrPathAndFile))
+  if (!SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent, lpstrPathAndFile))
   {
     /* we are in a special folder, default to desktop */
-    if(FAILED(COMDLG32_SHGetFolderPathA(hwnd, CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE, NULL, 0, lpstrPathAndFile)))
+    if(FAILED(COMDLG32_SHGetFolderPathA(hwnd, CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE, 0, 0, lpstrPathAndFile)))
     {
       /* last fallback */
@@ -1360 +1350 @@
     }
   }
-  COMDLG32_PathAddBackslashA(lpstrPathAndFile);
+  PathAddBackslashA(lpstrPathAndFile);
 
   TRACE("current directory=%s\n", lpstrPathAndFile);
 
   /* if the user specifyed a fully qualified path use it */
-  if(COMDLG32_PathIsRelativeA(lpstrFileList))
+  if(PathIsRelativeA(lpstrFileList))
   {
     strcat(lpstrPathAndFile, lpstrFileList);
@@ -1372 +1362 @@
   {
     /* does the path have a drive letter? */
-    if (COMDLG32_PathGetDriveNumberA(lpstrFileList) == -1)
+    if (PathGetDriveNumberA(lpstrFileList) == -1)
       strcpy(lpstrPathAndFile+2, lpstrFileList);
     else
@@ -1379 +1369 @@
 
   /* resolve "." and ".." */
-  COMDLG32_PathCanonicalizeA(lpstrTemp, lpstrPathAndFile );
+  PathCanonicalizeA(lpstrTemp, lpstrPathAndFile );
   strcpy(lpstrPathAndFile, lpstrTemp);
   TRACE("canon=%s\n", lpstrPathAndFile);
@@ -1412 +1402 @@
     }
 
-    if (FAILED (COMDLG32_SHGetDesktopFolder(&lpsf))) return FALSE;
+    if (FAILED (SHGetDesktopFolder(&lpsf))) return FALSE;
   
     lpszTemp1 = lpszTemp = lpstrPathAndFile;
@@ -1421 +1411 @@
       DWORD dwEaten, dwAttributes;
 
-      lpszTemp = COMDLG32_PathFindNextComponentA(lpszTemp);
+      lpszTemp = PathFindNextComponentA(lpszTemp);
 
       if (!lpszTemp) break; /* end of path */
 
       if(*lpszTemp)
-        lstrcpynAtoW(lpwstrTemp, lpszTemp1, lpszTemp - lpszTemp1);
+      {
+          DWORD len = MultiByteToWideChar( CP_ACP, 0, lpszTemp1, lpszTemp - lpszTemp1,
+                                           lpwstrTemp, MAX_PATH );
+          lpwstrTemp[len] = 0;
+      }
       else
       {
-        lstrcpyAtoW(lpwstrTemp, lpszTemp1);     /* last element */
+          MultiByteToWideChar( CP_ACP, 0, lpszTemp1, -1,
+                               lpwstrTemp, sizeof(lpwstrTemp)/sizeof(WCHAR) );
 
         /* if the last element is a wildcard do a search */
@@ -1442 +1437 @@
       TRACE("parse now=%s next=%s sf=%p\n",debugstr_w(lpwstrTemp), debugstr_a(lpszTemp), lpsf);
 
-      if(lstrlenW(lpwstrTemp)==2) COMDLG32_PathAddBackslashW(lpwstrTemp);
+      if(lstrlenW(lpwstrTemp)==2) PathAddBackslashW(lpwstrTemp);
 
       dwAttributes = SFGAO_FOLDER;
@@ -1513 +1508 @@
       {
         int iPos;
-        LPSTR lpszTemp = COMDLG32_PathFindFileNameA(lpstrPathAndFile);
+        LPSTR lpszTemp = PathFindFileNameA(lpstrPathAndFile);
+        DWORD len;
 
         /* replace the current filter */
         if(fodInfos->ShellInfos.lpstrCurrentFilter)
           MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter);
-        fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc((strlen(lpszTemp)+1)*sizeof(WCHAR));
-        lstrcpyAtoW(fodInfos->ShellInfos.lpstrCurrentFilter, lpszTemp);
+        len = MultiByteToWideChar( CP_ACP, 0, lpszTemp, -1, NULL, 0 );
+        fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc(len * sizeof(WCHAR));
+        MultiByteToWideChar( CP_ACP, 0, lpszTemp, -1,
+                             fodInfos->ShellInfos.lpstrCurrentFilter, len );
 
         /* set the filter cb to the extension when possible */
@@ -1554 +1552 @@
         if (fodInfos->ofnInfos->lpstrDefExt)
         {
-          if (! *COMDLG32_PathFindExtensionA(lpstrPathAndFile))
+          if (! *PathFindExtensionA(lpstrPathAndFile))
           {
             strcat(lpstrPathAndFile, ".");
@@ -1561 +1559 @@
         }
 
-        /* Check that size size of the file does not exceed buffer size */
-        if(strlen(lpstrPathAndFile) < fodInfos->ofnInfos->nMaxFile)
+        /* Check that the size of the file does not exceed buffer size.
+             (Allow for extra \0 if OFN_MULTISELECT is set.) */
+        if(strlen(lpstrPathAndFile) < fodInfos->ofnInfos->nMaxFile -
+            ((fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT) ? 1 : 0))
         {
           LPSTR lpszTemp;
@@ -1568 +1568 @@
           /* fill destination buffer */
           strcpy(fodInfos->ofnInfos->lpstrFile, lpstrPathAndFile);
+          if (fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT)
+            fodInfos->ofnInfos->lpstrFile[strlen(fodInfos->ofnInfos->lpstrFile)
+                + 1] = '\0';
 
           /* set filename offset */
-          lpszTemp = COMDLG32_PathFindFileNameA(lpstrPathAndFile);
+          lpszTemp = PathFindFileNameA(lpstrPathAndFile);
           fodInfos->ofnInfos->nFileOffset = lpszTemp - lpstrPathAndFile;
  
           /* set extension offset */
-          lpszTemp = COMDLG32_PathFindExtensionA(lpstrPathAndFile);
+          lpszTemp = PathFindExtensionA(lpstrPathAndFile);
           fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? lpszTemp - lpstrPathAndFile + 1 : 0;
     
@@ -1580 +1583 @@
           if(fodInfos->ofnInfos->lpstrFileTitle)
           {
-            LPSTR lpstrFileTitle = COMDLG32_PathFindFileNameA(lpstrPathAndFile);
+            LPSTR lpstrFileTitle = PathFindFileNameA(lpstrPathAndFile);
             strncpy(fodInfos->ofnInfos->lpstrFileTitle, lpstrFileTitle, fodInfos->ofnInfos->nMaxFileTitle);
           }
@@ -1725 +1728 @@
   TRACE("\n");
 
-  COMDLG32_SHGetSpecialFolderLocation(0,CSIDL_DESKTOP,&pidl);
+  SHGetSpecialFolderLocation(0,CSIDL_DESKTOP,&pidl);
   hres = IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidl, SBSP_ABSOLUTE);
   COMDLG32_SHFree(pidl);
@@ -1820 +1823 @@
     if(lpstrFilter)
     {
+      DWORD len;
       _strlwr(lpstrFilter);     /* lowercase */
-      fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc((strlen(lpstrFilter)+1)*2);
-      lstrcpyAtoW(fodInfos->ShellInfos.lpstrCurrentFilter, lpstrFilter);
+      len = MultiByteToWideChar( CP_ACP, 0, lpstrFilter, -1, NULL, 0 );
+      fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc( len * sizeof(WCHAR) );
+      MultiByteToWideChar( CP_ACP, 0, lpstrFilter, -1,
+                           fodInfos->ShellInfos.lpstrCurrentFilter, len );
     }
   }
@@ -1858 +1864 @@
       if((int)lpstrFilter != CB_ERR)
       {
-        fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc((strlen(lpstrFilter)+1)*2);
-        lstrcpyAtoW(fodInfos->ShellInfos.lpstrCurrentFilter,_strlwr(lpstrFilter));
-        SendCustomDlgNotificationMessage(hwnd,CDN_TYPECHANGE);
+          DWORD len;
+          _strlwr(lpstrFilter); /* lowercase */
+          len = MultiByteToWideChar( CP_ACP, 0, lpstrFilter, -1, NULL, 0 );
+          fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc( len * sizeof(WCHAR) );
+          MultiByteToWideChar( CP_ACP, 0, lpstrFilter, -1,
+                               fodInfos->ShellInfos.lpstrCurrentFilter, len );
+          SendCustomDlgNotificationMessage(hwnd,CDN_TYPECHANGE);
       }
 
@@ -1943 +1953 @@
 
   /* Initialise data of Desktop folder */
-  COMDLG32_SHGetSpecialFolderLocation(0,CSIDL_DESKTOP,&pidlTmp);
+  SHGetSpecialFolderLocation(0,CSIDL_DESKTOP,&pidlTmp);
   FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlTmp,LISTEND);
   COMDLG32_SHFree(pidlTmp);
 
-  COMDLG32_SHGetSpecialFolderLocation(0,CSIDL_DRIVES,&pidlDrives);
-
-  COMDLG32_SHGetDesktopFolder(&psfRoot);
+  SHGetSpecialFolderLocation(0,CSIDL_DRIVES,&pidlDrives);
+
+  SHGetDesktopFolder(&psfRoot);
 
   if (psfRoot)
@@ -2024 +2034 @@
   if(pDIStruct->itemID == liInfos->uSelectedItem)
   {
-    ilItemImage = (HIMAGELIST) COMDLG32_SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
+    ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
                                                0,    
                                                &sfi,    
@@ -2034 +2044 @@
   else
   {
-    ilItemImage = (HIMAGELIST) COMDLG32_SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
+    ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
                                                   0, 
                                                   &sfi, 
@@ -2061 +2071 @@
   {
     iIndentation = 0;
-    ilItemImage = (HIMAGELIST) COMDLG32_SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
+    ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
                                                 0, 
                                                 &sfi, 
@@ -2091 +2101 @@
  
   /* Draw the icon from the image list */
-  COMDLG32_ImageList_Draw(ilItemImage,
+  ImageList_Draw(ilItemImage,
                  sfi.iIcon,
                  pDIStruct->hDC,  
@@ -2182 +2192 @@
   
   sfi.dwAttributes = SFGAO_FILESYSANCESTOR | SFGAO_FILESYSTEM;
-  COMDLG32_SHGetFileInfoA((LPSTR)pidl,
+  SHGetFileInfoA((LPSTR)pidl,
                   0,
                   &sfi,
@@ -2672 +2682 @@
   {
     HRESULT hRes;
-    COMDLG32_SHGetDesktopFolder(&lpsf);
+    SHGetDesktopFolder(&lpsf);
     hRes = GetName(lpsf,pidl,dwFlags,lpstrFileName);
     IShellFolder_Release(lpsf);
@@ -2698 +2708 @@
   TRACE("%p\n", pidlAbs);
 
-  if(SUCCEEDED(COMDLG32_SHGetDesktopFolder(&psfParent)))
+  if(SUCCEEDED(SHGetDesktopFolder(&psfParent)))
   {
     psf = psfParent;
@@ -2736 +2746 @@
  *
  * returns the pidl of the file name relative to folder 
- * NULL if an error occured
+ * NULL if an error occurred
  */
 LPITEMIDLIST GetPidlFromName(IShellFolder *lpsf,LPCSTR lpcstrFileName)
@@ -2746 +2756 @@
   TRACE("sf=%p file=%s\n", lpsf, lpcstrFileName);
 
-#ifdef __WIN32OS2__
-  if(!lpcstrFileName || *lpcstrFileName == 0) return NULL;
-#else
   if(!lpcstrFileName) return NULL;
-#endif
+  if(!*lpcstrFileName) return NULL;
 
   MultiByteToWideChar(CP_ACP,MB_PRECOMPOSED,lpcstrFileName,-1,(LPWSTR)lpwstrDirName,MAX_PATH);  
@@ -2756 +2763 @@
   if(!lpsf)
   {
-    COMDLG32_SHGetDesktopFolder(&lpsf);
+    SHGetDesktopFolder(&lpsf);
     pidl = GetPidlFromName(lpsf, lpcstrFileName);
     IShellFolder_Release(lpsf);

trunk/src/comdlg32/filedlgbrowser.c

@@ -5 +5 @@
  */
 
+#include <stdio.h>
+#include <string.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "heap.h"
+#include "debugtools.h"
+
+#include "shlwapi.h"
+#include "filedlgbrowser.h"
+#include "cdlg.h"
+#include "shlguid.h"
+#include "wine/obj_serviceprovider.h"
+
 #ifdef __WIN32OS2__
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
 #include <heapstring.h>
 #include <misc.h>
-
 #endif
-
-#include <stdio.h>
-#include "unknwn.h"
-#include "filedlgbrowser.h"
-#include "windef.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "wine/winestring.h"
-#include "heap.h"
-#include "shlguid.h"
-#include "wine/obj_dataobject.h"
-#include "debugtools.h"
-#include "cdlg.h"
-
-#define INITGUID
-#include "initguid.h"
-#include "wine/obj_serviceprovider.h"
 
 DEFAULT_DEBUG_CHANNEL(commdlg);
@@ -84 +79 @@
  *   Helper functions
  */
+
+static void COMDLG32_UpdateCurrentDir(FileOpenDlgInfos *fodInfos)
+{
+    char lpstrPath[MAX_PATH];
+    SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrPath);
+    SetCurrentDirectoryA(lpstrPath);
+    TRACE("new current folder %s\n", lpstrPath);
+}
 
 /* copied from shell32 to avoid linking to it */
@@ -98 +101 @@
 
           case STRRET_CSTRA:
-            lstrcpynAtoW((LPWSTR)dest, src->u.cStr, len);
+            if (len && !MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, (LPWSTR)dest, len ))
+                ((LPWSTR)dest)[len-1] = 0;
             break;
 
@@ -104 +108 @@
             if (pidl)
             {
-              lstrcpynAtoW((LPWSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
+                if (len && !MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset,
+                                                 -1, (LPWSTR)dest, len ))
+                    ((LPWSTR)dest)[len-1] = 0;
             }
             break;
@@ -111 +117 @@
             FIXME("unknown type!\n");
             if (len)
-            { *(LPSTR)dest = '\0';
+            { *(LPWSTR)dest = '\0';
             }
             return(FALSE);
@@ -140 +146 @@
     sb->lpVtblCommDlgBrowser = &IShellBrowserImpl_ICommDlgBrowser_Vtbl;
     sb->lpVtblServiceProvider = &IShellBrowserImpl_IServiceProvider_Vtbl;
-    COMDLG32_SHGetSpecialFolderLocation(hwndOwner, CSIDL_DESKTOP,
+    SHGetSpecialFolderLocation(hwndOwner, CSIDL_DESKTOP,
                                &fodInfos->ShellInfos.pidlAbsCurrent);
 
@@ -157 +163 @@
     ICOM_THIS(IShellBrowserImpl, iface);
 
-#ifndef __WIN32OS2__
     TRACE("(%p)\n\t%s\n", This, debugstr_guid(riid));
-#endif
 
     *ppvObj = NULL;
@@ -376 +380 @@
     COMDLG32_SHFree((LPVOID)fodInfos->ShellInfos.pidlAbsCurrent);
     fodInfos->ShellInfos.pidlAbsCurrent = pidlTmp;
+
+    COMDLG32_UpdateCurrentDir(fodInfos);
 
     /* Create the window */
@@ -791 +797 @@
       if (SUCCEEDED(COMDLG32_StrRetToStrNW(szPathW, MAX_PATH, &str, pidl)))
       {
-          if (COMDLG32_PathMatchSpecW(szPathW, fodInfos->ShellInfos.lpstrCurrentFilter))
+          if (PathMatchSpecW(szPathW, fodInfos->ShellInfos.lpstrCurrentFilter))
           return S_OK;
       }
@@ -905 +911 @@
     _ICOM_THIS_FromIServiceProvider(IShellBrowser,iface);
 
-#ifndef __WIN32OS2__
     FIXME("(%p)\n\t%s\n\t%s\n", This,debugstr_guid(guidService), debugstr_guid(riid) );
-#endif
 
     *ppv = NULL;

trunk/src/comdlg32/fontdlg.c

@@ -884 +884 @@
                   break;
         
-        case psh15:i=RegisterWindowMessageA( HELPMSGSTRING );
+        case psh15:i=RegisterWindowMessageA( HELPMSGSTRINGA );
                   if (lpcf->hwndOwner)
                     SendMessageA(lpcf->hwndOwner, i, 0, (LPARAM)GetWindowLongA(hDlg, DWL_USER));

trunk/src/comdlg32/makefile

@@ -1 @@
-# $Id: makefile,v 1.24 2001-04-24 19:44:26 sandervl Exp $
+# $Id: makefile,v 1.25 2001-04-24 20:37:25 sandervl Exp $
 
 #
@@ -17 +17 @@
 # Overrides.
 #
+!if "$(CCENV)" == "VAC36"
 CDEFINES    = $(CDEFINES) -DNONAMELESSUNION
+!endif
 
 #