drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2004-04-29 Bart Oldeman <bartoldeman@users.sourceforge.net> 

* include/objbase.h (STGOPTIONS): Correct pwcsTemplateFile type.
	* include/aclui.h: Remove '\r', throughout.
	* include/msacm.h: Likewise.
	* lib/aclui.def: Likewise.
This commit is contained in:
Luke Dunstan 2004-04-30 17:06:21 +00:00
parent e6b21dafc1
commit ed8dd3c858
5 changed files with 335 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/w32api/ChangeLog
View File

@ -1,3 +1,10 @@
2004-04-29 Bart Oldeman <bartoldeman@users.sourceforge.net>
* include/objbase.h (STGOPTIONS): Correct pwcsTemplateFile type.
* include/aclui.h: Remove '\r', throughout.
* include/msacm.h: Likewise.
* lib/aclui.def: Likewise.
2004-04-28 Luke Dunstan <infidel@users.sourceforge.net> 2004-04-28 Luke Dunstan <infidel@users.sourceforge.net>
* lib/comctl32.def (SetWindowSubclass): Add stub. * lib/comctl32.def (SetWindowSubclass): Add stub.

268
winsup/w32api/include/aclui.h
View File

@ -1,134 +1,134 @@
#ifndef _ACLUI_H #ifndef _ACLUI_H
#define _ACLUI_H #define _ACLUI_H
#if __GNUC__ >= 3 #if __GNUC__ >= 3
#pragma GCC system_header #pragma GCC system_header
#endif #endif
#ifndef __OBJC__ #ifndef __OBJC__
#include <objbase.h> #include <objbase.h>
#include <commctrl.h> #include <commctrl.h>
#include <accctrl.h> #include <accctrl.h>
#endif #endif
#if !defined(_ACLUI_) #if !defined(_ACLUI_)
#define ACLUIAPI DECLSPEC_IMPORT WINAPI #define ACLUIAPI DECLSPEC_IMPORT WINAPI
#else #else
#define ACLUIAPI WINAPI #define ACLUIAPI WINAPI
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
typedef struct _SI_OBJECT_INFO typedef struct _SI_OBJECT_INFO
{ {
DWORD dwFlags; DWORD dwFlags;
HINSTANCE hInstance; HINSTANCE hInstance;
LPWSTR pszServerName; LPWSTR pszServerName;
LPWSTR pszObjectName; LPWSTR pszObjectName;
LPWSTR pszPageTitle; LPWSTR pszPageTitle;
GUID guidObjectType; GUID guidObjectType;
} SI_OBJECT_INFO, *PSI_OBJECT_INFO; } SI_OBJECT_INFO, *PSI_OBJECT_INFO;
/* values for SI_OBJECT_INFO.dwFlags */ /* values for SI_OBJECT_INFO.dwFlags */
#define SI_EDIT_PERMS 0x00000000L #define SI_EDIT_PERMS 0x00000000L
#define SI_EDIT_OWNER 0x00000001L #define SI_EDIT_OWNER 0x00000001L
#define SI_EDIT_AUDITS 0x00000002L #define SI_EDIT_AUDITS 0x00000002L
#define SI_CONTAINER 0x00000004L #define SI_CONTAINER 0x00000004L
#define SI_READONLY 0x00000008L #define SI_READONLY 0x00000008L
#define SI_ADVANCED 0x00000010L #define SI_ADVANCED 0x00000010L
#define SI_RESET 0x00000020L #define SI_RESET 0x00000020L
#define SI_OWNER_READONLY 0x00000040L #define SI_OWNER_READONLY 0x00000040L
#define SI_EDIT_PROPERTIES 0x00000080L #define SI_EDIT_PROPERTIES 0x00000080L
#define SI_OWNER_RECURSE 0x00000100L #define SI_OWNER_RECURSE 0x00000100L
#define SI_NO_ACL_PROTECT 0x00000200L #define SI_NO_ACL_PROTECT 0x00000200L
#define SI_NO_TREE_APPLY 0x00000400L #define SI_NO_TREE_APPLY 0x00000400L
#define SI_PAGE_TITLE 0x00000800L #define SI_PAGE_TITLE 0x00000800L
#define SI_SERVER_IS_DC 0x00001000L #define SI_SERVER_IS_DC 0x00001000L
#define SI_RESET_DACL_TREE 0x00004000L #define SI_RESET_DACL_TREE 0x00004000L
#define SI_RESET_SACL_TREE 0x00008000L #define SI_RESET_SACL_TREE 0x00008000L
#define SI_OBJECT_GUID 0x00010000L #define SI_OBJECT_GUID 0x00010000L
#define SI_EDIT_EFFECTIVE 0x00020000L #define SI_EDIT_EFFECTIVE 0x00020000L
#define SI_RESET_DACL 0x00040000L #define SI_RESET_DACL 0x00040000L
#define SI_RESET_SACL 0x00080000L #define SI_RESET_SACL 0x00080000L
#define SI_RESET_OWNER 0x00100000L #define SI_RESET_OWNER 0x00100000L
#define SI_NO_ADDITIONAL_PERMISSION 0x00200000L #define SI_NO_ADDITIONAL_PERMISSION 0x00200000L
#define SI_MAY_WRITE 0x10000000L #define SI_MAY_WRITE 0x10000000L
#define SI_EDIT_ALL (SI_EDIT_PERMS | SI_EDIT_OWNER | SI_EDIT_AUDITS) #define SI_EDIT_ALL (SI_EDIT_PERMS | SI_EDIT_OWNER | SI_EDIT_AUDITS)
typedef struct _SI_ACCESS typedef struct _SI_ACCESS
{ {
const GUID* pguid; const GUID* pguid;
ACCESS_MASK mask; ACCESS_MASK mask;
LPCWSTR pszName; LPCWSTR pszName;
DWORD dwFlags; DWORD dwFlags;
} SI_ACCESS, *PSI_ACCESS; } SI_ACCESS, *PSI_ACCESS;
/* values for SI_ACCESS.dwFlags */ /* values for SI_ACCESS.dwFlags */
#define SI_ACCESS_SPECIFIC 0x00010000L #define SI_ACCESS_SPECIFIC 0x00010000L
#define SI_ACCESS_GENERAL 0x00020000L #define SI_ACCESS_GENERAL 0x00020000L
#define SI_ACCESS_CONTAINER 0x00040000L #define SI_ACCESS_CONTAINER 0x00040000L
#define SI_ACCESS_PROPERTY 0x00080000L #define SI_ACCESS_PROPERTY 0x00080000L
typedef struct _SI_INHERIT_TYPE typedef struct _SI_INHERIT_TYPE
{ {
const GUID* pguid; const GUID* pguid;
ULONG dwFlags; ULONG dwFlags;
LPCWSTR pszName; LPCWSTR pszName;
} SI_INHERIT_TYPE, *PSI_INHERIT_TYPE; } SI_INHERIT_TYPE, *PSI_INHERIT_TYPE;
/* values for SI_INHERIT_TYPE.dwFlags /* values for SI_INHERIT_TYPE.dwFlags
INHERIT_ONLY_ACE, CONTAINER_INHERIT_ACE, OBJECT_INHERIT_ACE INHERIT_ONLY_ACE, CONTAINER_INHERIT_ACE, OBJECT_INHERIT_ACE
defined elsewhere */ defined elsewhere */
typedef enum _SI_PAGE_TYPE typedef enum _SI_PAGE_TYPE
{ {
SI_PAGE_PERM = 0, SI_PAGE_PERM = 0,
SI_PAGE_ADVPERM, SI_PAGE_ADVPERM,
SI_PAGE_AUDIT, SI_PAGE_AUDIT,
SI_PAGE_OWNER SI_PAGE_OWNER
} SI_PAGE_TYPE; } SI_PAGE_TYPE;
#define PSPCB_SI_INITDIALOG (WM_USER + 1) #define PSPCB_SI_INITDIALOG (WM_USER + 1)
#ifndef __ISecurityInformation_INTERFACE_DEFINED__ #ifndef __ISecurityInformation_INTERFACE_DEFINED__
#define __ISecurityInformation_INTERFACE_DEFINED__ #define __ISecurityInformation_INTERFACE_DEFINED__
#undef INTERFACE #undef INTERFACE
#define INTERFACE ISecurityInformation #define INTERFACE ISecurityInformation
DECLARE_INTERFACE_(ISecurityInformation, IUnknown) DECLARE_INTERFACE_(ISecurityInformation, IUnknown)
{ {
STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE;
STDMETHOD(GetObjectInformation)(THIS_ PSI_OBJECT_INFO) PURE; STDMETHOD(GetObjectInformation)(THIS_ PSI_OBJECT_INFO) PURE;
STDMETHOD(GetSecurity)(THIS_ SECURITY_INFORMATION,PSECURITY_DESCRIPTOR*,BOOL) PURE; STDMETHOD(GetSecurity)(THIS_ SECURITY_INFORMATION,PSECURITY_DESCRIPTOR*,BOOL) PURE;
STDMETHOD(SetSecurity)(THIS_ SECURITY_INFORMATION,PSECURITY_DESCRIPTOR) PURE; STDMETHOD(SetSecurity)(THIS_ SECURITY_INFORMATION,PSECURITY_DESCRIPTOR) PURE;
STDMETHOD(GetAccessRights)(THIS_ const GUID*,DWORD,PSI_ACCESS*,ULONG*,ULONG*) PURE; STDMETHOD(GetAccessRights)(THIS_ const GUID*,DWORD,PSI_ACCESS*,ULONG*,ULONG*) PURE;
STDMETHOD(MapGeneric)(THIS_ const GUID*,UCHAR*,ACCESS_MASK*) PURE; STDMETHOD(MapGeneric)(THIS_ const GUID*,UCHAR*,ACCESS_MASK*) PURE;
STDMETHOD(GetInheritTypes)(THIS_ PSI_INHERIT_TYPE*,ULONG*) PURE; STDMETHOD(GetInheritTypes)(THIS_ PSI_INHERIT_TYPE*,ULONG*) PURE;
STDMETHOD(PropertySheetPageCallback)(THIS_ HWND,UINT,SI_PAGE_TYPE) PURE; STDMETHOD(PropertySheetPageCallback)(THIS_ HWND,UINT,SI_PAGE_TYPE) PURE;
}; };
typedef ISecurityInformation *LPSECURITYINFO; typedef ISecurityInformation *LPSECURITYINFO;
#endif #endif
/* /*
* TODO: ISecurityInformation2, IEffectivePermission, ISecurityObjectTypeInfo * TODO: ISecurityInformation2, IEffectivePermission, ISecurityObjectTypeInfo
*/ */
extern DECLSPEC_IMPORT const IID IID_ISecurityInformation; extern DECLSPEC_IMPORT const IID IID_ISecurityInformation;
HPROPSHEETPAGE ACLUIAPI CreateSecurityPage(LPSECURITYINFO psi); HPROPSHEETPAGE ACLUIAPI CreateSecurityPage(LPSECURITYINFO psi);
BOOL ACLUIAPI EditSecurity(HWND hwndOwner, LPSECURITYINFO psi); BOOL ACLUIAPI EditSecurity(HWND hwndOwner, LPSECURITYINFO psi);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif

