Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSVFW32]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60336
This commit is contained in:
Amine Khaldi 2013-09-23 11:36:07 +00:00
parent ffa1fa76dc
commit 9333cb42c6
4 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/dll/win32/msvfw32/CMakeLists.txt
View file

@ -1,21 +1,18 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__)
add_definitions(-D_WINE) add_definitions(-D_WINE)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(msvfw32.dll msvfw32.spec ADD_IMPORTLIB) spec2def(msvfw32.dll msvfw32.spec ADD_IMPORTLIB)
list(APPEND SOURCE list(APPEND SOURCE
mciwnd.c mciwnd.c
msvideo_main.c msvideo_main.c
drawdib.c drawdib.c
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/msvfw32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msvfw32_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/msvfw32.def) ${CMAKE_CURRENT_BINARY_DIR}/msvfw32.def)
add_library(msvfw32 SHARED ${SOURCE}) add_library(msvfw32 SHARED ${SOURCE} rsrc.rc)
set_module_type(msvfw32 win32dll) set_module_type(msvfw32 win32dll)
target_link_libraries(msvfw32 wine) target_link_libraries(msvfw32 wine)
add_importlibs(msvfw32 winmm version comctl32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_importlibs(msvfw32 winmm comctl32 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET msvfw32 DESTINATION reactos/system32 FOR all) add_cd_file(TARGET msvfw32 DESTINATION reactos/system32 FOR all)

20
reactos/dll/win32/msvfw32/msvideo_main.c
View file

@ -407,9 +407,11 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode)
driver = reg_driver_list; driver = reg_driver_list;
while(driver) while(driver)
if (!compare_fourcc(fccType, driver->fccType) && if (!compare_fourcc(fccType, driver->fccType) &&
!compare_fourcc(fccHandler, driver->fccHandler)) !compare_fourcc(fccHandler, driver->fccHandler)) {
fccType = driver->fccType;
fccHandler = driver->fccHandler;
break; break;
else } else
driver = driver->next; driver = driver->next;
if (driver && driver->proc) if (driver && driver->proc)
@ -430,7 +432,13 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode)
icopen.dnDevNode = 0; /* FIXME */ icopen.dnDevNode = 0; /* FIXME */
if (!driver) { if (!driver) {
/* The driver is registered in the registry */ /* normalize to lower case as in 'vidc' */
((char*)&fccType)[0] = tolower(((char*)&fccType)[0]);
((char*)&fccType)[1] = tolower(((char*)&fccType)[1]);
((char*)&fccType)[2] = tolower(((char*)&fccType)[2]);
((char*)&fccType)[3] = tolower(((char*)&fccType)[3]);
icopen.fccType = fccType;
/* Seek the driver in the registry */
fourcc_to_string(codecname, fccType); fourcc_to_string(codecname, fccType);
codecname[4] = '.'; codecname[4] = '.';
fourcc_to_string(codecname + 5, fccHandler); fourcc_to_string(codecname + 5, fccHandler);
@ -534,7 +542,6 @@ LRESULT VFWAPI ICGetInfo(HIC hic, ICINFO *picinfo, DWORD cb)
TRACE("(%p,%p,%d)\n", hic, picinfo, cb); TRACE("(%p,%p,%d)\n", hic, picinfo, cb);
whic = MSVIDEO_GetHicPtr(hic);
if (!whic) return ICERR_BADHANDLE; if (!whic) return ICERR_BADHANDLE;
if (!picinfo) return MMSYSERR_INVALPARAM; if (!picinfo) return MMSYSERR_INVALPARAM;
@ -1370,7 +1377,7 @@ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS pc, UINT uiFlags, LPVOID lpBits, BOOL
icComp->lFrameNum = pc->lFrame++; icComp->lFrameNum = pc->lFrame++;
icComp->lpOutput = pc->lpBitsOut; icComp->lpOutput = pc->lpBitsOut;
icComp->lpPrev = pc->lpBitsPrev; icComp->lpPrev = pc->lpBitsPrev;
ret = ICSendMessage(pc->hic, ICM_COMPRESS, (DWORD_PTR)icComp, sizeof(icComp)); ret = ICSendMessage(pc->hic, ICM_COMPRESS, (DWORD_PTR)icComp, sizeof(*icComp));
if (icComp->dwFlags & AVIIF_KEYFRAME) if (icComp->dwFlags & AVIIF_KEYFRAME)
{ {
@ -1509,7 +1516,10 @@ static BOOL GetFileNamePreview(LPVOID lpofn,BOOL bSave,BOOL bUnicode)
fnGetFileName = (LPVOID)GetProcAddress(hComdlg32, szFunctionName); fnGetFileName = (LPVOID)GetProcAddress(hComdlg32, szFunctionName);
if (fnGetFileName == NULL) if (fnGetFileName == NULL)
{
FreeLibrary(hComdlg32);
return FALSE; return FALSE;
}
/* FIXME: need to add OFN_ENABLEHOOK and our own handler */ /* FIXME: need to add OFN_ENABLEHOOK and our own handler */
ret = fnGetFileName(lpofn); ret = fnGetFileName(lpofn);

1
reactos/dll/win32/msvfw32/msvideo_private.h
View file

@ -44,6 +44,7 @@ typedef struct tagWINE_HIC {
struct tagWINE_HIC* next; struct tagWINE_HIC* next;
} WINE_HIC; } WINE_HIC;
extern HMODULE MSVFW32_hModule DECLSPEC_HIDDEN;
#define IDC_CONFIGURE 882 #define IDC_CONFIGURE 882
#define IDC_ABOUT 883 #define IDC_ABOUT 883

2
reactos/media/doc/README.WINE
View file

@ -128,7 +128,7 @@ reactos/dll/win32/mssip32 # Synced to Wine-1.7.1
reactos/dll/win32/mstask # Synced to Wine-1.7.1 reactos/dll/win32/mstask # Synced to Wine-1.7.1
reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt20 # Out of sync
reactos/dll/win32/msvcrt40 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync
reactos/dll/win32/msvfw32 # Autosync reactos/dll/win32/msvfw32 # Synced to Wine-1.7.1
reactos/dll/win32/msvidc32 # Autosync reactos/dll/win32/msvidc32 # Autosync
reactos/dll/win32/msxml # Synced to Wine-1.5.19 reactos/dll/win32/msxml # Synced to Wine-1.5.19
reactos/dll/win32/msxml2 # Synced to Wine-1.5.19 reactos/dll/win32/msxml2 # Synced to Wine-1.5.19