2003-03-17 Bang Jun-Young <junyoung@netbsd.org>

	* include/winbase.h (EnumResourceLanguages[AW]): Correct prototypes.
	(EnumResourceNames[AW]): Ditto.
	(EnumResourceTypes[AW]): Ditto.
	* include/wincon.h (CONSOLE_FONT_INFO): Add struct.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index b4079df..e29e575 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-17  Bang Jun-Young  <junyoung@netbsd.org>
+
+       * include/winbase.h (EnumResourceLanguages[AW]): Correct prototypes.
+       (EnumResourceNames[AW]): Ditto.
+       (EnumResourceTypes[AW]): Ditto.
+       * include/wincon.h (CONSOLE_FONT_INFO): Add struct.
+
 2003-03-16  Toby Malone  <malone@users.sourceforge.net>
 
        * include/winuser.h (SendInput): Add prototype.

diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index 8bf1aee..483800f 100644 (file)
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -1084,12 +1084,12 @@ BOOL WINAPI EncryptFileW(LPCWSTR);
 BOOL WINAPI EndUpdateResourceA(HANDLE,BOOL);
 BOOL WINAPI EndUpdateResourceW(HANDLE,BOOL);
 void WINAPI EnterCriticalSection(LPCRITICAL_SECTION);
-BOOL WINAPI EnumResourceLanguagesA(HINSTANCE,LPCSTR,LPCSTR,ENUMRESLANGPROC,LONG);
-BOOL WINAPI EnumResourceLanguagesW(HINSTANCE,LPCWSTR,LPCWSTR,ENUMRESLANGPROC,LONG);
-BOOL WINAPI EnumResourceNamesA(HINSTANCE,LPCSTR,ENUMRESNAMEPROC,LONG);
-BOOL WINAPI EnumResourceNamesW(HINSTANCE,LPCWSTR,ENUMRESNAMEPROC,LONG);
-BOOL WINAPI EnumResourceTypesA(HINSTANCE,ENUMRESTYPEPROC,LONG);
-BOOL WINAPI EnumResourceTypesW(HINSTANCE,ENUMRESTYPEPROC,LONG);
+BOOL WINAPI EnumResourceLanguagesA(HMODULE,LPCSTR,LPCSTR,ENUMRESLANGPROC,LONG_PTR);
+BOOL WINAPI EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,ENUMRESLANGPROC,LONG_PTR);
+BOOL WINAPI EnumResourceNamesA(HMODULE,LPCSTR,ENUMRESNAMEPROC,LONG_PTR);
+BOOL WINAPI EnumResourceNamesW(HMODULE,LPCWSTR,ENUMRESNAMEPROC,LONG_PTR);
+BOOL WINAPI EnumResourceTypesA(HMODULE,ENUMRESTYPEPROC,LONG_PTR);
+BOOL WINAPI EnumResourceTypesW(HMODULE,ENUMRESTYPEPROC,LONG_PTR);
 BOOL WINAPI EqualPrefixSid(PSID,PSID);
 BOOL WINAPI EqualSid(PSID,PSID);
 DWORD WINAPI EraseTape(HANDLE,DWORD,BOOL);

diff --git a/winsup/w32api/include/wincon.h b/winsup/w32api/include/wincon.h
index 122f598..b10f4ad 100644 (file)
--- a/winsup/w32api/include/wincon.h
+++ b/winsup/w32api/include/wincon.h
@@ -72,6 +72,10 @@ typedef struct _COORD {
        SHORT X;
        SHORT Y;
 } COORD;
+typedef struct _CONSOLE_FONT_INFO {
+       DWORD nFont;
+       COORD dwFontSize;
+} CONSOLE_FONT_INFO, *PCONSOLE_FONT_INFO;
 typedef struct _CONSOLE_SCREEN_BUFFER_INFO {
        COORD   dwSize;
        COORD   dwCursorPosition;