372
winsup/w32api/include/msacm.h
View File

@ -1,186 +1,186 @@
/*author: Adrian Sandor /*author: Adrian Sandor
written for MinGW*/ written for MinGW*/
#ifndef _MSACM_H #ifndef _MSACM_H
#define _MSACM_H #define _MSACM_H
#if __GNUC__ >= 3 #if __GNUC__ >= 3
#pragma GCC system_header #pragma GCC system_header
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
typedef HANDLE HACMDRIVERID, HACMDRIVER, *LPHACMDRIVER; /*they're handles, right?*/ typedef HANDLE HACMDRIVERID, HACMDRIVER, *LPHACMDRIVER; /*they're handles, right?*/
/*found through experimentation*/ /*found through experimentation*/
#define ACMDRIVERDETAILS_SHORTNAME_CHARS 32 #define ACMDRIVERDETAILS_SHORTNAME_CHARS 32
#define ACMDRIVERDETAILS_LONGNAME_CHARS 128 #define ACMDRIVERDETAILS_LONGNAME_CHARS 128
#define ACMDRIVERDETAILS_COPYRIGHT_CHARS 80 #define ACMDRIVERDETAILS_COPYRIGHT_CHARS 80
#define ACMDRIVERDETAILS_LICENSING_CHARS 128 #define ACMDRIVERDETAILS_LICENSING_CHARS 128
/*I don't know the right values for these macros*/ /*I don't know the right values for these macros*/
#define ACMFORMATDETAILS_FORMAT_CHARS 256 #define ACMFORMATDETAILS_FORMAT_CHARS 256
#define ACMFORMATTAGDETAILS_FORMATTAG_CHARS 256 #define ACMFORMATTAGDETAILS_FORMATTAG_CHARS 256
#define ACMDRIVERDETAILS_FEATURES_CHARS 256 #define ACMDRIVERDETAILS_FEATURES_CHARS 256
/*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmformatdetails_str.asp*/ /*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmformatdetails_str.asp*/
typedef struct { typedef struct {
DWORD cbStruct; DWORD cbStruct;
DWORD dwFormatIndex; DWORD dwFormatIndex;
DWORD dwFormatTag; DWORD dwFormatTag;
DWORD fdwSupport; DWORD fdwSupport;
LPWAVEFORMATEX pwfx; LPWAVEFORMATEX pwfx;
DWORD cbwfx; DWORD cbwfx;
char szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; char szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
} ACMFORMATDETAILSA, *LPACMFORMATDETAILSA; } ACMFORMATDETAILSA, *LPACMFORMATDETAILSA;
typedef struct { typedef struct {
DWORD cbStruct; DWORD cbStruct;
DWORD dwFormatIndex; DWORD dwFormatIndex;
DWORD dwFormatTag; DWORD dwFormatTag;
DWORD fdwSupport; DWORD fdwSupport;
LPWAVEFORMATEX pwfx; LPWAVEFORMATEX pwfx;
DWORD cbwfx; DWORD cbwfx;
WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
} ACMFORMATDETAILSW, *LPACMFORMATDETAILSW; } ACMFORMATDETAILSW, *LPACMFORMATDETAILSW;
/*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmformattagdetails_str.asp*/ /*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmformattagdetails_str.asp*/
typedef struct { typedef struct {
DWORD cbStruct; DWORD cbStruct;
DWORD dwFormatTagIndex; DWORD dwFormatTagIndex;
DWORD dwFormatTag; DWORD dwFormatTag;
DWORD cbFormatSize; DWORD cbFormatSize;
DWORD fdwSupport; DWORD fdwSupport;
DWORD cStandardFormats; DWORD cStandardFormats;
char szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; char szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
} ACMFORMATTAGDETAILSA, *LPACMFORMATTAGDETAILSA; } ACMFORMATTAGDETAILSA, *LPACMFORMATTAGDETAILSA;
typedef struct { typedef struct {
DWORD cbStruct; DWORD cbStruct;
DWORD dwFormatTagIndex; DWORD dwFormatTagIndex;
DWORD dwFormatTag; DWORD dwFormatTag;
DWORD cbFormatSize; DWORD cbFormatSize;
DWORD fdwSupport; DWORD fdwSupport;
DWORD cStandardFormats; DWORD cStandardFormats;
WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
} ACMFORMATTAGDETAILSW, *LPACMFORMATTAGDETAILSW; } ACMFORMATTAGDETAILSW, *LPACMFORMATTAGDETAILSW;
/*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmdriverdetails_str.asp*/ /*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmdriverdetails_str.asp*/
typedef struct { typedef struct {
DWORD cbStruct; DWORD cbStruct;
FOURCC fccType; FOURCC fccType;
FOURCC fccComp; FOURCC fccComp;
WORD wMid; WORD wMid;
WORD wPid; WORD wPid;
DWORD vdwACM; DWORD vdwACM;
DWORD vdwDriver; DWORD vdwDriver;
DWORD fdwSupport; DWORD fdwSupport;
DWORD cFormatTags; DWORD cFormatTags;
DWORD cFilterTags; DWORD cFilterTags;
HICON hicon; HICON hicon;
char szShortName[ACMDRIVERDETAILS_SHORTNAME_CHARS]; char szShortName[ACMDRIVERDETAILS_SHORTNAME_CHARS];
char szLongName[ACMDRIVERDETAILS_LONGNAME_CHARS]; char szLongName[ACMDRIVERDETAILS_LONGNAME_CHARS];
char szCopyright[ACMDRIVERDETAILS_COPYRIGHT_CHARS]; char szCopyright[ACMDRIVERDETAILS_COPYRIGHT_CHARS];
char szLicensing[ACMDRIVERDETAILS_LICENSING_CHARS]; char szLicensing[ACMDRIVERDETAILS_LICENSING_CHARS];
char szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS]; char szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
} ACMDRIVERDETAILSA, *LPACMDRIVERDETAILSA; } ACMDRIVERDETAILSA, *LPACMDRIVERDETAILSA;
typedef struct { typedef struct {
DWORD cbStruct; DWORD cbStruct;
FOURCC fccType; FOURCC fccType;
FOURCC fccComp; FOURCC fccComp;
WORD wMid; WORD wMid;
WORD wPid; WORD wPid;
DWORD vdwACM; DWORD vdwACM;
DWORD vdwDriver; DWORD vdwDriver;
DWORD fdwSupport; DWORD fdwSupport;
DWORD cFormatTags; DWORD cFormatTags;
DWORD cFilterTags; DWORD cFilterTags;
HICON hicon; HICON hicon;
WCHAR szShortName[ACMDRIVERDETAILS_SHORTNAME_CHARS]; WCHAR szShortName[ACMDRIVERDETAILS_SHORTNAME_CHARS];
WCHAR szLongName[ACMDRIVERDETAILS_LONGNAME_CHARS]; WCHAR szLongName[ACMDRIVERDETAILS_LONGNAME_CHARS];
WCHAR szCopyright[ACMDRIVERDETAILS_COPYRIGHT_CHARS]; WCHAR szCopyright[ACMDRIVERDETAILS_COPYRIGHT_CHARS];
WCHAR szLicensing[ACMDRIVERDETAILS_LICENSING_CHARS]; WCHAR szLicensing[ACMDRIVERDETAILS_LICENSING_CHARS];
WCHAR szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS]; WCHAR szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
} ACMDRIVERDETAILSW, *LPACMDRIVERDETAILSW; } ACMDRIVERDETAILSW, *LPACMDRIVERDETAILSW;
/*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmformatenumcallback.asp*/ /*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmformatenumcallback.asp*/
typedef BOOL (CALLBACK *ACMFORMATENUMCBA) ( typedef BOOL (CALLBACK *ACMFORMATENUMCBA) (
HACMDRIVERID hadid, HACMDRIVERID hadid,
LPACMFORMATDETAILSA pafd, LPACMFORMATDETAILSA pafd,
DWORD_PTR dwInstance, DWORD_PTR dwInstance,
DWORD fdwSupport DWORD fdwSupport
); );
typedef BOOL (CALLBACK *ACMFORMATENUMCBW) ( typedef BOOL (CALLBACK *ACMFORMATENUMCBW) (
HACMDRIVERID hadid, HACMDRIVERID hadid,
LPACMFORMATDETAILSW pafd, LPACMFORMATDETAILSW pafd,
DWORD_PTR dwInstance, DWORD_PTR dwInstance,
DWORD fdwSupport DWORD fdwSupport
); );
/*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmformattagenumcallback.asp*/ /*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmformattagenumcallback.asp*/
typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBA) ( typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBA) (
HACMDRIVERID hadid, HACMDRIVERID hadid,
LPACMFORMATTAGDETAILSA paftd, LPACMFORMATTAGDETAILSA paftd,
DWORD_PTR dwInstance, DWORD_PTR dwInstance,
DWORD fdwSupport DWORD fdwSupport
); );
typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBW) ( typedef BOOL (CALLBACK *ACMFORMATTAGENUMCBW) (
HACMDRIVERID hadid, HACMDRIVERID hadid,
LPACMFORMATTAGDETAILSW paftd, LPACMFORMATTAGDETAILSW paftd,
DWORD_PTR dwInstance, DWORD_PTR dwInstance,
DWORD fdwSupport DWORD fdwSupport
); );
/*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmdriverenumcallback.asp*/ /*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmdriverenumcallback.asp*/
typedef BOOL (CALLBACK *ACMDRIVERENUMCB) ( typedef BOOL (CALLBACK *ACMDRIVERENUMCB) (
HACMDRIVERID hadid, HACMDRIVERID hadid,
DWORD_PTR dwInstance, DWORD_PTR dwInstance,
DWORD fdwSupport DWORD fdwSupport
); );
/*and now the functions...*/ /*and now the functions...*/
/*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmdriveropen.asp*/ /*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmdriveropen.asp*/
MMRESULT WINAPI acmDriverOpen(LPHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpen); MMRESULT WINAPI acmDriverOpen(LPHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpen);
/*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmdriverenum.asp*/ /*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmdriverenum.asp*/
MMRESULT WINAPI acmDriverEnum(ACMDRIVERENUMCB fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum); MMRESULT WINAPI acmDriverEnum(ACMDRIVERENUMCB fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum);
/*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmformatenum.asp*/ /*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmformatenum.asp*/
MMRESULT WINAPI acmFormatEnumA(HACMDRIVER had, LPACMFORMATDETAILSA pafd, ACMFORMATENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum); MMRESULT WINAPI acmFormatEnumA(HACMDRIVER had, LPACMFORMATDETAILSA pafd, ACMFORMATENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum);
MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, LPACMFORMATDETAILSW pafd, ACMFORMATENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum); MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, LPACMFORMATDETAILSW pafd, ACMFORMATENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum);
/*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmdriverclose.asp*/ /*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmdriverclose.asp*/
MMRESULT WINAPI acmDriverClose(HACMDRIVER had, DWORD fdwClose); MMRESULT WINAPI acmDriverClose(HACMDRIVER had, DWORD fdwClose);
/*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmdriverdetails.asp*/ /*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmdriverdetails.asp*/
MMRESULT WINAPI acmDriverDetailsA(HACMDRIVERID hadid, LPACMDRIVERDETAILSA padd, DWORD fdwDetails); MMRESULT WINAPI acmDriverDetailsA(HACMDRIVERID hadid, LPACMDRIVERDETAILSA padd, DWORD fdwDetails);
MMRESULT WINAPI acmDriverDetailsW(HACMDRIVERID hadid, LPACMDRIVERDETAILSW padd, DWORD fdwDetails); MMRESULT WINAPI acmDriverDetailsW(HACMDRIVERID hadid, LPACMDRIVERDETAILSW padd, DWORD fdwDetails);
/*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmformattagenum.asp*/ /*msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/htm/_win32_acmformattagenum.asp*/
MMRESULT WINAPI acmFormatTagEnumA(HACMDRIVER had, LPACMFORMATTAGDETAILSA paftd, ACMFORMATTAGENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum); MMRESULT WINAPI acmFormatTagEnumA(HACMDRIVER had, LPACMFORMATTAGDETAILSA paftd, ACMFORMATTAGENUMCBA fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum);
MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, LPACMFORMATTAGDETAILSW paftd, ACMFORMATTAGENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum); MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, LPACMFORMATTAGDETAILSW paftd, ACMFORMATTAGENUMCBW fnCallback, DWORD_PTR dwInstance, DWORD fdwEnum);
#ifdef UNICODE #ifdef UNICODE
typedef ACMFORMATDETAILSW ACMFORMATDETAILS, *LPACMFORMATDETAILS; typedef ACMFORMATDETAILSW ACMFORMATDETAILS, *LPACMFORMATDETAILS;
typedef ACMFORMATTAGDETAILSW ACMFORMATTAGDETAILS, *LPACMFORMATTAGDETAILS; typedef ACMFORMATTAGDETAILSW ACMFORMATTAGDETAILS, *LPACMFORMATTAGDETAILS;
typedef ACMDRIVERDETAILSW ACMDRIVERDETAILS, *LPACMDRIVERDETAILS; typedef ACMDRIVERDETAILSW ACMDRIVERDETAILS, *LPACMDRIVERDETAILS;
typedef ACMFORMATENUMCBW ACMFORMATENUMCB; typedef ACMFORMATENUMCBW ACMFORMATENUMCB;
typedef ACMFORMATTAGENUMCBW ACMFORMATTAGENUMCB; typedef ACMFORMATTAGENUMCBW ACMFORMATTAGENUMCB;
#define acmFormatEnum acmFormatEnumW #define acmFormatEnum acmFormatEnumW
#define acmDriverDetails acmDriverDetailsW #define acmDriverDetails acmDriverDetailsW
#define acmFormatTagEnum acmFormatTagEnumW #define acmFormatTagEnum acmFormatTagEnumW
#else /*ifdef UNICODE*/ #else /*ifdef UNICODE*/
typedef ACMFORMATDETAILSA ACMFORMATDETAILS, *LPACMFORMATDETAILS; typedef ACMFORMATDETAILSA ACMFORMATDETAILS, *LPACMFORMATDETAILS;
typedef ACMFORMATTAGDETAILSA ACMFORMATTAGDETAILS, *LPACMFORMATTAGDETAILS; typedef ACMFORMATTAGDETAILSA ACMFORMATTAGDETAILS, *LPACMFORMATTAGDETAILS;
typedef ACMDRIVERDETAILSA ACMDRIVERDETAILS, *LPACMDRIVERDETAILS; typedef ACMDRIVERDETAILSA ACMDRIVERDETAILS, *LPACMDRIVERDETAILS;
typedef ACMFORMATENUMCBA ACMFORMATENUMCB; typedef ACMFORMATENUMCBA ACMFORMATENUMCB;
typedef ACMFORMATTAGENUMCBA ACMFORMATTAGENUMCB; typedef ACMFORMATTAGENUMCBA ACMFORMATTAGENUMCB;
#define acmFormatEnum acmFormatEnumA #define acmFormatEnum acmFormatEnumA
#define acmDriverDetails acmDriverDetailsA #define acmDriverDetails acmDriverDetailsA
#define acmFormatTagEnum acmFormatTagEnumA #define acmFormatTagEnum acmFormatTagEnumA
#endif /*ifdef UNICODE*/ #endif /*ifdef UNICODE*/
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif

2
winsup/w32api/include/objbase.h
View File

@ -61,7 +61,7 @@ typedef struct tagSTGOPTIONS {
USHORT usVersion; USHORT usVersion;
USHORT reserved; USHORT reserved;
ULONG ulSectorSize; ULONG ulSectorSize;
const WCHAR pwcsTemplateFile; const WCHAR *pwcsTemplateFile;
} STGOPTIONS; } STGOPTIONS;
typedef enum tagREGCLS { typedef enum tagREGCLS {
REGCLS_SINGLEUSE = 0, REGCLS_SINGLEUSE = 0,

14
winsup/w32api/lib/aclui.def
View File

@ -1,7 +1,7 @@
LIBRARY ACLUI.dll LIBRARY ACLUI.dll
EXPORTS EXPORTS
CreateSecurityPage@4 CreateSecurityPage@4
EditSecurity@8 EditSecurity@8
IID_ISecurityInformation DATA IID_ISecurityInformation DATA