Started on avifil32 implementation (only stubs currently).

Makefile.in

@@ -29,6 +29,7 @@ LIBSUBDIRS = \
 	controls \
 	console \
 	dlls/advapi32 \
+	dlls/avifil32 \
 	dlls/comctl32 \
 	dlls/commdlg \
 	dlls/imagehlp \
@@ -101,6 +102,7 @@ LIBOBJS = \
 	controls/controls.o \
 	console/console.o \
 	dlls/advapi32/advapi32.o \
+	dlls/avifil32/avifil32.o \
 	dlls/comctl32/comctl32.o \
 	dlls/commdlg/commdlg.o \
 	dlls/imagehlp/imagehlp.o \

configure

@@ -4597,6 +4597,7 @@ controls/Makefile
 debugger/Makefile
 dlls/Makefile
 dlls/advapi32/Makefile
+dlls/avifil32/Makefile
 dlls/comctl32/Makefile
 dlls/commdlg/Makefile
 dlls/imagehlp/Makefile
@@ -4758,6 +4759,7 @@ controls/Makefile
 debugger/Makefile
 dlls/Makefile
 dlls/advapi32/Makefile
+dlls/avifil32/Makefile
 dlls/comctl32/Makefile
 dlls/commdlg/Makefile
 dlls/imagehlp/Makefile

configure.in

@@ -622,6 +622,7 @@ controls/Makefile
 debugger/Makefile
 dlls/Makefile
 dlls/advapi32/Makefile
+dlls/avifil32/Makefile
 dlls/comctl32/Makefile
 dlls/commdlg/Makefile
 dlls/imagehlp/Makefile

dlls/Makefile.in

 SUBDIRS = \
 	advapi32 \
+	avifil32 \
 	comctl32 \
 	commdlg \
 	imagehlp \

dlls/avifil32/.cvsignore

+Makefile

dlls/avifil32/Makefile.in

+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = avifil32
+
+C_SRCS = \
+	avifile.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:
+

include/debug.h

@@ -10,153 +10,154 @@
 #define dbch_animate 2
 #define dbch_aspi 3
 #define dbch_atom 4
