[ros-diffs] [akhaldi] 64638: [ICCVID] * Sync with Wine 1.7.27. CORE-8540

Author: akhaldi
Date: Thu Oct  9 11:06:02 2014
New Revision: 64638

URL: http://svn.reactos.org/svn/reactos?rev=64638&view=rev
Log:
[ICCVID]
* Sync with Wine 1.7.27.
CORE-8540

Modified:
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Cy.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Da.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_De.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_En.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Es.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Fr.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_He.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Hu.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_It.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Ja.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Ko.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Lt.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Nl.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_No.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Pl.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Pt.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Ro.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Ru.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Si.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Sq.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Sv.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Tr.rc
    trunk/reactos/dll/win32/iccvid/lang/iccvid_Uk.rc
    trunk/reactos/dll/win32/iccvid/rsrc.rc
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Cy.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Cy.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Cy.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 LANGUAGE LANG_WELSH, SUBLANG_DEFAULT
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Da.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Da.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Da.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_De.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_De.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_En.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_En.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Es.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Es.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Fr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Fr.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_He.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_He.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_He.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Hu.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Hu.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_It.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_It.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_It.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Ja.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Ja.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Ko.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Ko.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Lt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Lt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Lt.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Nl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Nl.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_No.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_No.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Pl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Pl.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Pt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Pt.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Ro.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Ro.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Ro.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Ru.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Ru.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Si.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Si.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Si.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Sq.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Sq.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Sq.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Sv.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Sv.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Tr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Tr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Tr.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/iccvid/lang/iccvid_Uk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/lang/iccv…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/lang/iccvid_Uk.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/lang/iccvid_Uk.rc	[iso-8859-1] Thu Oct  9 11:06:02
2014
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "iccvid_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/iccvid/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/rsrc.rc?r…
==============================================================================
--- trunk/reactos/dll/win32/iccvid/rsrc.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iccvid/rsrc.rc	[iso-8859-1] Thu Oct  9 11:06:02 2014
@@ -17,7 +17,8 @@
  */
 
 #include <windef.h>
-//#include "iccvid_private.h"
+
+#include "iccvid_private.h"
 
 #ifdef LANGUAGE_DA_DK
     #include "lang/iccvid_Da.rc"

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] Thu Oct  9 11:06:02 2014
@@ -81,7 +81,7 @@
 reactos/dll/win32/hlink               # Synced to Wine-1.7.17
 reactos/dll/win32/hnetcfg             # Synced to Wine-1.7.27
 reactos/dll/win32/httpapi             # Synced to Wine-1.7.17
-reactos/dll/win32/iccvid              # Synced to Wine-1.7.17
+reactos/dll/win32/iccvid              # Synced to Wine-1.7.27
 reactos/dll/win32/icmp                # Out of sync
 reactos/dll/win32/ieframe             # Synced to Wine-1.7.27
 reactos/dll/win32/imaadp32.acm        # Synced to Wine-1.7.17