From 6fd1866bb8e0898fcd154bc25dbab453ec9f0018 Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <andreas.bierfert@lowlatency.de>
Date: Sat, 16 Apr 2011 12:21:49 +0200
Subject: [PATCH] 1.3.18-1 version upgrade

---
 .gitignore                                    |  1 +
 ...operty_followed_by_non-empty_property.diff | 52 -------------------
 sources                                       |  2 +-
 wine.spec                                     | 14 +++--
 4 files changed, 11 insertions(+), 58 deletions(-)
 delete mode 100644 msi_fix_empty_property_followed_by_non-empty_property.diff

diff --git a/.gitignore b/.gitignore
index 4eca742..a3e7d41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /wine-1.3.15.tar.bz2
 /wine-1.3.16.tar.bz2
 /wine-1.3.17.tar.bz2
+/wine-1.3.18.tar.bz2
diff --git a/msi_fix_empty_property_followed_by_non-empty_property.diff b/msi_fix_empty_property_followed_by_non-empty_property.diff
deleted file mode 100644
index a4760c4..0000000
--- a/msi_fix_empty_property_followed_by_non-empty_property.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-commit c23d222e78727bbcb9ed2926c328aceb0d8a89e1
-Author: Hans Leidekker <hans@codeweavers.com>
-Date:   Fri Apr 1 17:01:55 2011 +0200
-
-    msi: Fix parsing of empty an property followed by a non-empty property.
-
-diff --git a/dlls/msi/action.c b/dlls/msi/action.c
-index 79d12d6..366d897 100644
---- a/dlls/msi/action.c
-+++ b/dlls/msi/action.c
-@@ -231,6 +231,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes )
-                 if (!count) goto done;
-                 in_quotes = 1;
-                 ignore = 1;
-+                len++;
-                 break;
-             case '"':
-                 state = state_quote;
-@@ -258,6 +259,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes )
-                 state = state_whitespace;
-                 if (!count) goto done;
-                 in_quotes = 1;
-+                len++;
-                 break;
-             default:
-                 if (!count) in_quotes = 0;
-@@ -276,8 +278,9 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes )
-                 break;
-             case ' ':
-                 state = state_whitespace;
--                if (!count) goto done;
-+                if (!count || (count > 1 && !len)) goto done;
-                 in_quotes = 1;
-+                len++;
-                 break;
-             default:
-                 state = state_token;
-diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
-index 1f5ab9c..d54f923 100644
---- a/dlls/msi/tests/install.c
-+++ b/dlls/msi/tests/install.c
-@@ -6346,6 +6346,10 @@ static void test_command_line_parsing(void)
-     r = MsiInstallProductA(msifile, cmd);
-     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
- 
-+    cmd = "Q=\"\" P=\"one\"";
-+    r = MsiInstallProductA(msifile, cmd);
-+    ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r);
-+
-     DeleteFile(msifile);
-     RemoveDirectory("msitest");
- }
diff --git a/sources b/sources
index 371568b..c5c66f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8d9d1d8cdab27ad311fa3743a1a0bc5  wine-1.3.17.tar.bz2
+17fb6334af12af17feb843f68272b070  wine-1.3.18.tar.bz2
diff --git a/wine.spec b/wine.spec
index 99819d1..233ce5c 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1,7 +1,7 @@
 %global no64bit 0
 Name:           wine
-Version:        1.3.17
-Release:        3%{?dist}
+Version:        1.3.18
+Release:        1%{?dist}
 Summary:        A Windows 16/32/64 bit emulator
 
 Group:          Applications/Emulators
@@ -49,8 +49,6 @@ Source501:      wine-tahoma.conf
 # and provide a readme
 Source502:      wine-README-tahoma
 
-Patch1000:      msi_fix_empty_property_followed_by_non-empty_property.diff
-
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if !%{?no64bit}
@@ -457,7 +455,6 @@ This package adds an openal driver for wine.
 %patch400 -p1 -b .winepulse
 %patch401 -p1 -b .winepulse
 %patch402 -p1 -b .winepulse
-%patch1000 -p1 -b .officemsi
 
 autoreconf
 
@@ -1013,6 +1010,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/wine/msvcirt.dll.so
 %{_libdir}/wine/msvcp80.dll.so
 %{_libdir}/wine/msvcp90.dll.so
+%{_libdir}/wine/msvcp100.dll.so
 %{_libdir}/wine/msvcr70.dll.so
 %{_libdir}/wine/msvcr71.dll.so
 %{_libdir}/wine/msvcr80.dll.so
@@ -1076,6 +1074,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/wine/rtutils.dll.so
 %{_libdir}/wine/samlib.dll.so
 %{_libdir}/wine/sc.exe.so
+%{_libdir}/wine/scarddlg.dll.so
 %{_libdir}/wine/sccbase.dll.so
 %{_libdir}/wine/schannel.dll.so
 %{_libdir}/wine/secur32.dll.so
@@ -1113,6 +1112,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/wine/usp10.dll.so
 %{_libdir}/wine/uxtheme.dll.so
 %{_libdir}/wine/userenv.dll.so
+%{_libdir}/wine/vcomp.dll.so
 %{_libdir}/wine/vdmdbg.dll.so
 %{_libdir}/wine/version.dll.so
 %{_libdir}/wine/wbemprox.dll.so
@@ -1417,6 +1417,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Sat Apr 16 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.3.18-1
+- version upgrade
+
 * Thu Apr 07 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.3.17-3
 - add fix for office installation (upstream #26650)