Changeset 21512 for trunk/include


Ignore:
Timestamp:
Dec 6, 2010, 5:24:51 PM (15 years ago)
Author:
dmik
Message:

Aligned the STRRET definition and made it available through shlwapi.h and shlobj.h for compatibility with Win32.

Location:
trunk/include/win
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/shell.h

    r7822 r21512  
    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 
    98 typedef 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 
    11086#ifdef __cplusplus
    11187} /* extern "C" */

  • trunk/include/win/shlobj.h

    r21508 r21512  
    2323#include "prsht.h"
    2424#include "shlguid.h"
     25#include "shtypes.h"
    2526
    2627#ifdef __cplusplus

  • trunk/include/win/shlwapi.h

    r8585 r21512  
    99#include <winuser.h>
    1010#include <shell.h>
     11#include <shtypes.h>
    1112
    1213#ifdef __cplusplus

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

    r7823 r21512  
    1313#include "wine/obj_oleaut.h"
    1414#include "winbase.h"
    15 #include "shell.h"
     15#include "shtypes.h"
    1616
    1717#ifdef __cplusplus
    1818extern "C" {
    1919#endif /* defined(__cplusplus) */
    20 
    21 #ifndef __WIN32OS2__
    22 /****************************************************************************
    23 *  STRRET
    24 */
    25 #define STRRET_WSTR     0x0000
    26 #define STRRET_OFFSETA  0x0001
    27 #define STRRET_CSTRA    0x0002
    28 #define STRRET_ASTR     0X0003
    29 #define STRRET_OFFSETW  0X0004
    30 #define STRRET_CSTRW    0X0005
    31 
    32 
    33 typedef struct _STRRET
    34 { UINT uType;           /* STRRET_xxx */
    35   union
    36   { LPWSTR      pOleStr;        /* OLESTR that will be freed */
    37     LPSTR       pStr;
    38     UINT        uOffset;        /* OffsetINT32o SHITEMID (ANSI) */
    39     char        cStr[MAX_PATH]; /* Buffer to fill in */
    40     WCHAR       cStrW[MAX_PATH];
    41   }u;
    42 } STRRET,*LPSTRRET;
    43 #endif
    4420
    4521/*****************************************************************************
Note: See TracChangeset for help on using the changeset viewer.