Changeset 5616 for trunk/include


Ignore:
Timestamp:
Apr 28, 2001, 3:28:18 PM (24 years ago)
Author:
sandervl
Message:

header updates

Location:
trunk/include/win
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/shlobj.h

    r4054 r5616  
    1 /* $Id: shlobj.h,v 1.8 2000-08-20 09:46:15 sandervl Exp $ */
    21#ifndef __WINE_SHLOBJ_H
    32#define __WINE_SHLOBJ_H
    … …  
    394393} SHELLFLAGSTATE, * LPSHELLFLAGSTATE;
    395394
    396 void WINAPI SHGetSettings(LPSHELLFLAGSTATE lpsfs, DWORD dwMask, DWORD dwx);
     395void WINAPI SHGetSettings(LPSHELLFLAGSTATE lpsfs, DWORD dwMask);
    397396
    398397#define SSF_SHOWALLOBJECTS              0x0001

  • trunk/include/win/shlwapi.h

    r4075 r5616  
    1 /* $Id: shlwapi.h,v 1.2 2000-08-23 18:05:56 sandervl Exp $ */
    21#ifndef __WINE_SHLWAPI_H
    32#define __WINE_SHLWAPI_H
    … …  
    54#include "windef.h"
    65#include "wine/obj_queryassociations.h"
     6#include "wine/obj_shellfolder.h"
    77
    88#ifdef __cplusplus
    … …  
    1010#endif /* defined(__cplusplus) */
    1111
     12
     13/*
     14 * The URL_ defines were determined by trial and error.  If they become
     15 * documented please check them and add the missing ones including:
     16 *
     17 * URL_ESCAPE_PERCENT
     18 * URL_PLUGGABLE_PROTOCOL
     19 * URL_DONT_ESCAPE_EXTRA_INFO
     20 * URL_ESCAPE_SEGMENT_ONLY
     21 */
     22
     23#define URL_UNESCAPE_INPLACE         0x00100000
     24#define URL_DONT_UNESCAPE_EXTRA_INFO 0x02000000
     25 
     26#define URL_ESCAPE_SPACES_ONLY       0x04000000
     27
     28#define URL_UNESCAPE                 0x10000000
     29#define URL_ESCAPE_UNSAFE            0x20000000
     30#define URL_DONT_SIMPLIFY            0x40000000
     31
     32LPSTR  WINAPI PathAddBackslashA(LPSTR path);   
     33LPWSTR WINAPI PathAddBackslashW(LPWSTR path);   
     34#define PathAddBackslash WINELIB_NAME_AW(PathAddBackslash)
     35
     36BOOL WINAPI PathAddExtensionA(LPSTR pszPath, LPCSTR pszExt);
     37BOOL WINAPI PathAddExtensionW(LPWSTR pszPath, LPCWSTR pszExt);
     38#define PathAddExtension WINELIB_NAME_AW(PathAddExtension)
     39
    1240BOOL WINAPI PathAppendA(LPSTR lpszPath1,LPCSTR lpszPath2);
    1341BOOL WINAPI PathAppendW(LPWSTR lpszPath1,LPCWSTR lpszPath2);
     42#define PathAppend WINELIB_NAME_AW(PathAppend)
    1443
    1544LPSTR WINAPI PathBuildRootA(LPSTR lpszPath, int drive);
    1645LPWSTR WINAPI PathBuildRootW(LPWSTR lpszPath, int drive);
    17 
    18 LPSTR WINAPI PathGetArgsA(LPCSTR lpszPath);
    19 LPWSTR WINAPI PathGetArgsW(LPCWSTR lpszPath);
    20 
    21 BOOL WINAPI PathRemoveFileSpecA(LPSTR lpszPath);
    22 BOOL WINAPI PathRemoveFileSpecW(LPWSTR lpszPath);
    23 
    24 void WINAPI PathStripPathA(LPSTR lpszPath);
    25 void WINAPI PathStripPathW(LPWSTR lpszPath);
    26 
    27 void WINAPI PathRemoveArgsA(LPSTR lpszPath);
    28 void WINAPI PathRemoveArgsW(LPWSTR lpszPath);
    29 
    30 void WINAPI PathRemoveExtensionA(LPSTR lpszPath);
    31 void WINAPI PathRemoveExtensionW(LPWSTR lpszPath);
    32 
    33 void WINAPI PathUnquoteSpacesA(LPSTR str);
    34 void WINAPI PathUnquoteSpacesW(LPWSTR str);
    35 
    36 int WINAPI PathParseIconLocationA(LPSTR lpszPath);
    37 int WINAPI PathParseIconLocationW(LPWSTR lpszPath);
    38 
    39 BOOL WINAPI PathIsDirectoryA(LPCSTR lpszPath);
    40 BOOL WINAPI PathIsDirectoryW(LPCWSTR lpszPath);
     46#define PathBuildRoot WINELIB_NAME_AW(PathBuiltRoot)
     47
     48BOOL WINAPI PathCanonicalizeA(LPSTR lpszDst, LPCSTR lpszSrc);
     49BOOL WINAPI PathCanonicalizeW(LPWSTR lpszDst, LPCWSTR lpszSrc);
     50#define PathCanonicalize WINELIB_NAME_AW(PathCanonicalize)
     51
     52LPSTR  WINAPI PathCombineA(LPSTR szDest, LPCSTR lpszDir, LPCSTR lpszFile);
     53LPWSTR WINAPI PathCombineW(LPWSTR szDest, LPCWSTR lpszDir, LPCWSTR lpszFile);
     54#define PathCombine WINELIB_NAME_AW(PathCombine)
    4155
    4256BOOL WINAPI PathFileExistsA(LPCSTR lpszPath);
    4357BOOL WINAPI PathFileExistsW(LPCWSTR lpszPath);
    44 
    45 BOOL WINAPI PathIsSameRootA(LPCSTR lpszPath1, LPCSTR lpszPath2);
    46 BOOL WINAPI PathIsSameRootW(LPCWSTR lpszPath1, LPCWSTR lpszPath2);
    47 
    48 BOOL WINAPI PathSetDlgItemPathA(HWND hDlg, int id, LPCSTR pszPath);
    49 BOOL WINAPI PathSetDlgItemPathW(HWND hDlg, int id, LPCWSTR pszPath);
     58#define PathFileExists WINELIB_NAME_AW(PathFileExists)
     59
     60LPSTR WINAPI PathFindExtensionA(LPCSTR path);
     61LPWSTR WINAPI PathFindExtensionW(LPCWSTR path);
     62#define PathFindExtension WINELIB_NAME_AW(PathFindExtension)
    5063
    5164LPSTR WINAPI PathFindFileNameA(LPCSTR pPath);
    5265LPWSTR WINAPI PathFindFileNameW(LPCWSTR pPath);
    5366#define PathFindFileName WINELIB_NAME_AW(PathFindFileName)
    54 LPVOID WINAPI PathFindFileNameAW(LPCVOID path);
     67
     68LPSTR WINAPI PathFindNextComponentA(LPCSTR pszPath);
     69LPWSTR WINAPI PathFindNextComponentW(LPCWSTR pszPath);
     70#define PathFindNextComponent WINELIB_NAME_AW(PathFindNextComponent)
     71
     72BOOL WINAPI PathFindOnPathA(LPSTR sFile, LPCSTR sOtherDirs);
     73BOOL WINAPI PathFindOnPathW(LPWSTR sFile, LPCWSTR sOtherDirs);
     74#define PathFindOnPath WINELIB_NAME_AW(PathFindOnPath)
     75
     76LPSTR WINAPI PathGetArgsA(LPCSTR lpszPath);
     77LPWSTR WINAPI PathGetArgsW(LPCWSTR lpszPath);
     78#define PathGetArgs WINELIB_NAME_AW(PathGetArgs)
    5579
    5680int WINAPI PathGetDriveNumberA(LPCSTR lpszPath);
    … …  
    5882#define PathGetDriveNumber WINELIB_NAME_AW(PathGetDriveNumber)
    5983
    60 BOOL WINAPI PathCanonicalizeA(LPSTR lpszDst, LPCSTR lpszSrc);
    61 BOOL WINAPI PathCanonicalizeW(LPWSTR lpszDst, LPCWSTR lpszSrc);
    62 #define PathCanonicalize WINELIB_NAME_AW(PathCanonicalize)
    63 
    64 LPSTR WINAPI PathFindNextComponentA(LPCSTR pszPath);
    65 LPWSTR WINAPI PathFindNextComponentW(LPCWSTR pszPath);
    66 #define PathFindNextComponent WINELIB_NAME_AW(PathFindNextComponent)
     84BOOL WINAPI PathIsDirectoryA(LPCSTR lpszPath);
     85BOOL WINAPI PathIsDirectoryW(LPCWSTR lpszPath);
     86#define PathIsDirectory WINELIB_NAME_AW(PathIsDirectory)
     87
     88BOOL WINAPI PathIsRelativeA(LPCSTR lpszPath);
     89BOOL WINAPI PathIsRelativeW(LPCWSTR lpszPath);
     90#define PathIsRelative WINELIB_NAME_AW(PathIsRelative)
     91
     92BOOL WINAPI PathIsRootA(LPCSTR x);
     93BOOL WINAPI PathIsRootW(LPCWSTR x);
     94#define PathIsRoot WINELIB_NAME_AW(PathIsRoot)
     95
     96BOOL WINAPI PathIsSameRootA(LPCSTR lpszPath1, LPCSTR lpszPath2);
     97BOOL WINAPI PathIsSameRootW(LPCWSTR lpszPath1, LPCWSTR lpszPath2);
     98#define PathIsSameRoot WINELIB_NAME_AW(PathIsSameRoot)
     99
     100BOOL WINAPI PathIsUNCA(LPCSTR lpszPath);
     101BOOL WINAPI PathIsUNCW(LPCWSTR lpszPath);
     102#define PathIsUNC WINELIB_NAME_AW(PathIsUNC)
    67103
    68104BOOL WINAPI PathIsURLA(LPCSTR pszPath);
    … …  
    70106#define PathIsURL WINELIB_NAME_AW(PathIsURL)
    71107
    72 BOOL WINAPI PathAddExtensionA(LPSTR pszPath, LPCSTR pszExt);
    73 BOOL WINAPI PathAddExtensionW(LPWSTR pszPath, LPCWSTR pszExt);
    74 #define PathAddExtension WINELIB_NAME_AW(PathAddExtension)
     108BOOL WINAPI PathMatchSpecA(LPCSTR lpszPath, LPCSTR lpszSpec);
     109BOOL WINAPI PathMatchSpecW(LPCWSTR lpszPath, LPCWSTR lpszSpec);
     110#define PathMatchSpec WINELIB_NAME_AW(PathMatchSpec)
     111
     112int WINAPI PathParseIconLocationA(LPSTR lpszPath);
     113int WINAPI PathParseIconLocationW(LPWSTR lpszPath);
     114#define PathParseIconLocation WINELIB_NAME_AW(PathParseIconLocation)
     115
     116LPSTR  WINAPI PathQuoteSpacesA(LPSTR path);     
     117LPWSTR WINAPI PathQuoteSpacesW(LPWSTR path);   
     118#define PathQuoteSpaces WINELIB_NAME_AW(PathQuoteSpaces)
     119
     120void WINAPI PathRemoveArgsA(LPSTR lpszPath);
     121void WINAPI PathRemoveArgsW(LPWSTR lpszPath);
     122#define PathRemoveArgs WINELIB_NAME_AW(PathRemoveArgs)
     123
     124LPSTR WINAPI PathRemoveBackslashA(LPSTR lpszPath);
     125LPWSTR WINAPI PathRemoveBackslashW(LPWSTR lpszPath);
     126#define PathRemoveBackslash WINELIB_NAME_AW(PathRemoveBackslash)
     127
     128void WINAPI PathRemoveBlanksA(LPSTR lpszPath);
     129void WINAPI PathRemoveBlanksW(LPWSTR lpszPath);
     130#define PathRemoveBlanks WINELIB_NAME_AW(PathRemoveBlanks)
     131
     132void WINAPI PathRemoveExtensionA(LPSTR lpszPath);
     133void WINAPI PathRemoveExtensionW(LPWSTR lpszPath);
     134#define PathRemoveExtension WINELIB_NAME_AW(PathRemoveExtension)
     135
     136BOOL WINAPI PathRemoveFileSpecA(LPSTR lpszPath);
     137BOOL WINAPI PathRemoveFileSpecW(LPWSTR lpszPath);
     138#define PathRemoveFileSpec WINELIB_NAME_AW(PathRemoveFileSpec)
     139
     140BOOL WINAPI PathSetDlgItemPathA(HWND hDlg, int id, LPCSTR pszPath);
     141BOOL WINAPI PathSetDlgItemPathW(HWND hDlg, int id, LPCWSTR pszPath);
     142#define PathSetDlgItemPath WINELIB_NAME_AW(PathSetDlgItemPath)
     143
     144void WINAPI PathStripPathA(LPSTR lpszPath);
     145void WINAPI PathStripPathW(LPWSTR lpszPath);
     146#define PathStripPath WINELIB_NAME_AW(PathStripPath)
    75147
    76148BOOL WINAPI PathStripToRootA(LPSTR pszPath);
    … …  
    78150#define PathStripToRoot WINELIB_NAME_AW(PathStripToRoot)
    79151
     152void WINAPI PathUnquoteSpacesA(LPSTR str);
     153void WINAPI PathUnquoteSpacesW(LPWSTR str);
     154#define PathUnquoteSpaces WINELIB_NAME_AW(PathUnquoteSpaces)
     155
     156
     157INT WINAPI StrCSpnA(LPCSTR lpStr, LPCSTR lpSet);
     158INT WINAPI StrCSpnW(LPCWSTR lpStr, LPCWSTR lpSet);
     159#define StrCSpn WINELIB_NAME_AW(StrCSpn)
     160
     161INT WINAPI StrCSpnIA(LPCSTR lpStr, LPCSTR lpSet);
     162INT WINAPI StrCSpnIW(LPCWSTR lpStr, LPCWSTR lpSet);
     163#define StrCSpnI WINELIB_NAME_AW(StrCSpnI)
     164
     165#define StrCatA lstrcatA
     166LPWSTR WINAPI StrCatW(LPWSTR front, LPCWSTR back);
     167#define StrCat WINELIB_NAME_AW(StrCat)
     168
     169LPSTR WINAPI StrCatBuffA(LPSTR front, LPCSTR back, INT size);
     170LPWSTR WINAPI StrCatBuffW(LPWSTR front, LPCWSTR back, INT size);
     171#define StrCatBuff WINELIB_NAME_AW(StrCatBuff)
     172
    80173LPSTR WINAPI StrChrA(LPCSTR lpStart, WORD wMatch);
    81174LPWSTR WINAPI StrChrW(LPCWSTR lpStart, WCHAR wMatch);
    82175#define StrChr WINELIB_NAME_AW(StrChr)
    83176
    84 void WINAPI PathRemoveBlanksA(LPSTR lpszPath);
    85 void WINAPI PathRemoveBlanksW(LPWSTR lpszPath);
    86 #define  PathRemoveBlanks WINELIB_NAME_AW(PathRemoveBlanks)
    87 void WINAPI PathRemoveBlanksAW(LPVOID lpszPath);
     177LPSTR WINAPI StrChrIA(LPCSTR lpStart, WORD wMatch);
     178LPWSTR WINAPI StrChrIW(LPCWSTR lpStart, WCHAR wMatch);
     179#define StrChrI WINELIB_NAME_AW(StrChrI)
     180
     181INT WINAPI StrCmpNA(LPCSTR lpStr1, LPCSTR lpStr2, INT nChar);
     182INT WINAPI StrCmpNW(LPCWSTR lpStr1, LPCWSTR lpStr2, INT nChar);
     183#define StrCmpN WINELIB_NAME_AW(StrCmpN)
     184
     185INT WINAPI StrCmpNIA(LPCSTR lpStr1, LPCSTR lpStr2, INT nChar);
     186INT WINAPI StrCmpNIW(LPCWSTR lpStr1, LPCWSTR lpStr2, INT nChar);
     187#define StrCmpNI WINELIB_NAME_AW(StrCmpNI)
     188
     189LPSTR WINAPI StrDupA(LPCSTR lpSrc);
     190LPWSTR WINAPI StrDupW(LPCWSTR lpSrc);
     191#define StrDup WINELIB_NAME_AW(StrDup)
     192
     193LPSTR WINAPI StrFormatByteSizeA ( DWORD dw, LPSTR pszBuf, UINT cchBuf );
     194LPWSTR WINAPI StrFormatByteSizeW ( DWORD dw, LPWSTR pszBuf, UINT cchBuf );
     195#define StrFormatByteSize WINELIB_NAME_AW(StrFormatByteSize)
     196
     197
     198
     199HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, DWORD len);
     200HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, DWORD len);
     201#define StrRetToBuf WINELIB_NAME_AW(StrRetToBuf)
     202
     203HRESULT WINAPI SHDeleteKeyA(HKEY hKey, LPCSTR lpszSubKey);
     204HRESULT WINAPI SHDeleteKeyW(HKEY hkey, LPCWSTR pszSubKey);
     205#define  SHDeleteKey WINELIB_NAME_AW(SHDeleteKey)
     206
     207DWORD WINAPI SHDeleteEmptyKeyA(HKEY hKey, LPCSTR lpszSubKey);
     208DWORD WINAPI SHDeleteEmptyKeyW(HKEY hKey, LPCWSTR lpszSubKey);
     209#define  SHDeleteEmptyKey WINELIB_NAME_AW(SHDeleteEmptyKey)
     210
     211HRESULT WINAPI UrlCanonicalizeA(LPCSTR pszUrl, LPSTR pszCanonicalized,
     212                                LPDWORD pcchCanonicalized, DWORD dwFlags);
     213HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized,
     214                                LPDWORD pcchCanonicalized, DWORD dwFlags);
     215#define UrlCanonicalize WINELIB_NAME_AW(UrlCanoncalize)
     216
     217HRESULT WINAPI UrlEscapeA(LPCSTR pszUrl, LPSTR pszEscaped, LPDWORD pcchEscaped,
     218                          DWORD dwFlags);
     219HRESULT WINAPI UrlEscapeW(LPCWSTR pszUrl, LPWSTR pszEscaped,
     220                          LPDWORD pcchEscaped, DWORD dwFlags);
     221#define UrlEscape WINELIB_NAME_AW(UrlEscape)
     222
     223HRESULT WINAPI UrlUnescapeA(LPCSTR pszUrl, LPSTR pszUnescaped,
     224                            LPDWORD pcchUnescaped, DWORD dwFlags);
     225HRESULT WINAPI UrlUnescapeW(LPCWSTR pszUrl, LPWSTR pszUnescaped,
     226                            LPDWORD pcchUnescaped, DWORD dwFlags);
     227#define UrlUnescape WINELIB_AW_NAME(UrlUnescape)
     228
     229#if 0
     230typedef struct _DllVersionInfo {
     231    DWORD cbSize;
     232    DWORD dwMajorVersion;
     233    DWORD dwMinorVersion;
     234    DWORD dwBuildNumber;
     235    DWORD dwPlatformID;
     236} DLLVERSIONINFO;
     237
     238#define DLLVER_PLATFORM_WINDOWS         0x00000001      // Windows 9x
     239#define DLLVER_PLATFORM_NT              0x00000002      // Windows NT
     240
     241typedef HRESULT CALLBACK (*DLLGETVERSIONPROC)(DLLVERSIONINFO *);
     242#endif
    88243
    89244#ifdef __cplusplus

  • trunk/include/win/wine/obj_base.h

    r5598 r5616  
    1 /* $Id: obj_base.h,v 1.18 2001-04-26 19:23:33 sandervl Exp $ */
    21/*
    32 * This file defines the macros and types necessary to define COM interfaces,
    … …  
    813812#define IMalloc_HeapMinimize(p) ICOM_CALL (HeapMinimize,p)
    814813
     814/* values passed to CoGetMalloc */
     815#define MEMCTX_TASK             1 /* private task memory */
     816#define MEMCTX_SHARED           2 /* shared memory */
     817#ifdef _MAC
     818#define MEMCTX_MACSYSTEM        3 /* system heap on mac */
     819#endif
     820/* mainly for internal use... */
     821#define MEMCTX_UNKNOWN          -1
     822#define MEMCTX_SAME             -2
    815823
    816824HRESULT WINAPI CoCreateStandardMalloc16(DWORD dwMemContext, LPMALLOC16* lpMalloc);

  • trunk/include/win/wine/undocshell.h

    r4113 r5616  
    1 /* $Id: undocshell.h,v 1.6 2000-08-29 21:20:50 sandervl Exp $ */
    21#ifndef __WINE_UNDOCSHELL_H
    32#define __WINE_UNDOCSHELL_H
    … …  
    102101        DWORD len,
    103102        LPSTRRET src,
    104         LPITEMIDLIST pidl);
     103        const ITEMIDLIST *pidl);
    105104
    106105HRESULT WINAPI StrRetToStrNW (
    … …  
    108107        DWORD len,
    109108        LPSTRRET src,
    110         LPITEMIDLIST pidl);
     109        const ITEMIDLIST *pidl);
    111110
    112111HRESULT WINAPI StrRetToStrNAW (
    … …  
    114113        DWORD len,
    115114        LPSTRRET src,
    116         LPITEMIDLIST pidl);
    117 
    118 HRESULT WINAPI StrRetToBufA (
    119         LPSTRRET src,
    120         LPITEMIDLIST pidl,
    121         LPSTR dest,
    122         DWORD len);
    123 
    124 HRESULT WINAPI StrRetToBufW (
    125         LPSTRRET src,
    126         LPITEMIDLIST pidl,
    127         LPWSTR dest,
    128         DWORD len);
     115        const ITEMIDLIST *pidl);
    129116
    130117/****************************************************************************
Note: See TracChangeset for help on using the changeset viewer.