Changeset 488 for trunk/include

Timestamp:

Aug 13, 1999, 1:33:38 AM (26 years ago)

Author:

phaller

Message:

Add: added ODINWRAP support plus few enhancements to VERSION

Location:

trunk/include

Files:

• odin.h (modified) (5 diffs)
• win/version.h (deleted)
• win/winbase.h (modified) (2 diffs)
• win/winver.h (modified) (2 diffs)

trunk/include/odin.h

@@ -1 @@
-/* $Id: odin.h,v 1.4 1999-06-10 16:21:48 achimha Exp $ */
+/* $Id: odin.h,v 1.5 1999-08-12 23:33:36 phaller Exp $ */
 /*
  *
@@ -45 +45 @@
   #define EXPORT    _export
   #define WIN32API  __stdcall
+  #define WINAPI    __stdcall
   #define SYSTEM    __stdcall
   #define PASCAL    _Pascal
@@ -55 +56 @@
   #define EXPORT    _export
   #define WIN32API  __stdcall
+  #define WINAPI    __stdcall
   #define SYSTEM    __stdcall
   #define PASCAL    _Pascal
@@ -65 +67 @@
   #define EXPORT    _Export
   #define WIN32API  __stdcall
+  #define WINAPI    __stdcall
   #define SYSTEM    _System
   #define PASCAL    _Pascal
@@ -77 +80 @@
 
 
-/* map WINE to ODIN */
-#ifdef WINAPI
-#  undef WINAPI
-#endif
-#define WINAPI WIN32API
-
 #include <builtin.h>
 

trunk/include/win/winbase.h

@@ -1 @@
-/* $Id: winbase.h,v 1.2 1999-07-06 15:48:44 phaller Exp $ */
+/* $Id: winbase.h,v 1.3 1999-08-12 23:33:37 phaller Exp $ */
 
 #ifndef __WINE_WINBASE_H
@@ -1765 +1765 @@
 DWORD       WINAPI SizeofResource(HMODULE,HRSRC);
 #define     UnlockSegment(handle) GlobalUnfix((HANDLE)(handle))
-DWORD       WINAPI VerLanguageNameA(UINT,LPSTR,UINT);
-DWORD       WINAPI VerLanguageNameW(UINT,LPWSTR,UINT);
-#define     VerLanguageName WINELIB_NAME_AW(VerLanguageName)
+DWORD       WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD);
+DWORD       WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD);
 BOOL      WINAPI WritePrivateProfileSectionA(LPCSTR,LPCSTR,LPCSTR);
 BOOL      WINAPI WritePrivateProfileSectionW(LPCWSTR,LPCWSTR,LPCWSTR);

trunk/include/win/winver.h

@@ -1 @@
-/* $Id: winver.h,v 1.1 1999-05-24 20:19:23 ktk Exp $ */
+/* $Id: winver.h,v 1.2 1999-08-12 23:33:37 phaller Exp $ */
 
 #ifndef __WINE_WINVER_H
@@ -6 +6 @@
 #include "windef.h"
 
-DWORD       WINAPI VerFindFile16(UINT16,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT16*,LPSTR,UINT16*);
-DWORD       WINAPI VerFindFileA(UINT,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT*,LPSTR,UINT*);
-DWORD       WINAPI VerFindFileW(UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT*,LPWSTR,UINT*);
-#define     VerFindFile WINELIB_NAME_AW(VerFindFile)
-DWORD       WINAPI VerInstallFile16(UINT16,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT16*);
-DWORD       WINAPI VerInstallFileA(UINT,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,UINT*);
-DWORD       WINAPI VerInstallFileW(UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,UINT*);
-#define     VerInstallFile WINELIB_NAME_AW(VerInstallFile)
-DWORD       WINAPI VerLanguageName16(UINT16,LPSTR,UINT16);
-DWORD       WINAPI VerQueryValue16(SEGPTR,LPCSTR,SEGPTR*,UINT16*);
-DWORD       WINAPI VerQueryValueA(LPVOID,LPCSTR,LPVOID*,UINT*);
-DWORD       WINAPI VerQueryValueW(LPVOID,LPCWSTR,LPVOID*,UINT*);
-#define     VerQueryValue WINELIB_NAME_AW(VerQueryValue)
-DWORD       WINAPI GetFileVersionInfoSize16(LPCSTR,LPDWORD);
-DWORD       WINAPI GetFileVersionInfoSizeA(LPCSTR,LPDWORD);
-DWORD       WINAPI GetFileVersionInfoSizeW(LPCWSTR,LPDWORD);
-#define     GetFileVersionInfoSize WINELIB_NAME_AW(GetFileVersionInfoSize)
-DWORD       WINAPI GetFileVersionInfo16(LPCSTR,DWORD,DWORD,LPVOID);
-DWORD       WINAPI GetFileVersionInfoA(LPCSTR,DWORD,DWORD,LPVOID);
-DWORD       WINAPI GetFileVersionInfoW(LPCWSTR,DWORD,DWORD,LPVOID);
-#define     GetFileVersionInfo WINELIB_NAME_AW(GetFileVersionInfo)
+// enable C linkage to avoid parameter mangling
+#ifdef __cplusplus__
+extern "C" {
+#endif
+
+
+DWORD       WINAPI VerFindFileA(DWORD,LPSTR,LPSTR,LPSTR,LPSTR,PUINT,LPSTR,PUINT);
+DWORD       WINAPI VerFindFileW(DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT,LPWSTR,PUINT);
+DWORD       WINAPI VerInstallFileA(DWORD,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,PUINT);
+DWORD       WINAPI VerInstallFileW(DWPRD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT);
+DWORD       WINAPI VerQueryValueA(LPVOID,LPSTR,LPVOID*,PUINT);
+DWORD       WINAPI VerQueryValueW(LPVOID,LPWSTR,LPVOID*,PUINT);
+DWORD       WINAPI GetFileVersionInfoSizeA(LPSTR,LPDWORD);
+DWORD       WINAPI GetFileVersionInfoSizeW(LPWSTR,LPDWORD);
+BOOL        WINAPI GetFileVersionInfoA(LPSTR,DWORD,DWORD,LPVOID);
+BOOL        WINAPI GetFileVersionInfoW(LPWSTR,DWORD,DWORD,LPVOID);
+
+// enable C linkage to avoid parameter mangling
+#ifdef __cplusplus__
+  }
+#endif
+
 
 #endif /* __WINE_WINVER_H */