nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-22 12:01:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Attempt to detect MSVC SDK version and avoid redefining structs that already defined within V7's SDK

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3692 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Lance 2010-12-10 05:01:25 +00:00
parent 4fcc97b0a6
commit e512bb77d1
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
engine/client/sys_win.c
View file

@ -1273,21 +1273,32 @@ HWND hwnd_dialog;
#include <shlobj.h> #include <shlobj.h>
//#include <Propsys.h> //#include <Propsys.h>
#ifdef _MSC_VER
#include "ntverp.h"
#endif
#ifndef SHARD_APPIDINFOLINK #ifndef SHARD_APPIDINFOLINK
// SDK version 7600 = v7.0a & v7.1
#if !defined(VER_PRODUCTBUILD) || VER_PRODUCTBUILD < 7600
typedef struct SHARDAPPIDINFOLINK { typedef struct SHARDAPPIDINFOLINK {
IShellLinkW *psl; IShellLinkW *psl;
PCWSTR pszAppID; PCWSTR pszAppID;
} SHARDAPPIDINFOLINK; } SHARDAPPIDINFOLINK;
#endif
#define SHARD_APPIDINFOLINK 0x00000007 #define SHARD_APPIDINFOLINK 0x00000007
#if !defined(VER_PRODUCTBUILD) || VER_PRODUCTBUILD < 7600
typedef struct { typedef struct {
GUID fmtid; GUID fmtid;
DWORD pid; DWORD pid;
} PROPERTYKEY; } PROPERTYKEY;
#endif
typedef struct IPropertyStore IPropertyStore; typedef struct IPropertyStore IPropertyStore;
; ;
#ifndef MINGW #ifndef MINGW
#if !defined(VER_PRODUCTBUILD) || VER_PRODUCTBUILD < 7600
typedef struct IPropertyStore typedef struct IPropertyStore
{ {
CONST_VTBL struct CONST_VTBL struct
@ -1327,6 +1338,7 @@ typedef struct IPropertyStore
} *lpVtbl; } *lpVtbl;
} IPropertyStore; } IPropertyStore;
#endif #endif
#endif
static const IID IID_IPropertyStore = {0x886d8eeb, 0x8cf2, 0x4446, {0x8d, 0x02, 0xcd, 0xba, 0x1d, 0xbd, 0xcf, 0x99}}; static const IID IID_IPropertyStore = {0x886d8eeb, 0x8cf2, 0x4446, {0x8d, 0x02, 0xcd, 0xba, 0x1d, 0xbd, 0xcf, 0x99}};
#endif #endif