[Mplayer-cvslog] CVS: main/loader/wine avifmt.h,1.1.1.1,1.2 mmreg.h,1.6,1.7 module.h,1.2,1.3 msacm.h,1.1.1.1,1.2 pe_image.h,1.1.1.1,1.2 vfw.h,1.10,1.11
Arpi of Ize
arpi at mplayerhq.hu
Fri Sep 13 21:43:21 CEST 2002
- Previous message: [Mplayer-cvslog] CVS: main/loader/dshow DS_Filter.c,1.14,1.15 allocator.c,1.6,1.7 allocator.h,1.5,1.6 cmediasample.c,1.7,1.8 guids.c,1.5,1.6 guids.h,1.6,1.7 inputpin.c,1.6,1.7 inputpin.h,1.5,1.6 interfaces.h,1.7,1.8 iunk.h,1.3,1.4 outputpin.c,1.9,1.10 outputpin.h,1.5,1.6
- Next message: [Mplayer-cvslog] CVS: main/loader afl.c,1.3,1.4 com.h,1.4,1.5 driver.c,1.8,1.9 driver.h,1.2,1.3 elfdll.c,1.4,1.5 ext.c,1.8,1.9 ext.h,1.2,1.3 ldt_keeper.c,1.8,1.9 ldt_keeper.h,1.1,1.2 loader.h,1.4,1.5 module.c,1.9,1.10 pe_image.c,1.6,1.7 pe_resource.c,1.2,1.3 registry.c,1.12,1.13 resource.c,1.2,1.3 win32.c,1.61,1.62 win32.h,1.9,1.10 wineacm.h,1.2,1.3 module.h,1.1,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/mplayer/main/loader/wine
In directory mail:/var/tmp.root/cvs-serv768/wine
Modified Files:
avifmt.h mmreg.h module.h msacm.h pe_image.h vfw.h
Log Message:
avifile sync - 95% cosmetics 5% bug
Index: avifmt.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/wine/avifmt.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- avifmt.h 24 Feb 2001 20:31:00 -0000 1.1.1.1
+++ avifmt.h 13 Sep 2002 19:43:17 -0000 1.2
@@ -9,7 +9,7 @@
#ifndef NOAVIFMT
#ifndef __WINE_WINDEF_H
-#include <wine/windef.h>
+#include "wine/windef.h"
#endif
#ifndef __WINE_MMSYSTEM_H
Index: mmreg.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/wine/mmreg.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mmreg.h 2 Nov 2001 17:42:19 -0000 1.6
+++ mmreg.h 13 Sep 2002 19:43:17 -0000 1.7
@@ -17,7 +17,7 @@
#define WAVE_FILTER_UNKNOWN 0x0000
#define WAVE_FILTER_DEVELOPMENT 0xFFFF
-typedef struct _WAVEFILTER {
+typedef struct __attribute__((__packed__)) _WAVEFILTER {
DWORD cbStruct;
DWORD dwFilterTag;
DWORD fdwFilter;
@@ -28,7 +28,7 @@
#ifndef WAVE_FILTER_VOLUME
#define WAVE_FILTER_VOLUME 0x0001
-typedef struct _WAVEFILTER_VOLUME {
+typedef struct __attribute__((__packed__)) _WAVEFILTER_VOLUME {
WAVEFILTER wfltr;
DWORD dwVolume;
} VOLUMEWAVEFILTER, *PVOLUMEWAVEFILTER, *NPVOLUMEWAVEFILTER, *LPVOLUMEWAVEFILTER;
@@ -37,7 +37,7 @@
#ifndef WAVE_FILTER_ECHO
#define WAVE_FILTER_ECHO 0x0002
-typedef struct WAVEFILTER_ECHO {
+typedef struct __attribute__((__packed__)) WAVEFILTER_ECHO {
WAVEFILTER wfltr;
DWORD dwVolume;
DWORD dwDelay;
@@ -46,7 +46,7 @@
#ifndef _WAVEFORMATEX_
#define _WAVEFORMATEX_
-typedef struct _WAVEFORMATEX {
+typedef struct __attribute__((__packed__)) _WAVEFORMATEX {
WORD wFormatTag;
WORD nChannels;
DWORD nSamplesPerSec;
Index: module.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/wine/module.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- module.h 11 Dec 2001 22:58:14 -0000 1.2
+++ module.h 13 Sep 2002 19:43:17 -0000 1.3
@@ -128,6 +128,16 @@
#define NE_MODULE_NAME(pModule) \
(((OFSTRUCT *)((char*)(pModule) + (pModule)->fileinfo))->szPathName)
+struct modref_list_t;
+
+typedef struct modref_list_t
+{
+ WINE_MODREF* wm;
+ struct modref_list_t *next;
+ struct modref_list_t *prev;
+} modref_list;
+
+
/* module.c */
extern FARPROC MODULE_GetProcAddress( HMODULE hModule, LPCSTR function, WIN_BOOL snoop );
extern WINE_MODREF *MODULE32_LookupHMODULE( HMODULE hModule );
Index: msacm.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/wine/msacm.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- msacm.h 24 Feb 2001 20:30:33 -0000 1.1.1.1
+++ msacm.h 13 Sep 2002 19:43:17 -0000 1.2
@@ -25,7 +25,9 @@
+#if !defined(WAVE_FORMAT_PCM)
#define WAVE_FORMAT_PCM 1
+#endif
/***********************************************************************
* Defines/Enums
@@ -931,7 +933,6 @@
MMRESULT WINAPI acmStreamUnprepareHeader(
HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwUnprepare
);
-void MSACM_RegisterAllDrivers(void);
#ifdef __cplusplus
} /* extern "C" */
Index: pe_image.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/wine/pe_image.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pe_image.h 24 Feb 2001 20:30:33 -0000 1.1.1.1
+++ pe_image.h 13 Sep 2002 19:43:17 -0000 1.2
@@ -1,7 +1,7 @@
#ifndef __WINE_PE_IMAGE_H
#define __WINE_PE_IMAGE_H
-#include "windef.h"
+#include "winnt.h"
#include "winbase.h"
#define PE_HEADER(module) \
Index: vfw.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/wine/vfw.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vfw.h 3 Sep 2002 20:02:53 -0000 1.10
+++ vfw.h 13 Sep 2002 19:43:17 -0000 1.11
@@ -69,11 +69,7 @@
long type; /* 08: */
long handler; /* 0C: */
HDRVR hdrv; /* 10: */
-#ifndef __cplusplus
- long private; /* 14:(handled by SendDriverMessage)*/
-#else
- long _private; /* 14:(handled by SendDriverMessage)*/
-#endif
+ long driverid; /* 14:(handled by SendDriverMessage)*/
DRIVERPROC driverproc; /* 18:(handled by SendDriverMessage)*/
long x1; /* 1c: name? */
short x2; /* 20: */
@@ -200,7 +196,7 @@
LPBITMAPINFOHEADER lpbiOutput;
void* lpOutput;
LPBITMAPINFOHEADER lpbiInput;
- void* lpInput;
+ const void* lpInput;
long* lpckid;
long* lpdwFlags;
long lFrameNum;
@@ -211,10 +207,10 @@
} ICCOMPRESS;
long VFWAPIV ICCompress(
- HIC hic,long dwFlags,LPBITMAPINFOHEADER lpbiOutput,void* lpOutputBuf,
- LPBITMAPINFOHEADER lpbiInput,void* lpImage,long* lpckid,
+ HIC hic,long dwFlags,LPBITMAPINFOHEADER lpbiOutput,void* lpData,
+ LPBITMAPINFOHEADER lpbiInput,void* lpBits,long* lpckid,
long* lpdwFlags,long lFrameNum,long dwFrameSize,long dwQuality,
- LPBITMAPINFOHEADER lpbiInputPrev,void* lpImagePrev
+ LPBITMAPINFOHEADER lpbiPrev,void* lpPrev
);
@@ -350,7 +346,7 @@
typedef struct {
long dwFlags; /* flags (from AVI index...) */
LPBITMAPINFOHEADER lpbiInput; /* BITMAPINFO of compressed data */
- void* lpInput; /* compressed data */
+ const void* lpInput; /* compressed data */
LPBITMAPINFOHEADER lpbiOutput; /* DIB to decompress to */
void* lpOutput;
long ckid; /* ckid from AVI file */
@@ -358,8 +354,8 @@
typedef struct {
long dwFlags;
- LPBITMAPINFOHEADER lpbiSrc;
- void* lpSrc;
+ LPBITMAPINFOHEADER lpbiSrc;
+ const void* lpSrc;
LPBITMAPINFOHEADER lpbiDst;
void* lpDst;
@@ -437,11 +433,11 @@
WIN_BOOL VFWAPI ICInfo(long fccType, long fccHandler, ICINFO * lpicinfo);
LRESULT VFWAPI ICGetInfo(HIC hic,ICINFO *picinfo, long cb);
HIC VFWAPI ICOpen(long fccType, long fccHandler, UINT wMode);
-HIC VFWAPI ICOpenFunction(long fccType, long fccHandler, unsigned int wMode, void* lpfnHandler);
+//HIC VFWAPI ICOpenFunction(long fccType, long fccHandler, unsigned int wMode, void* lpfnHandler);
LRESULT VFWAPI ICClose(HIC hic);
LRESULT VFWAPI ICSendMessage(HIC hic, unsigned int msg, long dw1, long dw2);
-HIC VFWAPI ICLocate(long fccType, long fccHandler, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, short wFlags);
+//HIC VFWAPI ICLocate(long fccType, long fccHandler, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, short wFlags);
int VFWAPI ICDoSomething(void);
- Previous message: [Mplayer-cvslog] CVS: main/loader/dshow DS_Filter.c,1.14,1.15 allocator.c,1.6,1.7 allocator.h,1.5,1.6 cmediasample.c,1.7,1.8 guids.c,1.5,1.6 guids.h,1.6,1.7 inputpin.c,1.6,1.7 inputpin.h,1.5,1.6 interfaces.h,1.7,1.8 iunk.h,1.3,1.4 outputpin.c,1.9,1.10 outputpin.h,1.5,1.6
- Next message: [Mplayer-cvslog] CVS: main/loader afl.c,1.3,1.4 com.h,1.4,1.5 driver.c,1.8,1.9 driver.h,1.2,1.3 elfdll.c,1.4,1.5 ext.c,1.8,1.9 ext.h,1.2,1.3 ldt_keeper.c,1.8,1.9 ldt_keeper.h,1.1,1.2 loader.h,1.4,1.5 module.c,1.9,1.10 pe_image.c,1.6,1.7 pe_resource.c,1.2,1.3 registry.c,1.12,1.13 resource.c,1.2,1.3 win32.c,1.61,1.62 win32.h,1.9,1.10 wineacm.h,1.2,1.3 module.h,1.1,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the MPlayer-cvslog
mailing list