[ros-diffs] [akhaldi] 60331: [MSRLE32] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Mon Sep 23 10:17:50 2013
New Revision: 60331

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

Modified:
    trunk/reactos/dll/win32/msrle32/CMakeLists.txt
    trunk/reactos/dll/win32/msrle32/msrle32.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/msrle32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/msrle32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msrle32/CMakeLists.txt	[iso-8859-1] Mon Sep 23 10:17:50 2013
@@ -5,11 +5,10 @@
 
 list(APPEND SOURCE
     msrle32.c
-    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msrle32.def)
 
-add_library(msrle32 SHARED ${SOURCE})
+add_library(msrle32 SHARED ${SOURCE} rsrc.rc)
 set_module_type(msrle32 win32dll)
 target_link_libraries(msrle32 wine)
-add_importlibs(msrle32 msvcrt winmm user32 kernel32 ntdll)
+add_importlibs(msrle32 winmm user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET msrle32 DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/msrle32/msrle32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle32.…
==============================================================================
--- trunk/reactos/dll/win32/msrle32/msrle32.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msrle32/msrle32.c	[iso-8859-1] Mon Sep 23 10:17:50 2013
@@ -42,7 +42,7 @@
 #define QUALITY_to_DIST(q)    (ICQUALITY_HIGH - q)
 static inline WORD ColorCmp(WORD clr1, WORD clr2)
 {
-  register UINT a = (clr1-clr2);
+  UINT a = clr1 - clr2;
   return SQR(a);
 }
 static inline WORD Intensity(RGBQUAD clr)
@@ -1535,7 +1535,7 @@
 
   { /* swap buffer for current and previous frame */
     /* Don't free and alloc new -- costs to much time and they are of equal size !
*/
-    register LPWORD pTmp = pi->pPrevFrame;
+    LPWORD pTmp = pi->pPrevFrame;
 
     pi->pPrevFrame = pi->pCurFrame;
     pi->pCurFrame  = pTmp;
@@ -1917,9 +1917,6 @@
     DisableThreadLibraryCalls(hModule);
     MSRLE32_hModule = hModule;
     break;
-
-  case DLL_PROCESS_DETACH:
-    break;
   }
 
   return TRUE;

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 10:17:50 2013
@@ -122,7 +122,7 @@
 reactos/dll/win32/msisip          # Synced to Wine-1.7.1
 reactos/dll/win32/msisys.ocx      # Synced to Wine-1.7.1
 reactos/dll/win32/msnet32         # Synced to Wine-1.5.19
-reactos/dll/win32/msrle32         # Autosync
+reactos/dll/win32/msrle32         # Synced to Wine-1.7.1
 reactos/dll/win32/mssign32        # Synced to Wine-1.5.19
 reactos/dll/win32/mssip32         # Synced to Wine-1.5.19
 reactos/dll/win32/mstask          # Synced to Wine-1.5.4