Changeset 7822 for trunk/include/win


Ignore:
Timestamp:
Feb 7, 2002, 12:54:01 AM (24 years ago)
Author:
sandervl
Message:

header updates

Location:
trunk/include/win
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/shell.h

    r7510 r7822  
    8484*/
    8585
     86#ifdef __WIN32OS2__
     87/****************************************************************************
     88*  STRRET
     89*/
     90#define STRRET_WSTR     0x0000
     91#define STRRET_OFFSETA  0x0001
     92#define STRRET_CSTRA    0x0002
     93#define STRRET_ASTR     0X0003
     94#define STRRET_OFFSETW  0X0004
     95#define STRRET_CSTRW    0X0005
     96
     97
     98typedef struct _STRRET
     99{ UINT uType;           /* STRRET_xxx */
     100  union
     101  { LPWSTR      pOleStr;        /* OLESTR that will be freed */
     102    LPSTR       pStr;
     103    UINT        uOffset;        /* OffsetINT32o SHITEMID (ANSI) */
     104    char        cStr[MAX_PATH]; /* Buffer to fill in */
     105    WCHAR       cStrW[MAX_PATH];
     106  }u;
     107} STRRET,*LPSTRRET;
     108#endif
     109
    86110#ifdef __cplusplus
    87111} /* extern "C" */

  • trunk/include/win/shlwapi.h

    r7818 r7822  
    44#ifndef __WINE_SHLWAPI_H
    55#define __WINE_SHLWAPI_H
     6
     7#include <stdarg.h>
     8#include <wingdi.h>
     9#include <winuser.h>
     10#include <shell.h>
    611
    712#ifdef __cplusplus
    … …  
    651656
    652657/* Undocumented */
    653 #if !defined(__WINE_WINE_OBJ_SHELLFOLDER_H) && !defined(__WINE_SHELL_H)
    654 //very ugly
    655 typedef struct _STRRET;
    656 typedef struct _ITEMIDLIST;
    657 
    658 #define LPSTRRET   struct _STRRET *
    659 #define ITEMIDLIST struct _ITEMIDLIST
    660 #endif
    661658HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, DWORD len);
    662659HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, DWORD len);
    … …  
    681678
    682679/* Stream functions */
    683 #ifndef NO_SHLWAPI_STREAM
     680#ifdef SHLWAPI_STREAM
    684681
    685682IStream * WINAPI SHOpenRegStreamA(HKEY,LPCSTR,LPCSTR,DWORD);
    … …  
    691688#define SHOpenRegStream2 WINELIB_NAME_AW(SHOpenRegStream2)
    692689
    693 #endif /* NO_SHLWAPI_STREAM */
     690#endif /* SHLWAPI_STREAM */
    694691
    695692
    … …  
    707704#define DLLVER_PLATFORM_WINDOWS 0x01 /* Win9x */
    708705#define DLLVER_PLATFORM_NT      0x02 /* WinNT */
     706
     707typedef HRESULT (* CALLBACK DLLGETVERSIONPROC)(DLLVERSIONINFO *);
     708
    709709#endif
    710 
    711 typedef HRESULT (* CALLBACK DLLGETVERSIONPROC)(DLLVERSIONINFO *);
    712710
    713711#ifdef __cplusplus

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

    r4033 r7822  
    1 /* $Id: obj_shellfolder.h,v 1.8 2000-08-18 02:04:21 phaller Exp $ */
     1/* $Id: obj_shellfolder.h,v 1.9 2002-02-06 23:54:01 sandervl Exp $ */
    22/*
    33 * Defines the COM interfaces and APIs related to IShellFolder
    … …  
    2020#endif /* defined(__cplusplus) */
    2121
     22#ifndef __WIN32OS2__
    2223/****************************************************************************
    2324*  STRRET
    … …  
    4142  }u;
    4243} STRRET,*LPSTRRET;
     44#endif
    4345
    4446/*****************************************************************************
Note: See TracChangeset for help on using the changeset viewer.