From aec4fa18959228ccd3fe14db5fa50e76c5113d54 Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Thu, 26 Aug 2010 02:05:58 +0000 Subject: [PATCH] 2010-08-25 Chris Sutcliffe * include/shlwapi (ASSOCDATA): Update definition. Thank you to Frederic Deschamps for reporting the issue. --- winsup/w32api/ChangeLog | 6 ++++++ winsup/w32api/include/shlwapi.h | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 7a014fffe..d3db8878c 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,9 @@ +2010-08-25 Chris Sutcliffe + + * include/shlwapi (ASSOCDATA): Update definition. + + Thank you to Frederic Deschamps for reporting the issue. + 2010-08-25 Chris Sutcliffe * include/winbase.h (COPY_FILE_OPEN_SOURCE_FOR_WRITE, diff --git a/winsup/w32api/include/shlwapi.h b/winsup/w32api/include/shlwapi.h index aaa01e757..4e844b155 100644 --- a/winsup/w32api/include/shlwapi.h +++ b/winsup/w32api/include/shlwapi.h @@ -89,7 +89,13 @@ typedef enum { ASSOCDATA_MSIDESCRIPTOR = 1, ASSOCDATA_NOACTIVATEHANDLER, - ASSOCDATA_QUERYCLASSSTORE + ASSOCDATA_QUERYCLASSSTORE, + ASSOCDATA_HASPERUSERASSOC +#ifdef _WIN32_IE >= 0x0600 + , + ASSOCDATA_EDITFLAGS, + ASSOCDATA_VALUE +#endif } ASSOCDATA; typedef enum { ASSOCF_INIT_NOREMAPCLSID = 0x00000001,