diff options
| author | Dimitri Papadopoulos <dimitri_at@users.sf.net> | 2006-04-28 21:34:02 +0400 |
|---|---|---|
| committer | Dimitri Papadopoulos <dimitri_at@users.sf.net> | 2006-04-28 21:34:02 +0400 |
| commit | 5dcc8b249aae6afd9b8251320fd5d1654a474894 (patch) | |
| tree | 91229bb27ad545ebbd5eed9bacc3aab99ba46b68 /winsup | |
| parent | f7f95ba17237128fdd85eb63aa1aac2f592ab21b (diff) | |
* include/winbase.h (ENUMRES*PROC{AW}): ANSI and Unicode versions.
Thanks to: Oliver Stoeneberg <kidkat at sf dot net>
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/w32api/include/winbase.h | 24 |
2 files changed, 26 insertions, 3 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index a768c474d..e63009bf9 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,5 +1,10 @@ 2006-04-28 Dimitri Papadopoulos <papadopo@users.sourceforge.net> + * include/winbase.h (ENUMRES*PROC{AW}): ANSI and Unicode versions. + Thanks to: Oliver Stoeneberg <kidkat at sf dot net> + +2006-04-28 Dimitri Papadopoulos <papadopo@users.sourceforge.net> + * include/ntsecapi.h (POLICY_DNS_DOMAIN_INFO): Fix typo. Thanks to: Oliver Stoeneberg <kidkat at sf dot net> diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index 003ff3ca0..b85096cd3 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -1060,9 +1060,27 @@ typedef DWORD EXECUTION_STATE; typedef DWORD(WINAPI *LPPROGRESS_ROUTINE)(LARGE_INTEGER,LARGE_INTEGER,LARGE_INTEGER,LARGE_INTEGER,DWORD,DWORD,HANDLE,HANDLE,LPVOID); typedef void(WINAPI *LPFIBER_START_ROUTINE)(PVOID); -typedef BOOL(CALLBACK *ENUMRESLANGPROC)(HMODULE,LPCTSTR,LPCTSTR,WORD,LONG); -typedef BOOL(CALLBACK *ENUMRESNAMEPROC)(HMODULE,LPCTSTR,LPTSTR,LONG); -typedef BOOL(CALLBACK *ENUMRESTYPEPROC)(HMODULE,LPTSTR,LONG); +typedef BOOL(CALLBACK *ENUMRESLANGPROCA)(HMODULE,LPCSTR,LPCSTR,WORD,LONG); +typedef BOOL(CALLBACK *ENUMRESLANGPROCW)(HMODULE,LPCWSTR,LPCWSTR,WORD,LONG); +#ifdef UNICODE +#define ENUMRESLANGPROC ENUMRESLANGPROCW +#else +#define ENUMRESLANGPROC ENUMRESLANGPROCA +#endif +typedef BOOL(CALLBACK *ENUMRESNAMEPROCA)(HMODULE,LPCSTR,LPSTR,LONG); +typedef BOOL(CALLBACK *ENUMRESNAMEPROCW)(HMODULE,LPCWSTR,LPWSTR,LONG); +#ifdef UNICODE +#define ENUMRESNAMEPROC ENUMRESNAMEPROCW +#else +#define ENUMRESNAMEPROC ENUMRESNAMEPROCA +#endif +typedef BOOL(CALLBACK *ENUMRESTYPEPROCA)(HMODULE,LPSTR,LONG); +typedef BOOL(CALLBACK *ENUMRESTYPEPROCW)(HMODULE,LPWSTR,LONG); +#ifdef UNICODE +#define ENUMRESTYPEPROC ENUMRESTYPEPROCW +#else +#define ENUMRESTYPEPROC ENUMRESTYPEPROCA +#endif typedef void(CALLBACK *LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD,DWORD,LPOVERLAPPED); typedef LONG(CALLBACK *PTOP_LEVEL_EXCEPTION_FILTER)(LPEXCEPTION_POINTERS); typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER; |