gmane.comp.emulators.wine.cvs

Alexandre Julliard : Wine release 1.5.5

Alexandre Julliard — 2012-05-25T18:31:20

Module: website
Branch: master
Commit: d1d9cc5691a5b4be738619e2c580513443e1108c
URL:    http://source.winehq.org/git/website.git/?a=commit;h=d1d9cc5691a5b4be738619e2c580513443e1108c

Author: Alexandre Julliard <julliard< at >winehq.org>
Date:   Fri May 25 20:31:17 2012 +0200

Wine release 1.5.5

---

 news/en/2012052501.xml |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/news/en/2012052501.xml b/news/en/2012052501.xml
new file mode 100644
index 0000000..6e84d18
--- /dev/null
+++ b/news/en/2012052501.xml
< at >< at > -0,0 +1,16 < at >< at >
+<news>
+<date>May 25, 2012</date>
+<title>Wine 1.5.5 Released</title>
+<body>
+<p> The Wine development release 1.5.5 is now available.</p>
+<p> <a href="{$root}/announce/1.5.5">What's new</a> in this release:
+<ul>
+  <li>Support for installing Mono as a Wine add-on package.</li>
+  <li>Dithering of pattern brushes in the DIB engine.</li>
+  <li>Support for installing the .NET 4.0 runtime.</li>
+  <li>DDS files supported in D3DX9.</li>
+  <li>Various bug

Tag wine-1.5.5 : Alexandre Julliard : Release 1.5.5

Alexandre Julliard — 2012-05-25T18:30:56

Module: wine
Branch: refs/tags/wine-1.5.5
Tag:    351d36d9209d7d17bb7bf3c406a9c63c4662a53a
URL:    http://source.winehq.org/git/wine.git/?a=tag;h=351d36d9209d7d17bb7bf3c406a9c63c4662a53a

Tagger: Alexandre Julliard <julliard< at >winehq.org>
Date:   Fri May 25 20:21:16 2012 +0200

Release 1.5.5

Alexandre Julliard : Release 1.5.5.

Alexandre Julliard — 2012-05-25T18:30:56

Module: wine
Branch: master
Commit: d6bc74fc5f0727f12788aa76d286d74f28208589
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d6bc74fc5f0727f12788aa76d286d74f28208589

Author: Alexandre Julliard <julliard< at >winehq.org>
Date:   Fri May 25 20:21:15 2012 +0200

Release 1.5.5.

---

 ANNOUNCE  |  906 ++++++++++++++++++++++++++++++++++---------------------------
 VERSION   |    2 +-
 configure |   18 +-
 3 files changed, 513 insertions(+), 413 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6bc74fc5f0727f12788aa76d286d74f28208589

Jacek Caban : wininet: Added INTERNET_OPTION_SECURITY_FLAGS tests.

Alexandre Julliard — 2012-05-25T15:52:49

Module: wine
Branch: master
Commit: 22e25ea006eb6fed29d2d70cfc70cbc9b65f0a8d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=22e25ea006eb6fed29d2d70cfc70cbc9b65f0a8d

Author: Jacek Caban <jacek< at >codeweavers.com>
Date:   Fri May 25 16:36:46 2012 +0200

wininet: Added INTERNET_OPTION_SECURITY_FLAGS tests.

---

 dlls/wininet/tests/http.c |  215 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 215 insertions(+), 0 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=22e25ea006eb6fed29d2d70cfc70cbc9b65f0a8d

Jacek Caban : wininet: Store certificate error information insecurity flags.

Alexandre Julliard — 2012-05-25T15:52:49

Module: wine
Branch: master
Commit: 868575a416fd4a2236cedfc689049f6ca390efe4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=868575a416fd4a2236cedfc689049f6ca390efe4

Author: Jacek Caban <jacek< at >codeweavers.com>
Date:   Fri May 25 16:51:20 2012 +0200

wininet: Store certificate error information in security flags.

---

 dlls/wininet/http.c          |   18 +----
 dlls/wininet/internet.h      |   11 ++-
 dlls/wininet/netconnection.c |  188 ++++++++++++++++++++++++-----------------
 3 files changed, 123 insertions(+), 94 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=868575a416fd4a2236cedfc689049f6ca390efe4

Jacek Caban : wininet: Added INTERNET_OPTION_SETTINGS_CHANGEDsemi-stub implementation.

Alexandre Julliard — 2012-05-25T15:52:49

Module: wine
Branch: master
Commit: f8f2273b7c0c9c55c6060d10b7ceb6df2618d50d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f8f2273b7c0c9c55c6060d10b7ceb6df2618d50d

Author: Jacek Caban <jacek< at >codeweavers.com>
Date:   Fri May 25 16:35:48 2012 +0200

wininet: Added INTERNET_OPTION_SETTINGS_CHANGED semi-stub implementation.

---

 dlls/wininet/http.c     |    8 ++++----
 dlls/wininet/internet.c |    7 ++++++-
 dlls/wininet/internet.h |    8 +++++++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index e32dde6..6472c3c 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
< at >< at > -285,7 +285,7 < at >< at > static server_t *get_server(const WCHAR *name, INTERNET_PORT port)
     return server;
 }
 
-BOOL collect_connections(BOOL collect_all)
+BOOL collect_connections(collect_type_t collect_type)
 {
     netconn_t *netconn, *netconn_safe;
     server_t *server, *server_safe;
< at >< at > -296,7 +296,7 < at >< at > BOOL collect_connections(BOOL collect_all)
 
     LIST_FOR_E

Jacek Caban : wininet: Store server_t on the list until clean up.

Alexandre Julliard — 2012-05-25T15:52:49

Module: wine
Branch: master
Commit: 95c1b74fc9fe4525f2314570aa422401fc40d865
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=95c1b74fc9fe4525f2314570aa422401fc40d865

Author: Jacek Caban <jacek< at >codeweavers.com>
Date:   Fri May 25 16:35:32 2012 +0200

wininet: Store server_t on the list until clean up.

---

 dlls/wininet/http.c     |   21 +++++++++------------
 dlls/wininet/internet.h |    1 -
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 50f77df..e32dde6 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
< at >< at > -242,8 +242,10 < at >< at > void server_release(server_t *server)
     if(InterlockedDecrement(&server->ref))
         return;
 
-    if(!server->ref)
-        server->keep_until = GetTickCount64() + COLLECT_TIME;
+    list_remove(&server->entry);
+
+    heap_free(server->name);
+    heap_free(server);
 }
 
 static server_t *get_server(const WCHAR *name, INTERNET_PORT port)