-#define dbch_bitblt 5
-#define dbch_bitmap 6
-#define dbch_caret 7
-#define dbch_cdaudio 8
-#define dbch_class 9
-#define dbch_clipboard 10
-#define dbch_clipping 11
-#define dbch_combo 12
-#define dbch_comboex 13
-#define dbch_comm 14
-#define dbch_commctrl 15
-#define dbch_commdlg 16
-#define dbch_console 17
-#define dbch_crtdll 18
-#define dbch_cursor 19
-#define dbch_datetime 20
-#define dbch_dc 21
-#define dbch_dde 22
-#define dbch_ddeml 23
-#define dbch_ddraw 24
-#define dbch_debug 25
-#define dbch_dialog 26
-#define dbch_dinput 27
-#define dbch_dll 28
-#define dbch_dosfs 29
-#define dbch_dosmem 30
-#define dbch_dplay 31
-#define dbch_driver 32
-#define dbch_dsound 33
-#define dbch_edit 34
-#define dbch_event 35
-#define dbch_exec 36
-#define dbch_file 37
-#define dbch_fixup 38
-#define dbch_font 39
-#define dbch_gdi 40
-#define dbch_global 41
-#define dbch_graphics 42
-#define dbch_header 43
-#define dbch_heap 44
-#define dbch_hook 45
-#define dbch_hotkey 46
-#define dbch_icon 47
-#define dbch_imagehlp 48
-#define dbch_imagelist 49
-#define dbch_imm 50
-#define dbch_int 51
-#define dbch_int10 52
-#define dbch_int16 53
-#define dbch_int17 54
-#define dbch_int19 55
-#define dbch_int21 56
-#define dbch_int31 57
-#define dbch_io 58
-#define dbch_ipaddress 59
-#define dbch_key 60
-#define dbch_keyboard 61
-#define dbch_ldt 62
-#define dbch_listbox 63
-#define dbch_listview 64
-#define dbch_local 65
-#define dbch_mci 66
-#define dbch_mcianim 67
-#define dbch_mciavi 68
-#define dbch_mcimidi 69
-#define dbch_mciwave 70
-#define dbch_mdi 71
-#define dbch_menu 72
-#define dbch_message 73
-#define dbch_metafile 74
-#define dbch_midi 75
-#define dbch_mmaux 76
-#define dbch_mmio 77
-#define dbch_mmsys 78
-#define dbch_mmtime 79
-#define dbch_module 80
-#define dbch_monthcal 81
-#define dbch_mpr 82
-#define dbch_msacm 83
-#define dbch_msg 84
-#define dbch_msvideo 85
-#define dbch_nativefont 86
-#define dbch_nonclient 87
-#define dbch_ntdll 88
-#define dbch_ole 89
-#define dbch_pager 90
-#define dbch_palette 91
-#define dbch_pidl 92
-#define dbch_print 93
-#define dbch_process 94
-#define dbch_profile 95
-#define dbch_progress 96
-#define dbch_prop 97
-#define dbch_propsheet 98
-#define dbch_psapi 99
-#define dbch_psdrv 100
-#define dbch_ras 101
-#define dbch_rebar 102
-#define dbch_reg 103
-#define dbch_region 104
-#define dbch_relay 105
-#define dbch_resource 106
-#define dbch_scroll 107
-#define dbch_security 108
-#define dbch_segment 109
-#define dbch_selector 110
-#define dbch_sem 111
-#define dbch_sendmsg 112
-#define dbch_server 113
-#define dbch_shell 114
-#define dbch_shm 115
-#define dbch_snoop 116
-#define dbch_sound 117
-#define dbch_static 118
-#define dbch_statusbar 119
-#define dbch_stress 120
-#define dbch_string 121
-#define dbch_syscolor 122
-#define dbch_system 123
-#define dbch_tab 124
-#define dbch_task 125
-#define dbch_text 126
-#define dbch_thread 127
-#define dbch_thunk 128
-#define dbch_timer 129
-#define dbch_toolbar 130
-#define dbch_toolhelp 131
-#define dbch_tooltips 132
-#define dbch_trackbar 133
-#define dbch_treeview 134
-#define dbch_ttydrv 135
-#define dbch_tweak 136
-#define dbch_uitools 137
-#define dbch_unknown 138
-#define dbch_updown 139
-#define dbch_ver 140
-#define dbch_virtual 141
-#define dbch_vxd 142
-#define dbch_wave 143
-#define dbch_win 144
-#define dbch_win16drv 145
-#define dbch_win32 146
-#define dbch_wing 147
-#define dbch_winsock 148
-#define dbch_wnet 149
-#define dbch_x11 150
-#define dbch_x11drv 151
+#define dbch_avifile 5
+#define dbch_bitblt 6
+#define dbch_bitmap 7
+#define dbch_caret 8
+#define dbch_cdaudio 9
+#define dbch_class 10
+#define dbch_clipboard 11
+#define dbch_clipping 12
+#define dbch_combo 13
+#define dbch_comboex 14
+#define dbch_comm 15
+#define dbch_commctrl 16
+#define dbch_commdlg 17
+#define dbch_console 18
+#define dbch_crtdll 19
+#define dbch_cursor 20
+#define dbch_datetime 21
+#define dbch_dc 22
+#define dbch_dde 23
+#define dbch_ddeml 24
+#define dbch_ddraw 25
+#define dbch_debug 26
+#define dbch_dialog 27
+#define dbch_dinput 28
+#define dbch_dll 29
+#define dbch_dosfs 30
+#define dbch_dosmem 31
+#define dbch_dplay 32
+#define dbch_driver 33
+#define dbch_dsound 34
+#define dbch_edit 35
+#define dbch_event 36
+#define dbch_exec 37
+#define dbch_file 38
+#define dbch_fixup 39
+#define dbch_font 40
+#define dbch_gdi 41
+#define dbch_global 42
+#define dbch_graphics 43
+#define dbch_header 44
+#define dbch_heap 45
+#define dbch_hook 46
+#define dbch_hotkey 47
+#define dbch_icon 48
+#define dbch_imagehlp 49
+#define dbch_imagelist 50
+#define dbch_imm 51
+#define dbch_int 52
+#define dbch_int10 53
+#define dbch_int16 54
+#define dbch_int17 55
+#define dbch_int19 56
+#define dbch_int21 57
+#define dbch_int31 58
+#define dbch_io 59
+#define dbch_ipaddress 60
+#define dbch_key 61
+#define dbch_keyboard 62
+#define dbch_ldt 63
+#define dbch_listbox 64
+#define dbch_listview 65
+#define dbch_local 66
+#define dbch_mci 67
+#define dbch_mcianim 68
+#define dbch_mciavi 69
+#define dbch_mcimidi 70
+#define dbch_mciwave 71
+#define dbch_mdi 72
+#define dbch_menu 73
+#define dbch_message 74
+#define dbch_metafile 75
+#define dbch_midi 76
+#define dbch_mmaux 77
+#define dbch_mmio 78
+#define dbch_mmsys 79
+#define dbch_mmtime 80
+#define dbch_module 81
+#define dbch_monthcal 82
+#define dbch_mpr 83
+#define dbch_msacm 84
+#define dbch_msg 85
+#define dbch_msvideo 86
+#define dbch_nativefont 87
+#define dbch_nonclient 88
+#define dbch_ntdll 89
+#define dbch_ole 90
+#define dbch_pager 91
+#define dbch_palette 92
+#define dbch_pidl 93
+#define dbch_print 94
+#define dbch_process 95
+#define dbch_profile 96
+#define dbch_progress 97
+#define dbch_prop 98
+#define dbch_propsheet 99
+#define dbch_psapi 100
+#define dbch_psdrv 101
+#define dbch_ras 102
+#define dbch_rebar 103
+#define dbch_reg 104
+#define dbch_region 105
+#define dbch_relay 106
+#define dbch_resource 107
+#define dbch_scroll 108
+#define dbch_security 109
+#define dbch_segment 110
+#define dbch_selector 111
+#define dbch_sem 112
+#define dbch_sendmsg 113
+#define dbch_server 114
+#define dbch_shell 115
+#define dbch_shm 116
+#define dbch_snoop 117
+#define dbch_sound 118
+#define dbch_static 119
+#define dbch_statusbar 120
+#define dbch_stress 121
+#define dbch_string 122
+#define dbch_syscolor 123
+#define dbch_system 124
+#define dbch_tab 125
+#define dbch_task 126
+#define dbch_text 127
+#define dbch_thread 128
+#define dbch_thunk 129
+#define dbch_timer 130
+#define dbch_toolbar 131
+#define dbch_toolhelp 132
+#define dbch_tooltips 133
+#define dbch_trackbar 134
+#define dbch_treeview 135
+#define dbch_ttydrv 136
+#define dbch_tweak 137
+#define dbch_uitools 138
+#define dbch_unknown 139
+#define dbch_updown 140
+#define dbch_ver 141
+#define dbch_virtual 142
+#define dbch_vxd 143
+#define dbch_wave 144
+#define dbch_win 145
+#define dbch_win16drv 146
+#define dbch_win32 147
+#define dbch_wing 148
+#define dbch_winsock 149
+#define dbch_wnet 150
+#define dbch_x11 151
+#define dbch_x11drv 152
 /* Definitions for classes identifiers */
 #define dbcl_fixme 0
 #define dbcl_err 1

