summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/w32api/ChangeLog9
-rw-r--r--winsup/w32api/include/vfw.h14
2 files changed, 21 insertions, 2 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index bee236fa2..1a18571c6 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-25 Danny Smith <dannysmith@users.sourceforge.net>
+
+ * include/vfw.h (capCreateCaptureWindow[AW]): Add prototypes.
+ (capGetDriverDescription[AW]): Likewise.
+
2005-04-03 Corinna Vinschen <corinna@vinschen.de>
* include/winnt.h (SE_UNDOCK_NAME TEXT): Define.
@@ -21,7 +26,7 @@
* include/ws2tcpip.h (getaddrinfo, freeaddrinfo, getnameinfo):
Guard with _WIN32_WINNT >= 0x0501. Add FIXME comment.
- * gai_strerror[AW]: Put into #if 0 block.
+ (gai_strerror[AW]): Put into #if 0 block.
2005-03-07 Danny Smith <dannysmith@users.sourceforge.net>
@@ -59,7 +64,7 @@
2005-01-18 Danny Smith <dannysmith@users.sourceforge.net>
- * lib/user32.def (MonitorFromPoint}: Correct suffix.
+ * lib/user32.def (MonitorFromPoint): Correct suffix.
2005-01-13 Benoit Blanchon <bblanchon@users.sourceforge.net>
diff --git a/winsup/w32api/include/vfw.h b/winsup/w32api/include/vfw.h
index cce5e3126..8759f90a5 100644
--- a/winsup/w32api/include/vfw.h
+++ b/winsup/w32api/include/vfw.h
@@ -1057,6 +1057,12 @@ ICDecompressExQuery(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiSrc,LPVOID lpSr
return ICSendMessage(hic,ICM_DECOMPRESSEX_QUERY,(DWORD)&ic,sizeof(ic));
}
+/* AVICAP32 exports */
+HWND VFWAPI capCreateCaptureWindowA (LPCSTR,DWORD,int,int,int,int,HWND,int);
+HWND VFWAPI capCreateCaptureWindowW (LPCWSTR,DWORD,int,int,int,int,HWND,int);
+BOOL VFWAPI capGetDriverDescriptionA (UINT,LPSTR,int,LPSTR,int);
+BOOL VFWAPI capGetDriverDescriptionW (UINT,LPWSTR,int,LPWSTR,int);
+
#ifdef UNICODE
#define AVISTREAMINFO AVISTREAMINFOW
#define LPAVISTREAMINFO LPAVISTREAMINFOW
@@ -1088,6 +1094,10 @@ ICDecompressExQuery(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiSrc,LPVOID lpSr
#define MCIWNDM_NEW MCIWNDM_NEWW
#define MCIWNDM_RETURNSTRING MCIWNDM_RETURNSTRINGW
#define MCIWNDM_OPEN MCIWNDM_OPENW
+
+#define capCreateCaptureWindow capCreateCaptureWindowW
+#define capGetDriverDescription capGetDriverDescriptionW
+
#else
#define AVISTREAMINFO AVISTREAMINFOA
#define LPAVISTREAMINFO LPAVISTREAMINFOA
@@ -1119,6 +1129,10 @@ ICDecompressExQuery(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiSrc,LPVOID lpSr
#define MCIWNDM_NEW MCIWNDM_NEWA
#define MCIWNDM_RETURNSTRING MCIWNDM_RETURNSTRINGA
#define MCIWNDM_OPEN MCIWNDM_OPENA
+
+#define capCreateCaptureWindow capCreateCaptureWindowA
+#define capGetDriverDescription capGetDriverDescriptionA
+
#endif
#endif /* RC_INVOKED */