[ros-diffs] [akhaldi] 60336: [MSVFW32] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Mon Sep 23 11:36:07 2013
New Revision: 60336

URL: http://svn.reactos.org/svn/reactos?rev=60336&view=rev
Log:
[MSVFW32]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/reactos/dll/win32/msvfw32/CMakeLists.txt
    trunk/reactos/dll/win32/msvfw32/msvideo_main.c
    trunk/reactos/dll/win32/msvfw32/msvideo_private.h
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/msvfw32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvfw32/CMakeLists.txt	[iso-8859-1] Mon Sep 23 11:36:07 2013
@@ -1,21 +1,18 @@
-
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 add_definitions(-D__WINESRC__)
 add_definitions(-D_WINE)
-
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(msvfw32.dll msvfw32.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
     mciwnd.c
     msvideo_main.c
     drawdib.c
-    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msvfw32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/msvfw32.def)
 
-add_library(msvfw32 SHARED ${SOURCE})
+add_library(msvfw32 SHARED ${SOURCE} rsrc.rc)
 set_module_type(msvfw32 win32dll)
 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)

Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_…
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvideo_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvfw32/msvideo_main.c	[iso-8859-1] Mon Sep 23 11:36:07 2013
@@ -407,9 +407,11 @@
     driver = reg_driver_list;
     while(driver)
         if (!compare_fourcc(fccType, driver->fccType) &&
-            !compare_fourcc(fccHandler, driver->fccHandler))
+            !compare_fourcc(fccHandler, driver->fccHandler)) {
+	    fccType = driver->fccType;
+	    fccHandler = driver->fccHandler;
 	    break;
-        else
+        } else
             driver = driver->next;
 
     if (driver && driver->proc)
@@ -430,7 +432,13 @@
     icopen.dnDevNode            = 0; /* FIXME */
 	
     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);
         codecname[4] = '.';
 	fourcc_to_string(codecname + 5, fccHandler);
@@ -534,7 +542,6 @@
 
     TRACE("(%p,%p,%d)\n", hic, picinfo, cb);
 
-    whic = MSVIDEO_GetHicPtr(hic);
     if (!whic) return ICERR_BADHANDLE;
     if (!picinfo) return MMSYSERR_INVALPARAM;
 
@@ -1370,7 +1377,7 @@
     icComp->lFrameNum = pc->lFrame++;
     icComp->lpOutput = pc->lpBitsOut;
     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)
     {
@@ -1509,7 +1516,10 @@
 
   fnGetFileName = (LPVOID)GetProcAddress(hComdlg32, szFunctionName);
   if (fnGetFileName == NULL)
+  {
+    FreeLibrary(hComdlg32);
     return FALSE;
+  }
 
   /* FIXME: need to add OFN_ENABLEHOOK and our own handler */
   ret = fnGetFileName(lpofn);

Modified: trunk/reactos/dll/win32/msvfw32/msvideo_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_…
==============================================================================
--- trunk/reactos/dll/win32/msvfw32/msvideo_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvfw32/msvideo_private.h	[iso-8859-1] Mon Sep 23 11:36:07
2013
@@ -44,6 +44,7 @@
     struct tagWINE_HIC* next;
 } WINE_HIC;
 
+extern HMODULE MSVFW32_hModule DECLSPEC_HIDDEN;
 
 #define IDC_CONFIGURE 882
 #define IDC_ABOUT 883

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Mon Sep 23 11:36:07 2013
@@ -128,7 +128,7 @@
 reactos/dll/win32/mstask          # Synced to Wine-1.7.1
 reactos/dll/win32/msvcrt20        # 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/msxml           # Synced to Wine-1.5.19
 reactos/dll/win32/msxml2          # Synced to Wine-1.5.19