Changeset 2607 for trunk/src


Ignore:
Timestamp:
Feb 3, 2000, 2:27:40 PM (26 years ago)
Author:
sandervl
Message:

merged with latest wine code

Location:
trunk/src/comdlg32
Files:
21 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/comdlg32/cdlg.h

    r1864 r2607  
    1 /* $Id: cdlg.h,v 1.3 1999-11-28 12:32:27 sandervl Exp $ */
     1/* $Id: cdlg.h,v 1.4 2000-02-03 13:27:36 sandervl Exp $ */
    22/*
    33 *  Common Dialog Boxes interface (32 bit)
    … …  
    9393
    9494/* DPA */
    95 extern HDPA     (WINAPI* COMDLG32_DPA_Create) (INT); 
    96 extern LPVOID   (WINAPI* COMDLG32_DPA_GetPtr) (const HDPA, INT);   
    97 extern LPVOID   (WINAPI* COMDLG32_DPA_DeleteAllPtrs) (const HDPA hdpa);
    98 extern LPVOID   (WINAPI* COMDLG32_DPA_DeletePtr) (const HDPA hdpa, INT i);
    99 extern INT      (WINAPI* COMDLG32_DPA_InsertPtr) (const HDPA, INT, LPVOID);
    100 extern BOOL     (WINAPI* COMDLG32_DPA_Destroy) (const HDPA);
     95extern HDPA     (* WINAPI COMDLG32_DPA_Create) (INT); 
     96extern LPVOID   (* WINAPI COMDLG32_DPA_GetPtr) (const HDPA, INT);   
     97extern LPVOID   (* WINAPI COMDLG32_DPA_DeleteAllPtrs) (const HDPA hdpa);
     98extern LPVOID   (* WINAPI COMDLG32_DPA_DeletePtr) (const HDPA hdpa, INT i);
     99extern INT      (* WINAPI COMDLG32_DPA_InsertPtr) (const HDPA, INT, LPVOID);
     100extern BOOL     (* WINAPI COMDLG32_DPA_Destroy) (const HDPA);
    101101
    102102/* IMAGELIST */
    103 extern HICON    (WINAPI* COMDLG32_ImageList_GetIcon) (HIMAGELIST, INT, UINT);
    104 extern HIMAGELIST (WINAPI *COMDLG32_ImageList_LoadImageA) (HINSTANCE, LPCSTR, INT, INT, COLORREF, UINT, UINT);
    105 extern BOOL     (WINAPI* COMDLG32_ImageList_Draw) (HIMAGELIST himl, int i, HDC hdcDest, int x, int y, UINT fStyle);
    106 extern BOOL     (WINAPI* COMDLG32_ImageList_Destroy) (HIMAGELIST himl);
     103extern HICON    (* WINAPI COMDLG32_ImageList_GetIcon) (HIMAGELIST, INT, UINT);
     104extern HIMAGELIST (* WINAPI COMDLG32_ImageList_LoadImageA) (HINSTANCE, LPCSTR, INT, INT, COLORREF, UINT, UINT);
     105extern BOOL     (* WINAPI COMDLG32_ImageList_Draw) (HIMAGELIST himl, int i, HDC hdcDest, int x, int y, UINT fStyle);
     106extern BOOL     (* WINAPI COMDLG32_ImageList_Destroy) (HIMAGELIST himl);
    107107
    108108/* ITEMIDLIST */
    109109
    110 extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST);
    111 extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILCombine)(LPCITEMIDLIST,LPCITEMIDLIST);
    112 extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILGetNext)(LPITEMIDLIST);
    113 extern BOOL (WINAPI *COMDLG32_PIDL_ILRemoveLastID)(LPCITEMIDLIST);
    114 extern BOOL (WINAPI *COMDLG32_PIDL_ILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST);
     110extern LPITEMIDLIST (* WINAPI COMDLG32_PIDL_ILClone) (LPCITEMIDLIST);
     111extern LPITEMIDLIST (* WINAPI COMDLG32_PIDL_ILCombine)(LPCITEMIDLIST,LPCITEMIDLIST);
     112extern LPITEMIDLIST (* WINAPI COMDLG32_PIDL_ILGetNext)(LPITEMIDLIST);
     113extern BOOL (* WINAPI COMDLG32_PIDL_ILRemoveLastID)(LPCITEMIDLIST);
     114extern BOOL (* WINAPI COMDLG32_PIDL_ILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST);
    115115
    116116/* SHELL */
    117 extern BOOL (WINAPI *COMDLG32_SHGetPathFromIDListA) (LPCITEMIDLIST,LPSTR);
    118 extern HRESULT (WINAPI *COMDLG32_SHGetSpecialFolderLocation)(HWND,INT,LPITEMIDLIST *);
    119 extern DWORD (WINAPI *COMDLG32_SHGetDesktopFolder)(IShellFolder **);
    120 extern DWORD    (WINAPI *COMDLG32_SHGetFileInfoA)(LPCSTR,DWORD,SHFILEINFOA*,UINT,UINT);
    121 extern DWORD (WINAPI *COMDLG32_SHFree)(LPVOID);
     117extern BOOL (* WINAPI COMDLG32_SHGetPathFromIDListA) (LPCITEMIDLIST,LPSTR);
     118extern HRESULT (* WINAPI COMDLG32_SHGetSpecialFolderLocation)(HWND,INT,LPITEMIDLIST *);
     119extern DWORD (* WINAPI COMDLG32_SHGetDesktopFolder)(IShellFolder **);
     120extern DWORD    (* WINAPI COMDLG32_SHGetFileInfoA)(LPCSTR,DWORD,SHFILEINFOA*,UINT,UINT);
     121extern DWORD (* WINAPI COMDLG32_SHFree)(LPVOID);
    122122
    123123/* PATH */
    124 extern BOOL (WINAPI *COMDLG32_PathIsRootA)(LPCSTR x);
    125 extern LPCSTR (WINAPI *COMDLG32_PathFindFilenameA)(LPCSTR path);
    126 extern DWORD (WINAPI *COMDLG32_PathRemoveFileSpecA)(LPSTR fn);
    127 extern BOOL (WINAPI *COMDLG32_PathMatchSpecW)(LPCWSTR x, LPCWSTR y);
    128 extern LPSTR (WINAPI *COMDLG32_PathAddBackslashA)(LPSTR path);
     124extern BOOL (* WINAPI COMDLG32_PathIsRootA)(LPCSTR x);
     125extern LPCSTR (* WINAPI COMDLG32_PathFindFilenameA)(LPCSTR path);
     126extern DWORD (* WINAPI COMDLG32_PathRemoveFileSpecA)(LPSTR fn);
     127extern BOOL (* WINAPI COMDLG32_PathMatchSpecW)(LPCWSTR x, LPCWSTR y);
     128extern LPSTR (* WINAPI COMDLG32_PathAddBackslashA)(LPSTR path);
    129129#endif
    130130

  • trunk/src/comdlg32/cdlg_En.rc

    r1864 r2607  
    1 /* $Id: cdlg_En.rc,v 1.2 1999-11-28 12:32:27 sandervl Exp $ */
    21LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
    32

  • trunk/src/comdlg32/cdlg_xx.rc

    r1864 r2607  
    1 /* $Id: cdlg_xx.rc,v 1.2 1999-11-28 12:32:27 sandervl Exp $ */
    21/*
    32 * Language neutral resources for Common Dialogs
    … …  
    2120                        VALUE "CompanyName", "Wine Developer Team\000"
    2221                        VALUE "FileDescription", "Common Dialog Boxes\000"
    23                         VALUE "FileVersion", "0.01\000"
     22                        VALUE "FileVersion", "4.00\000"
    2423                        VALUE "InternalName", "COMDLG32\000"
    2524                        VALUE "LegalCopyright", "Copyright \251 B. A. Stultiens 1998,1999\000"
    2625                        VALUE "OriginalFilename", "COMDLG32.DLL\000"
    2726                        VALUE "ProductName", "Wine\000"
    28                         VALUE "ProductVersion", "1.00\000"
     27                        VALUE "ProductVersion", "4.00\000"
    2928                }
    3029        }

  • trunk/src/comdlg32/comdlg32.cpp

    r1684 r2607  
    1 /* $Id: comdlg32.cpp,v 1.19 1999-11-10 12:18:28 phaller Exp $ */
     1/* $Id: comdlg32.cpp,v 1.20 2000-02-03 13:27:39 sandervl Exp $ */
    22
    33/*
    … …  
    325325{
    326326  Win32WindowProc *wndproc;
    327 
     327  BOOL rc;
     328
     329  CheckCurFS();
    328330  if(lpofn->Flags & (OFN_ENABLETEMPLATE|OFN_ENABLETEMPLATEHANDLE))
    329331  {
    … …  
    336338    iFileDlg_CleanFilterArray((LPSTR)lpofn->lpstrFilter);
    337339
    338   return(O32_GetOpenFileName(lpofn));
     340  rc = O32_GetOpenFileName(lpofn);
     341  CheckCurFS();
     342  return rc;
    339343}
    340344

  • trunk/src/comdlg32/filedlgbrowser.h

    r1864 r2607  
    1 /* $Id: filedlgbrowser.h,v 1.3 1999-11-28 12:32:28 sandervl Exp $ */
    21/*
    32 *  Implementation of IShellBrowser for the File Open common dialog
    … …  
    8786#define IDS_VERIFYFILE                  115
    8887#define IDS_CREATEFILE                  116
     88#define IDS_CREATEFOLDER_DENIED         117
     89#define IDS_FILEOPEN_CAPTION            118
    8990
    9091#define IDC_OPENREADONLY                chx1

  • trunk/src/comdlg32/makefile

    r2526 r2607  
    1 # $Id: makefile,v 1.10 2000-01-26 23:19:54 sandervl Exp $
     1# $Id: makefile,v 1.11 2000-02-03 13:27:40 sandervl Exp $
    22
    33#
    … …  
    5656cdlg32.obj: cdlg32.cpp cdlg.h
    5757finddlg32.obj: finddlg32.cpp cdlg.h
    58 filedlg95.obj: filedlg95.cpp filedlgbrowser.h cdlg.h
    59 filedlgbrowser.obj: filedlgbrowser.cpp filedlgbrowser.h cdlg.h
    60 filetitle.obj: filetitle.cpp cdlg.h
     58filedlg95.obj: filedlg95.c filedlgbrowser.h cdlg.h
     59filedlgbrowser.obj: filedlgbrowser.c filedlgbrowser.h cdlg.h
     60filetitle.obj: filetitle.c cdlg.h
    6161comdlgguid.obj: comdlgguid.cpp
    6262
Note: See TracChangeset for help on using the changeset viewer.