include/debugdefs.h

@@ -4,7 +4,7 @@
 #include "debugtools.h"
 #endif
 
-#define DEBUG_CHANNEL_COUNT 152
+#define DEBUG_CHANNEL_COUNT 153
 #ifdef DEBUG_RUNTIME
 short debug_msg_enabled[][DEBUG_CLASS_COUNT] = {
 {1, 1, 0, 0},
@@ -159,6 +159,7 @@ short debug_msg_enabled[][DEBUG_CLASS_COUNT] = {
 {1, 1, 0, 0},
 {1, 1, 0, 0},
 {1, 1, 0, 0},
+{1, 1, 0, 0},
 };
 const char* debug_ch_name[] = {
 "accel",
@@ -166,6 +167,7 @@ const char* debug_ch_name[] = {
 "animate",
 "aspi",
 "atom",
+"avifile",
 "bitblt",
 "bitmap",
 "caret",

relay32/avifil32.spec

@@ -7,23 +7,23 @@ type	win32
   3 stub    AVIClearClipboard
   4 stub    AVIFileAddRef
   5 stub    AVIFileCreateStream
-  6 stub    AVIFileCreateStreamA
+  6 stdcall AVIFileCreateStreamA(ptr ptr ptr) AVIFileCreateStreamA
   7 stub    AVIFileCreateStreamW
   8 stub    AVIFileEndRecord
-  9 stub    AVIFileExit
+  9 stdcall AVIFileExit() AVIFileExit
  10 stub    AVIFileGetStream
- 11 stub    AVIFileInfo
- 12 stub    AVIFileInfoA
- 13 stub    AVIFileInfoW
- 14 stub    AVIFileInit
+ 11 stdcall AVIFileInfo (ptr ptr long) AVIFileInfoA # A in both Win95 and NT
+ 12 stdcall AVIFileInfoA(ptr ptr long) AVIFileInfoA
+ 13 stdcall AVIFileInfoW(ptr ptr long) AVIFileInfoW
+ 14 stdcall AVIFileInit() AVIFileInit
  15 stub    AVIFileOpen
- 16 stub    AVIFileOpenA
+ 16 stdcall AVIFileOpenA(ptr str long ptr) AVIFileOpenA
  17 stub    AVIFileOpenW
  18 stub    AVIFileReadData
- 19 stub    AVIFileRelease
+ 19 stdcall AVIFileRelease(ptr) AVIFileRelease
  20 stub    AVIFileWriteData
  21 stub    AVIGetFromClipboard
- 22 stub    AVIMakeCompressedStream
+ 22 stdcall AVIMakeCompressedStream(ptr ptr ptr ptr) AVIMakeCompressedStream
  23 stub    AVIMakeFileFromStreams
  24 stub    AVIMakeStreamFromClipboard
  25 stub    AVIPutFileOnClipboard
@@ -40,26 +40,26 @@ type	win32
  36 stub    AVIStreamCreate
  37 stub    AVIStreamEndStreaming
  38 stub    AVIStreamFindSample
- 39 stub    AVIStreamGetFrame
- 40 stub    AVIStreamGetFrameClose
- 41 stub    AVIStreamGetFrameOpen
- 42 stub    AVIStreamInfo
- 43 stub    AVIStreamInfoA
- 44 stub    AVIStreamInfoW
- 45 stub    AVIStreamLength
+ 39 stdcall AVIStreamGetFrame(ptr long) AVIStreamGetFrame
+ 40 stdcall AVIStreamGetFrameClose(ptr) AVIStreamGetFrameClose
+ 41 stdcall AVIStreamGetFrameOpen(ptr ptr) AVIStreamGetFrameOpen
+ 42 stdcall AVIStreamInfo (ptr ptr long) AVIStreamInfoA
+ 43 stdcall AVIStreamInfoA(ptr ptr long) AVIStreamInfoA
+ 44 stdcall AVIStreamInfoW(ptr ptr long) AVIStreamInfoW
+ 45 stdcall AVIStreamLength(ptr) AVIStreamLength
  46 stub    AVIStreamOpenFromFile
  47 stub    AVIStreamOpenFromFileA
  48 stub    AVIStreamOpenFromFileW
- 49 stub    AVIStreamRead
- 50 stub    AVIStreamReadData
- 51 stub    AVIStreamReadFormat
- 52 stub    AVIStreamRelease
+ 49 stdcall AVIStreamRead(ptr long long ptr long ptr ptr) AVIStreamRead
+ 50 stdcall AVIStreamReadData(ptr long ptr ptr) AVIStreamReadData
+ 51 stdcall AVIStreamReadFormat(ptr long ptr long) AVIStreamReadFormat
+ 52 stdcall AVIStreamRelease(ptr) AVIStreamRelease
  53 stub    AVIStreamSampleToTime
- 54 stub    AVIStreamSetFormat
- 55 stub    AVIStreamStart
+ 54 stdcall AVIStreamSetFormat(ptr long ptr long) AVIStreamSetFormat
+ 55 stdcall AVIStreamStart(ptr) AVIStreamStart
  56 stub    AVIStreamTimeToSample
- 57 stub    AVIStreamWrite
- 58 stub    AVIStreamWriteData
+ 57 stdcall AVIStreamWrite(ptr long long ptr long long ptr ptr) AVIStreamWrite
+ 58 stdcall AVIStreamWriteData(ptr long ptr long) AVIStreamWriteData
  59 stub    CLSID_AVISimpleUnMarshal
  60 stub    CreateEditableStream
  61 stub    DllCanUnloadNow