< at >< at > -264,7 +266,7 < at >< at > static server_t *get_server(const WCH

Jacek Caban : wininet: Set SECURITY_FLAG_STRENGTH_* flags inNETCONN_secure_connect.

Alexandre Julliard — 2012-05-25T15:52:49

Module: wine
Branch: master
Commit: f3dd75d8a4da66da467a6e026ec8c1a5ee8339b8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f3dd75d8a4da66da467a6e026ec8c1a5ee8339b8

Author: Jacek Caban <jacek< at >codeweavers.com>
Date:   Fri May 25 16:35:12 2012 +0200

wininet: Set SECURITY_FLAG_STRENGTH_* flags in NETCONN_secure_connect.

---

 dlls/wininet/http.c          |   11 ++---------
 dlls/wininet/netconnection.c |    9 +++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 1943e91..50f77df 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
< at >< at > -1999,16 +1999,9 < at >< at > static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe
 
         *size = sizeof(DWORD);
         flags = req->netconn ? req->netconn->security_flags : req->security_flags | req->server->security_flags;
-        if(req->netconn) {
-            int bits = NETCON_GetCipherStrength(req->netconn);
-            if (bits >= 128)
-                flags |=

Jacek Caban : wininet: Set SECURITY_FLAG_SECURRE inNETCON_secure_connect.

Alexandre Julliard — 2012-05-25T15:52:49

Module: wine
Branch: master
Commit: 90ec92dfd1cce496c9bbf78ff79c32253ccde529
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=90ec92dfd1cce496c9bbf78ff79c32253ccde529

Author: Jacek Caban <jacek< at >codeweavers.com>
Date:   Fri May 25 16:34:59 2012 +0200

wininet: Set SECURITY_FLAG_SECURRE in NETCON_secure_connect.

---

 dlls/wininet/http.c          |    2 --
 dlls/wininet/netconnection.c |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 1392fb8..1943e91 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
< at >< at > -1999,8 +1999,6 < at >< at > static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe
 
         *size = sizeof(DWORD);
         flags = req->netconn ? req->netconn->security_flags : req->security_flags | req->server->security_flags;
-        if (req->hdr.dwFlags & INTERNET_FLAG_SECURE)
-            flags |= SECURITY_FLAG_SECURE;
         if(req->netconn) {
             int bits = NETCON_GetCipherStrength(r

Jacek Caban : wininet: Store security flags in server_t.

Alexandre Julliard — 2012-05-25T15:52:49

Module: wine
Branch: master
Commit: 59a0ab54cb18d4f21e2c6407fc6e9eb859f52f41
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=59a0ab54cb18d4f21e2c6407fc6e9eb859f52f41

Author: Jacek Caban <jacek< at >codeweavers.com>
Date:   Fri May 25 16:34:43 2012 +0200

wininet: Store security flags in server_t.

---

 dlls/wininet/http.c          |    4 ++--
 dlls/wininet/internet.h      |    2 ++
 dlls/wininet/netconnection.c |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index d8b3d1c..1392fb8 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
< at >< at > -266,6 +266,7 < at >< at > static server_t *get_server(const WCHAR *name, INTERNET_PORT port)
             server->addr_len = 0;
             server->ref = 1;
             server->port = port;
+            server->security_flags = 0;
             list_init(&server->conn_pool);
             server->name = heap_strdupW(name);
             if(server->name) {
< at >< at > -1997,10 +1998,9 < at >< at > static DWORD HTTPREQ_QueryOp

Jacek Caban : wininet: Store server_t in http_request_t.

Alexandre Julliard — 2012-05-25T15:52:49

Module: wine
Branch: master
Commit: 3aeb8eb6b69f38a2e081d55fac0c2905ac6c44da
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3aeb8eb6b69f38a2e081d55fac0c2905ac6c44da

Author: Jacek Caban <jacek< at >codeweavers.com>
Date:   Fri May 25 16:34:24 2012 +0200

wininet: Store server_t in http_request_t.

---

 dlls/wininet/http.c     |   77 +++++++++++++++++++++++++----------------------
 dlls/wininet/internet.h |    1 +
 2 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 2f64b03..d8b3d1c 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
< at >< at > -1182,7 +1182,7 < at >< at > static BOOL HTTP_DoAuthorization( http_request_t *request, LPCWSTR pszAuthValue,
 
         sec_status = InitializeSecurityContextW(first ? &pAuthInfo->cred : NULL,
                                                 first ? NULL : &pAuthInfo->ctx,
-                                                first ? request->session->serverName : NULL,
+

Henri Verbeet : d3d9: Get rid of IDirect3D9Impl.

Alexandre Julliard — 2012-05-25T15:52:49

Module: wine
Branch: master
Commit: 82adae949bb4f35eed95e276d9ad7acb72cc800a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=82adae949bb4f35eed95e276d9ad7acb72cc800a

Author: Henri Verbeet <hverbeet< at >codeweavers.com>
Date:   Fri May 25 16:10:31 2012 +0200

d3d9: Get rid of IDirect3D9Impl.

---

 dlls/d3d9/d3d9_main.c    |    4 +-
 dlls/d3d9/d3d9_private.h |   28 ++---
 dlls/d3d9/device.c       |    2 +-
 dlls/d3d9/directx.c      |  335 ++++++++++++++++++++++------------------------
 4 files changed, 176 insertions(+), 193 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=82adae949bb4f35eed95e276d9ad7acb72cc800a

Henri Verbeet : d3d9: Add a separate function for d3d9 initialization.

Alexandre Julliard — 2012-05-25T15:52:49

Module: wine
Branch: master
Commit: 5b2d1710434aa71fc9bd421f1836db710b21bf9e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5b2d1710434aa71fc9bd421f1836db710b21bf9e

Author: Henri Verbeet <hverbeet< at >codeweavers.com>
Date:   Fri May 25 16:10:30 2012 +0200

d3d9: Add a separate function for d3d9 initialization.

---

 dlls/d3d9/d3d9_main.c    |   58 +++++++++++++++++++++++++++------------------
 dlls/d3d9/d3d9_private.h |   14 +----------
 dlls/d3d9/directx.c      |   18 ++++++++++++-
 3 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c
index 6eed9b7..e3bb9f8 100644
--- a/dlls/d3d9/d3d9_main.c
+++ b/dlls/d3d9/d3d9_main.c
< at >< at > -33,40 +33,52 < at >< at > void WINAPI DebugSetMute(void) {
     /* nothing to do */
 }
 
-IDirect3D9* WINAPI DECLSPEC_HOTPATCH Direct3DCreate9(UINT SDKVersion) {
-    IDirect3D9Impl* object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3D9Impl));
-
-    object->IDirect3D9Ex_iface.lpVtbl = &Direct3D9_Vtbl;
-    objec

Henri Verbeet : d3dx9: Don't use HEAP_ZERO_MEMORY if we' re going tooverwrite the memory anyway.

Alexandre Julliard — 2012-05-25T15:52:49

Module: wine
Branch: master
Commit: 372984e053b0fc8a8e56d5f2209540b61fb2836b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=372984e053b0fc8a8e56d5f2209540b61fb2836b

Author: Henri Verbeet <hverbeet< at >codeweavers.com>
Date:   Fri May 25 16:10:29 2012 +0200

d3dx9: Don't use HEAP_ZERO_MEMORY if we're going to overwrite the memory anyway.

---

 dlls/d3dx9_36/surface.c |    4 ++--
 dlls/d3dx9_36/texture.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index 821d51e..d490cef 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
< at >< at > -656,7 +656,7 < at >< at > HRESULT WINAPI D3DXGetImageInfoFromFileA(LPCSTR file, D3DXIMAGE_INFO *info)
     if( !file ) return D3DERR_INVALIDCALL;
 
     strlength = MultiByteToWideChar(CP_ACP, 0, file, -1, NULL, 0);
-    widename = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlength * sizeof(WCHAR));
+    widename = HeapAlloc(GetProcessHeap(), 0, strlength * sizeof(*widename));
     MultiByteT

Henri Verbeet : d3d9: Get rid of the D3D_DECL_* macros.

Alexandre Julliard — 2012-05-25T15:52:49

Module: wine
Branch: master
Commit: b5d64260e00ef98de12cecbfcbd5a2910538875b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b5d64260e00ef98de12cecbfcbd5a2910538875b

Author: Henri Verbeet <hverbeet< at >codeweavers.com>
Date:   Fri May 25 16:10:28 2012 +0200

d3d9: Get rid of the D3D_DECL_* macros.

---

 dlls/d3d9/vertexdeclaration.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c
index 679f010..2d31dd7 100644
--- a/dlls/d3d9/vertexdeclaration.c
+++ b/dlls/d3d9/vertexdeclaration.c
< at >< at > -27,8 +27,8 < at >< at > WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 static const struct
 {
     enum wined3d_format_id format;
-    int         size;
-    int         typesize;
+    unsigned int component_count;
+    unsigned int component_size;
 }
 d3d_dtype_lookup[] =
 {
< at >< at > -51,9 +51,6 < at >< at > d3d_dtype_lookup[] =
     /* D3DDECLTYPE_FLOAT16_4 */ {WINED3DFMT_R16G16B16A16_FLOAT, 4, sizeof(short int)}
 };
 
-#define D3D_DECL_SIZE(type)          d3d_d

Henri Verbeet : d3d9: Get rid of the d3dType field fromd3d_dtype_lookup.

Alexandre Julliard — 2012-05-25T15:52:49

Module: wine
Branch: master
Commit: 51024a078f4747f05527310d034f0f47c4e3cdd3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=51024a078f4747f05527310d034f0f47c4e3cdd3

Author: Henri Verbeet <hverbeet< at >codeweavers.com>
Date:   Fri May 25 16:10:27 2012 +0200

d3d9: Get rid of the d3dType field from d3d_dtype_lookup.

---

 dlls/d3d9/vertexdeclaration.c |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c
index 421f099..679f010 100644
--- a/dlls/d3d9/vertexdeclaration.c
+++ b/dlls/d3d9/vertexdeclaration.c
< at >< at > -26,30 +26,30 < at >< at > WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 static const struct
 {
-    D3DDECLTYPE d3dType;
     enum wined3d_format_id format;
     int         size;
     int         typesize;
 }
 d3d_dtype_lookup[] =
 {
-   {D3DDECLTYPE_FLOAT1,    WINED3DFMT_R32_FLOAT,          1, sizeof(float)},
-   {D3DDECLTYPE_FLOAT2,    WINED3DFMT_R32G32_FLOAT,       2, sizeof(float)},
-   {D3DDECL

Aric Stewart : usp10: Check bounds before checking value in array.

Alexandre Julliard — 2012-05-25T15:52:49

Module: wine
Branch: master
Commit: 1f4554d141774e948a29731db72ce5758ddad2f5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1f4554d141774e948a29731db72ce5758ddad2f5

Author: Aric Stewart <aric< at >codeweavers.com>
Date:   Fri May 25 07:55:19 2012 -0500

usp10: Check bounds before checking value in array.

---

 dlls/usp10/shape.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c
index a039504..d582fc7 100644
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
< at >< at > -628,9 +628,9 < at >< at > static void UpdateClustersFromGlyphProp(const int cGlyphs, const int cChars, WOR
                 if (pwLogClust[j] == i)
                 {
                     int k = j;
-                    while (!pGlyphProp[pwLogClust[k]].sva.fClusterStart && k >= 0 && k <cChars)
+                    while (k >= 0 && k <cChars && !pGlyphProp[pwLogClust[k]].sva.fClusterStart)
                         k-=1;
-                    if (pGlyphProp[pwLogClust[k]].sva.fClusterStart)

Dmitry Timoshkov : windowscodecs: Add some tests for IFD metadatareader.

Alexandre Julliard — 2012-05-25T15:52:49

Module: wine
Branch: master
Commit: 30fc8a553dd6aff5c1315af29d490860029f39b1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=30fc8a553dd6aff5c1315af29d490860029f39b1

Author: Dmitry Timoshkov <dmitry< at >baikal.ru>
Date:   Fri May 25 19:14:05 2012 +0900

windowscodecs: Add some tests for IFD metadata reader.

---

 dlls/windowscodecs/tests/metadata.c |  154 +++++++++++++++++++++++++++++++++++
 1 files changed, 154 insertions(+), 0 deletions(-)

diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c
index 09e26ca..d4249f42 100644
--- a/dlls/windowscodecs/tests/metadata.c
+++ b/dlls/windowscodecs/tests/metadata.c
< at >< at > -1,5 +1,6 < at >< at >
 /*
  * Copyright 2011 Vincent Povirk for CodeWeavers
+ * Copyright 2012 Dmitry Timoshkov
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
< at >< at > -38,6 +39,47 < at >< at >
     } \
 } while (0)
 
+#define IFD_SHORT 3
+#define IFD_LONG 4
+#define IFD_RATIONAL 5
+
+#include "pshpac

Dmitry Timoshkov : include: Add some ids for IFD metadata support.

Alexandre Julliard — 2012-05-25T15:52:48

Module: wine
Branch: master
Commit: 02dff390ee2541a98c5e4a21ee4641836b0a25eb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=02dff390ee2541a98c5e4a21ee4641836b0a25eb

Author: Dmitry Timoshkov <dmitry< at >baikal.ru>
Date:   Fri May 25 19:13:44 2012 +0900

include: Add some ids for IFD metadata support.

---

 include/wincodecsdk.idl |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl
index a3af55a..5cca0a5 100644
--- a/include/wincodecsdk.idl
+++ b/include/wincodecsdk.idl
< at >< at > -37,11 +37,13 < at >< at > typedef enum WICMetadataCreationOptions {
 
 cpp_quote("DEFINE_GUID(GUID_MetadataFormatUnknown, 0xa45e592f,0x9078,0x4a7c,0xad,0xb5,0x4e,0xdc,0x4f,0xd6,0x1b,0x1f);")
 cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktEXt, 0x568d8936,0xc0a9,0x4923,0x90,0x5d,0xdf,0x2b,0x38,0x23,0x8f,0xbc);")
+cpp_quote("DEFINE_GUID(GUID_MetadataFormatIfd, 0x537396c6,0x2d8a,0x4bb6,0x9b,0xf8,0x2f,0x0a,0x8e,0x2a,0x3a,0xdf);")
 
 cpp_quote("DEFINE_GUID(CLSID_WICUnknownMe

Dmitry Timoshkov : windowscodecs: Fix some typos in the tEXt metadatatest.

Alexandre Julliard — 2012-05-25T15:52:48

Module: wine
Branch: master
Commit: 9cc82dd644735a95b4aa8f9eaebac377f9fdc29d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9cc82dd644735a95b4aa8f9eaebac377f9fdc29d

Author: Dmitry Timoshkov <dmitry< at >baikal.ru>
Date:   Fri May 25 19:13:24 2012 +0900

windowscodecs: Fix some typos in the tEXt metadata test.

---

 dlls/windowscodecs/tests/metadata.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c
index 4cfc53c..09e26ca 100644
--- a/dlls/windowscodecs/tests/metadata.c
+++ b/dlls/windowscodecs/tests/metadata.c
< at >< at > -205,8 +205,8 < at >< at > static void test_metadata_tEXt(void)
             ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt);
             ok(id.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt);
             ok(!strcmp(U(id).pszVal, "winetest"), "unexpected id: %s\n", U(id).pszVal);
-            ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt);
-            ok(!strcmp(U(value).pszV

Michael Stefaniuc : mshtml/tests: Remove stray ok() calls.

Alexandre Julliard — 2012-05-25T15:52:48

Module: wine
Branch: master
Commit: 630560ea8fb13c78f490fb269b80a5d36f5c15f1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=630560ea8fb13c78f490fb269b80a5d36f5c15f1

Author: Michael Stefaniuc <mstefani< at >redhat.de>
Date:   Fri May 25 11:36:16 2012 +0200

mshtml/tests: Remove stray ok() calls.

---

 dlls/mshtml/tests/style.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c
index 7b6d69d..262c4d1 100644
--- a/dlls/mshtml/tests/style.c
+++ b/dlls/mshtml/tests/style.c
< at >< at > -662,7 +662,6 < at >< at > static void test_body_style(IHTMLStyle *style)
 
     hres = IHTMLStyle_put_textDecorationUnderline(style, VARIANT_TRUE);
     ok(hres == S_OK, "put_textDecorationUnderline failed: %08x\n", hres);
-    ok(b == VARIANT_FALSE, "textDecorationUnderline = %x\n", b);
 
     hres = IHTMLStyle_get_textDecorationUnderline(style, &b);
     ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres);
< at >< at > -678,7 +677,6 < at >< at > static void test_bo