mirror of
https://github.com/nzp-team/fteqw.git
synced 2024-11-26 05:41:52 +00:00
Attempt to detect MSVC SDK version and avoid redefining structs that already defined within V7's SDK
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3692 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
4fcc97b0a6
commit
e512bb77d1
1 changed files with 12 additions and 0 deletions
|
@ -1273,21 +1273,32 @@ HWND hwnd_dialog;
|
|||
#include <shlobj.h>
|
||||
//#include <Propsys.h>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#include "ntverp.h"
|
||||
#endif
|
||||
|
||||
#ifndef SHARD_APPIDINFOLINK
|
||||
|
||||
// SDK version 7600 = v7.0a & v7.1
|
||||
#if !defined(VER_PRODUCTBUILD) || VER_PRODUCTBUILD < 7600
|
||||
typedef struct SHARDAPPIDINFOLINK {
|
||||
IShellLinkW *psl;
|
||||
PCWSTR pszAppID;
|
||||
} SHARDAPPIDINFOLINK;
|
||||
#endif
|
||||
|
||||
#define SHARD_APPIDINFOLINK 0x00000007
|
||||
|
||||
#if !defined(VER_PRODUCTBUILD) || VER_PRODUCTBUILD < 7600
|
||||
typedef struct {
|
||||
GUID fmtid;
|
||||
DWORD pid;
|
||||
} PROPERTYKEY;
|
||||
#endif
|
||||
typedef struct IPropertyStore IPropertyStore;
|
||||
;
|
||||
#ifndef MINGW
|
||||
#if !defined(VER_PRODUCTBUILD) || VER_PRODUCTBUILD < 7600
|
||||
typedef struct IPropertyStore
|
||||
{
|
||||
CONST_VTBL struct
|
||||
|
@ -1327,6 +1338,7 @@ typedef struct IPropertyStore
|
|||
} *lpVtbl;
|
||||
} IPropertyStore;
|
||||
#endif
|
||||
#endif
|
||||
static const IID IID_IPropertyStore = {0x886d8eeb, 0x8cf2, 0x4446, {0x8d, 0x02, 0xcd, 0xba, 0x1d, 0xbd, 0xcf, 0x99}};
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue