February 2009 - Wine-commits

Christoph Korn : German template sync.
by Jeremy Newman 13 Feb '09

13 Feb '09

Module: website Branch: master Commit: b235d1e8d03178e12856214c64a2504571f51574 URL: http://source.winehq.org/git/website.git/?a=commit;h=b235d1e8d03178e1285621… Author: Christoph Korn <c_korn(a)gmx.de> Date: Fri Feb 13 01:21:18 2009 +0100 German template sync. >From bc516a050423d3104546b073e7273a5df3876a39 Mon Sep 17 00:00:00 2001 From: Christoph Korn <c_korn(a)gmx.de> Date: Fri, 13 Feb 2009 01:13:38 +0100 Subject: German template sync: adjust the layout spacing of some elements just a bit --- templates/de/download.template | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index db9835b..67beeca 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -3,7 +3,7 @@ <h1 class="title">Wine Downloads</h1> -<h2><a name="crossover"></a>Wine mit Support</h2> +<h2 style="margin-bottom: 10px;"><a name="crossover"></a>Wine mit Support</h2> <table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> @@ -35,15 +35,19 @@ erbeten hat, dass sie die Wine-Website hosten.</p> -<h2><a name="binary"></a>Wine Binär-Downloads</h2> - -<p><table><tr><td>Aktuellste stabile Version:</td><td>Wine {$config_stable_release}</td> -<td rowspan="2"><b>Lies das -<a href="http://wiki.winehq.org/HowTo">Installations- und Konfigurations-How-to (en)</a> -für Informationen zu den Schritten, die nach der Installation auszuführen sind.</b></td></tr> - - -<tr><td>Aktuellste Entwicklerversion:</td><td>Wine {$config_master_release}</td></tr></table></p> +<h2 style="margin-bottom: 5px;"><a name="binary"></a>Wine Binär-Downloads</h2> + +<table style="margin: 0 0 15px 0;" width="100%"> +<tr> + <td width="200">Aktuellste stabile Version:</td><td>Wine {$config_stable_release}</td> + <td rowspan="2" valign="top" style="padding-left: 20px; text-align: center;"><b>Lies das + <a href="http://wiki.winehq.org/HowTo">Installations- und Konfigurations-How-to (en)</a> + für Informationen zu den Schritten, die nach der Installation auszuführen sind.</b></td> +</tr> +<tr> + <td>Aktuellste Entwicklerversion:</td><td>Wine {$config_master_release}</td> +</tr> +</table> <table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> @@ -166,7 +170,7 @@ für Informationen zu den Schritten, die nach der Installation auszufüh </table> -<h2><a name="binary"></a>Tools von Drittanbietern</h2> +<h2 style="margin-bottom: 10px;"><a name="binary"></a>Tools von Drittanbietern</h2> <p>Manchmal kann eine Änderung an Wine dafür sorgen, dass eine bestimmte Anwendung besser läuft, aber aus irgendeinem Grund kann die Änderung nicht in Wine übernommen werden. Um bestimmte Defizite von Wine auszubessern, sind diverse

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle_put_textDecorationLineThrough.
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 957a50aa7225b2c5f9e192d883713f5dc76a3d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=957a50aa7225b2c5f9e192d88… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 8 20:12:59 2009 +1100 mshtml: Implement IHTMLStyle_put_textDecorationLineThrough. --- dlls/mshtml/htmlstyle.c | 6 ++++-- dlls/mshtml/tests/dom.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 084dd35..86f2ca0 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -955,8 +955,10 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationOverline(IHTMLStyle *iface, VA static HRESULT WINAPI HTMLStyle_put_textDecorationLineThrough(IHTMLStyle *iface, VARIANT_BOOL v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, v); + + return set_style_attr(This, STYLEID_TEXT_DECORATION, v ? valLineThrough : emptyW, 0); } static HRESULT WINAPI HTMLStyle_get_textDecorationLineThrough(IHTMLStyle *iface, VARIANT_BOOL *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a1d1e15..feafcd1 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2566,6 +2566,17 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); ok(b == VARIANT_FALSE, "textDecorationLineThrough = %x\n", b); + hres = IHTMLStyle_put_textDecorationLineThrough(style, VARIANT_TRUE); + ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationLineThrough = %x\n", b); + + hres = IHTMLStyle_get_textDecorationLineThrough(style, &b); + ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "textDecorationLineThrough = %x\n", b); + + hres = IHTMLStyle_put_textDecorationLineThrough(style, VARIANT_FALSE); + ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); + hres = IHTMLStyle_get_posWidth(style, NULL); ok(hres == E_POINTER, "get_posWidth failed: %08x\n", hres);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle_put_textDecorationUnderline.
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 28278db787a66c725a362e270e4c332ea5e12e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28278db787a66c725a362e270… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 8 20:06:57 2009 +1100 mshtml: Implement IHTMLStyle_put_textDecorationUnderline. --- dlls/mshtml/htmlstyle.c | 6 ++++-- dlls/mshtml/tests/dom.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 86f2ca0..18d3e31 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -925,8 +925,10 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationNone(IHTMLStyle *iface, VARIAN static HRESULT WINAPI HTMLStyle_put_textDecorationUnderline(IHTMLStyle *iface, VARIANT_BOOL v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, v); + + return set_style_attr(This, STYLEID_TEXT_DECORATION, v ? valUnderline : emptyW, 0); } static HRESULT WINAPI HTMLStyle_get_textDecorationUnderline(IHTMLStyle *iface, VARIANT_BOOL *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index feafcd1..bcb14ef 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2561,6 +2561,17 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres); ok(b == VARIANT_FALSE, "textDecorationUnderline = %x\n", b); + hres = IHTMLStyle_put_textDecorationUnderline(style, VARIANT_TRUE); + ok(hres == S_OK, "get_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); + ok(b == VARIANT_TRUE, "textDecorationUnderline = %x\n", b); + + hres = IHTMLStyle_put_textDecorationUnderline(style, VARIANT_FALSE); + ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres); + b = 0xfefe; hres = IHTMLStyle_get_textDecorationLineThrough(style, &b); ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres);

1 0

Andrew Talbot : winenas.drv: Replace malloc() with HeapAlloc().
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 0bd62fddfa7a24212b5ebe036eba48de388d6607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd62fddfa7a24212b5ebe036… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 12 19:47:15 2009 +0000 winenas.drv: Replace malloc() with HeapAlloc(). --- dlls/winenas.drv/audio.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winenas.drv/audio.c b/dlls/winenas.drv/audio.c index d26e57c..dfd2354 100644 --- a/dlls/winenas.drv/audio.c +++ b/dlls/winenas.drv/audio.c @@ -1382,11 +1382,11 @@ event_handler(AuServer* aud, AuEvent* ev, AuEventHandlerRec* hnd) static void buffer_resize(WINE_WAVEOUT* wwo, int len) { - void *newbuf = malloc(wwo->BufferUsed + len); + void *newbuf = HeapAlloc(GetProcessHeap(), 0, wwo->BufferUsed + len); void *oldbuf = wwo->SoundBuffer; memcpy(newbuf, oldbuf, wwo->BufferUsed); wwo->SoundBuffer = newbuf; - free(oldbuf); + HeapFree(GetProcessHeap(), 0, oldbuf); } static int nas_add_buffer(WINE_WAVEOUT* wwo) { @@ -1417,9 +1417,9 @@ static int nas_send_buffer(WINE_WAVEOUT* wwo) { ptr = wwo->SoundBuffer; } else { len = wwo->freeBytes; - ptr = malloc(len); + ptr = HeapAlloc(GetProcessHeap(), 0, len); memcpy(ptr,wwo->SoundBuffer,len); - newdata = malloc(wwo->BufferUsed - len); + newdata = HeapAlloc(GetProcessHeap(), 0, wwo->BufferUsed - len); memcpy(newdata, wwo->SoundBuffer + len, wwo->BufferUsed - len); } @@ -1431,7 +1431,7 @@ static int nas_send_buffer(WINE_WAVEOUT* wwo) { wwo->freeBytes -= len; wwo->writeBytes += len; - free(ptr); + HeapFree(GetProcessHeap(), 0, ptr); wwo->SoundBuffer = NULL;

1 0

Andrew Talbot : winemp3.acm: Replace malloc() with HeapAlloc().
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 5a556de5a0980b34e47e9bb633965204e6356291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a556de5a0980b34e47e9bb63… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 12 19:47:11 2009 +0000 winemp3.acm: Replace malloc() with HeapAlloc(). --- dlls/winemp3.acm/interface.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winemp3.acm/interface.c b/dlls/winemp3.acm/interface.c index 1511cbb..6592902 100644 --- a/dlls/winemp3.acm/interface.c +++ b/dlls/winemp3.acm/interface.c @@ -18,8 +18,11 @@ #include "config.h" #include <stdlib.h> +#include <stdarg.h> #include <stdio.h> +#include "windef.h" +#include "winbase.h" #include "wine/debug.h" #include "mpg123.h" #include "mpglib.h" @@ -57,9 +60,9 @@ void ClearMP3Buffer(struct mpstr *mp) b = mp->tail; while(b) { - free(b->pnt); + HeapFree(GetProcessHeap(), 0, b->pnt); bn = b->next; - free(b); + HeapFree(GetProcessHeap(), 0, b); b = bn; } mp->tail = NULL; @@ -71,14 +74,14 @@ static struct buf *addbuf(struct mpstr *mp,const unsigned char *buf,int size) { struct buf *nbuf; - nbuf = malloc( sizeof(struct buf) ); + nbuf = HeapAlloc(GetProcessHeap(), 0, sizeof(struct buf)); if(!nbuf) { WARN("Out of memory!\n"); return NULL; } - nbuf->pnt = malloc(size); + nbuf->pnt = HeapAlloc(GetProcessHeap(), 0, size); if(!nbuf->pnt) { - free(nbuf); + HeapFree(GetProcessHeap(), 0, nbuf); WARN("Out of memory!\n"); return NULL; } @@ -112,8 +115,8 @@ static void remove_buf(struct mpstr *mp) mp->tail = mp->head = NULL; } - free(buf->pnt); - free(buf); + HeapFree(GetProcessHeap(), 0, buf->pnt); + HeapFree(GetProcessHeap(), 0, buf); }

1 0

Hans Leidekker : wininet: Properly drain content for chunked transfers.
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 8f1a3e4e1f602a097172795e6a3dc455d0cbf097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1a3e4e1f602a097172795e6… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Fri Feb 13 09:15:48 2009 +0100 wininet: Properly drain content for chunked transfers. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 7d4f8a6..bf1e1bd 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2148,7 +2148,7 @@ static void HTTP_DrainContent(WININETHTTPREQW *req) do { char buffer[2048]; - if (HTTP_Read(req, buffer, sizeof(buffer), &bytes_read, TRUE) != ERROR_SUCCESS) + if (HTTPREQ_Read(req, buffer, sizeof(buffer), &bytes_read, TRUE) != ERROR_SUCCESS) return; } while (bytes_read); }

1 0

Juan Lang : crypt32: Fix some test failures on Windows 98.
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 11faf8a53a2c53c3979a2f3b8f502d5fd0a41934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11faf8a53a2c53c3979a2f3b8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 12 16:14:38 2009 -0800 crypt32: Fix some test failures on Windows 98. This is as much an experiment as anything. The tests currently time out, so I'm curious whether fixing some other failures will result in the timeout going away, or at least moving elsewhere. --- dlls/crypt32/tests/cert.c | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index a22ec7c..ffb9105 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -181,10 +181,15 @@ static void testAddCert(void) context = NULL; ret = CertAddEncodedCertificateToStore(0, X509_ASN_ENCODING, bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, &context); - ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", - GetLastError()); + ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* win98 */), + "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); if (context) CertFreeCertificateContext(context); + if (!ret && GetLastError() == OSS_DATA_ERROR) + { + skip("bigCert can't be decoded, skipping tests\n"); + return; + } ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, NULL); @@ -409,8 +414,8 @@ static void testCertProperties(void) CRYPT_DATA_BLOB blob; CERT_KEY_CONTEXT keyContext; - ok(context != NULL, "CertCreateCertificateContext failed: %08x\n", - GetLastError()); + ok(context != NULL || broken(GetLastError() == OSS_DATA_ERROR /* win98 */), + "CertCreateCertificateContext failed: %08x\n", GetLastError()); if (!context) return; @@ -641,8 +646,13 @@ static void testDupCert(void) ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, &context); - ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", - GetLastError()); + ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* win98 */), + "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); + if (!ret && GetLastError() == OSS_DATA_ERROR) + { + skip("bigCert can't be decoded, skipping tests\n"); + return; + } ok(context != NULL, "Expected a valid cert context\n"); if (context) { @@ -1014,8 +1024,13 @@ static void testFindCert(void) ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, bigCert, sizeof(bigCert), CERT_STORE_ADD_NEW, NULL); - ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", - GetLastError()); + ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* win98 */), + "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); + if (!ret && GetLastError() == OSS_DATA_ERROR) + { + skip("bigCert can't be decoded, skipping tests\n"); + return; + } ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, bigCert2, sizeof(bigCert2), CERT_STORE_ADD_NEW, NULL); ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", @@ -1199,8 +1214,13 @@ static void testGetSubjectCert(void) ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, NULL); - ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", - GetLastError()); + ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* win98 */), + "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); + if (!ret && GetLastError() == OSS_DATA_ERROR) + { + skip("bigCert can't be decoded, skipping tests\n"); + return; + } ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, bigCert2, sizeof(bigCert2), CERT_STORE_ADD_NEW, &context1); ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n",

1 0

Juan Lang : kernel32: Fix test failures on NT4.
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: d1dc7e5be42ad5ec789a6c7c74c3b94ff05dc5e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1dc7e5be42ad5ec789a6c7c7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 12 15:14:20 2009 -0800 kernel32: Fix test failures on NT4. --- dlls/kernel32/tests/environ.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 70549e3..aa163b4 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -245,13 +245,14 @@ static void test_ExpandEnvironmentStringsA(void) SetEnvironmentVariableA("EnvVar", value); ret_size = ExpandEnvironmentStringsA(NULL, buf1, sizeof(buf1)); - ok(ret_size == 1 || ret_size == 0 /* Win9x */, + ok(ret_size == 1 || ret_size == 0 /* Win9x */ || ret_size == 2 /* NT4 */, "ExpandEnvironmentStrings returned %d\n", ret_size); /* Try to get the required buffer size 'the natural way' */ strcpy(buf, "%EnvVar%"); ret_size = ExpandEnvironmentStringsA(buf, NULL, 0); ok(ret_size == strlen(value)+1 || /* win98 */ + ret_size == (strlen(value)+1)*2 || /* NT4 */ ret_size == strlen(value)+2 || /* win2k, XP, win2k3 */ ret_size == 0 /* Win95 */, "ExpandEnvironmentStrings returned %d instead of %d, %d or %d\n", @@ -260,21 +261,24 @@ static void test_ExpandEnvironmentStringsA(void) /* Again, side-stepping the Win95 bug */ ret_size = ExpandEnvironmentStringsA(buf, buf1, 0); /* v5.1.2600.2945 (XP SP2) returns len + 2 here! */ - ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2, + ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2 || + ret_size == (strlen(value)+1)*2 /* NT4 */, "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, lstrlenA(value)+1); /* Try with a buffer that's too small */ ret_size = ExpandEnvironmentStringsA(buf, buf1, 12); /* v5.1.2600.2945 (XP SP2) returns len + 2 here! */ - ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2, + ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2 || + ret_size == (strlen(value)+1)*2 /* NT4 */, "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, lstrlenA(value)+1); /* Try with a buffer of just the right size */ /* v5.1.2600.2945 (XP SP2) needs and returns len + 2 here! */ ret_size = ExpandEnvironmentStringsA(buf, buf1, ret_size); - ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2, + ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2 || + ret_size == strlen(value)*2 /* NT4 */, "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, lstrlenA(value)+1); ok(!strcmp(buf1, value), "ExpandEnvironmentStrings returned [%s]\n", buf1); @@ -282,7 +286,9 @@ static void test_ExpandEnvironmentStringsA(void) /* Try with an unset environment variable */ strcpy(buf, not_an_env_var); ret_size = ExpandEnvironmentStringsA(buf, buf1, sizeof(buf1)); - ok(ret_size == strlen(not_an_env_var)+1, "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, lstrlenA(value)+1); + ok(ret_size == strlen(not_an_env_var)+1 || + ret_size == (strlen(not_an_env_var)+1)*2 /* NT4 */, + "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, lstrlenA(not_an_env_var)+1); ok(!strcmp(buf1, not_an_env_var), "ExpandEnvironmentStrings returned [%s]\n", buf1); /* test a large destination size */ @@ -303,7 +309,9 @@ static void test_ExpandEnvironmentStringsA(void) strcpy(buf, "Indirect-%IndirectVar%-Indirect"); strcpy(buf2, "Indirect-Foo%EnvVar%Bar-Indirect"); ret_size = ExpandEnvironmentStringsA(buf, buf1, sizeof(buf1)); - ok(ret_size == strlen(buf2)+1, "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, lstrlen(buf2)+1); + ok(ret_size == strlen(buf2)+1 || + ret_size == (strlen(buf2)+1)*2 /* NT4 */, + "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, lstrlen(buf2)+1); ok(!strcmp(buf1, buf2), "ExpandEnvironmentStrings returned [%s]\n", buf1); SetEnvironmentVariableA("IndirectVar", NULL);

1 0

Juan Lang : kernel32: Fix some more failures on systems with reduced privilege.
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 705cdc88c46f8b15ba2b372e27f390e186fafce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=705cdc88c46f8b15ba2b372e2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 12 14:21:05 2009 -0800 kernel32: Fix some more failures on systems with reduced privilege. --- dlls/kernel32/tests/file.c | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index a043459..3f55977 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2132,7 +2132,7 @@ static void test_ReplaceFileA(void) static const char prefix[] = "pfx"; char temp_path[MAX_PATH]; DWORD ret; - BOOL retok; + BOOL retok, removeBackup = FALSE; if (!pReplaceFileA) { @@ -2252,7 +2252,8 @@ static void test_ReplaceFileA(void) */ SetLastError(0xdeadbeef); ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); - ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, + "ReplaceFileA: unexpected error %d\n", GetLastError()); /* re-create replacement file for pass w/ backup (backup-file not existing) */ ret = GetTempFileNameA(temp_path, prefix, 0, replacement); @@ -2264,13 +2265,17 @@ static void test_ReplaceFileA(void) */ SetLastError(0xdeadbeef); ret = pReplaceFileA(replaced, replacement, backup, 0, 0, 0); - ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, + "ReplaceFileA: unexpected error %d\n", GetLastError()); + if (ret) + removeBackup = TRUE; /* re-create replacement file for pass w/ no permissions to "replaced" */ ret = GetTempFileNameA(temp_path, prefix, 0, replacement); ok(ret != 0, "GetTempFileNameA error (replacement) %d\n", GetLastError()); ret = SetFileAttributesA(replaced, FILE_ATTRIBUTE_READONLY); - ok(ret, "SetFileAttributesA: error setting to read only %d\n", GetLastError()); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, + "SetFileAttributesA: error setting to read only %d\n", GetLastError()); /* perform replacement w/ backup (no permission to "replaced") * TODO: flags are not implemented */ @@ -2284,25 +2289,29 @@ static void test_ReplaceFileA(void) "unexpected error, replacement file should still exist %d\n", GetLastError()); CloseHandle(hReplacementFile); ret = SetFileAttributesA(replaced, FILE_ATTRIBUTE_NORMAL); - ok(ret, "SetFileAttributesA: error setting to normal %d\n", GetLastError()); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, + "SetFileAttributesA: error setting to normal %d\n", GetLastError()); /* replacement file still exists, make pass w/o "replaced" */ ret = DeleteFileA(replaced); - ok(ret, "DeleteFileA: error (replaced) %d\n", GetLastError()); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, + "DeleteFileA: error (replaced) %d\n", GetLastError()); /* perform replacement w/ backup (no pre-existing backup or "replaced") * TODO: flags are not implemented */ SetLastError(0xdeadbeef); ret = pReplaceFileA(replaced, replacement, backup, 0, 0, 0); - ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, - "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(!ret && (GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_ACCESS_DENIED), + "ReplaceFileA: unexpected error %d\n", GetLastError()); /* perform replacement w/o existing "replacement" file * TODO: flags are not implemented */ SetLastError(0xdeadbeef); ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); - ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + ok(!ret && (GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_ACCESS_DENIED), "ReplaceFileA: unexpected error %d\n", GetLastError()); /* @@ -2312,10 +2321,13 @@ static void test_ReplaceFileA(void) */ /* delete temporary files, replacement and replaced are already deleted */ - ret = DeleteFileA(backup); - ok(ret || - broken(GetLastError() == ERROR_ACCESS_DENIED), /* win2k */ - "DeleteFileA: error (backup) %d\n", GetLastError()); + if (removeBackup) + { + ret = DeleteFileA(backup); + ok(ret || + broken(GetLastError() == ERROR_ACCESS_DENIED), /* win2k */ + "DeleteFileA: error (backup) %d\n", GetLastError()); + } } /*

1 0

Juan Lang : kernel32: Log more information in case of a test failure, and don't run tests that are guaranteed to fail.
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 5dd87ec9b1830470f050e17cc19ae6f75f88d1bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd87ec9b1830470f050e17cc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 12 14:15:22 2009 -0800 kernel32: Log more information in case of a test failure, and don't run tests that are guaranteed to fail. --- dlls/kernel32/tests/file.c | 47 ++++++++++++++++++++++++------------------- 1 files changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 925ad6a..a043459 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2217,27 +2217,32 @@ static void test_ReplaceFileA(void) /* make sure that the "replaced" file has the size of the replacement file */ hReplacedFile = CreateFileA(replaced, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hReplacedFile != INVALID_HANDLE_VALUE, - "failed to open replaced file\n"); - ret = GetFileSize(hReplacedFile, NULL); - ok(ret == sizeof(replacementData), - "replaced file has wrong size %d\n", ret); - /* make sure that the replacement file no-longer exists */ - hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); - ok(hReplacementFile == INVALID_HANDLE_VALUE, - "unexpected error, replacement file should not exist %d\n", GetLastError()); - /* make sure that the backup has the old "replaced" filetime */ - ret = GetFileTime(hBackupFile, NULL, NULL, &ftBackup); - ok( ret, "GetFileTime error (backup %d\n", GetLastError()); - ok(check_file_time(&ftBackup, &ftReplaced, 20000000), "backup file has wrong filetime\n"); - CloseHandle(hBackupFile); - /* make sure that the "replaced" has the old replacement filetime */ - ret = GetFileTime(hReplacedFile, NULL, NULL, &ftReplaced); - ok( ret, "GetFileTime error (backup %d\n", GetLastError()); - ok(check_file_time(&ftReplaced, &ftReplacement, 20000000), - "replaced file has wrong filetime %x%08x / %x%08x\n", - ftReplaced.dwHighDateTime, ftReplaced.dwLowDateTime, - ftReplacement.dwHighDateTime, ftReplacement.dwLowDateTime ); - CloseHandle(hReplacedFile); + "failed to open replaced file: %d\n", GetLastError()); + if (hReplacedFile != INVALID_HANDLE_VALUE) + { + ret = GetFileSize(hReplacedFile, NULL); + ok(ret == sizeof(replacementData), + "replaced file has wrong size %d\n", ret); + /* make sure that the replacement file no-longer exists */ + hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacementFile == INVALID_HANDLE_VALUE, + "unexpected error, replacement file should not exist %d\n", GetLastError()); + /* make sure that the backup has the old "replaced" filetime */ + ret = GetFileTime(hBackupFile, NULL, NULL, &ftBackup); + ok( ret, "GetFileTime error (backup %d\n", GetLastError()); + ok(check_file_time(&ftBackup, &ftReplaced, 20000000), "backup file has wrong filetime\n"); + CloseHandle(hBackupFile); + /* make sure that the "replaced" has the old replacement filetime */ + ret = GetFileTime(hReplacedFile, NULL, NULL, &ftReplaced); + ok( ret, "GetFileTime error (backup %d\n", GetLastError()); + ok(check_file_time(&ftReplaced, &ftReplacement, 20000000), + "replaced file has wrong filetime %x%08x / %x%08x\n", + ftReplaced.dwHighDateTime, ftReplaced.dwLowDateTime, + ftReplacement.dwHighDateTime, ftReplacement.dwLowDateTime ); + CloseHandle(hReplacedFile); + } + else + skip("couldn't open replacement file, skipping tests\n"); /* re-create replacement file for pass w/o backup (blank) */ ret = GetTempFileNameA(temp_path, prefix, 0, replacement);

1 0