March 2016 - Wine-commits - list.winehq.org

Paul Gofman : d3dx9: Add test for preshader in effect.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: ad7ec2ec14863c1b8fcf2db2bf7daf00a98035f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad7ec2ec14863c1b8fcf2db2b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Mar 21 16:55:52 2016 +0300 d3dx9: Add test for preshader in effect. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 879 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 879 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad7ec2ec14863c1b8fcf2…

1 0

Francois Gouget : d3dx9_36: Make d3dx_set_shader_const_state() static.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: f030fbe0a29a0f6a6756ebc579172c1e83f9d58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f030fbe0a29a0f6a6756ebc57… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 22 11:24:44 2016 +0100 d3dx9_36: Make d3dx_set_shader_const_state() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8f82784..a210bb3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2645,7 +2645,7 @@ static void d3dx9_set_material_parameter(enum MATERIAL_TYPE op, D3DMATERIAL9 *ma } } -HRESULT d3dx_set_shader_const_state(IDirect3DDevice9 *device, enum SHADER_CONSTANT_TYPE op, UINT index, +static HRESULT d3dx_set_shader_const_state(IDirect3DDevice9 *device, enum SHADER_CONSTANT_TYPE op, UINT index, struct d3dx_parameter *param, void *value_ptr) { static const struct

1 0

Austin English : crypt32: Add CryptMsgVerifyCountersignatureEncoded stub.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 9fd90749c2c635573c234aba7b92064f7bc5ffc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd90749c2c635573c234aba7… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 22 16:19:18 2016 -0500 crypt32: Add CryptMsgVerifyCountersignatureEncoded stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/msg.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index e639d7c..0d2a477 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -160,7 +160,7 @@ @ stdcall CryptMsgOpenToEncode(long long long ptr str ptr) @ stdcall CryptMsgSignCTL(long ptr long ptr long ptr ptr) @ stdcall CryptMsgUpdate(ptr ptr long long) -@ stub CryptMsgVerifyCountersignatureEncoded +@ stdcall CryptMsgVerifyCountersignatureEncoded(ptr long ptr long ptr long ptr) @ stdcall CryptMsgVerifyCountersignatureEncodedEx(ptr long ptr long ptr long long ptr long ptr) @ stdcall CryptProtectData(ptr wstr ptr ptr ptr long ptr) @ stdcall CryptProtectMemory(ptr long long) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 13f5934..80b2de7 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -3737,6 +3737,17 @@ BOOL WINAPI CryptMsgGetAndVerifySigner(HCRYPTMSG hCryptMsg, DWORD cSignerStore, return ret; } +BOOL WINAPI CryptMsgVerifyCountersignatureEncoded(HCRYPTPROV_LEGACY hCryptProv, + DWORD dwEncodingType, BYTE *pbSignerInfo, DWORD cbSignerInfo, + PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature, + CERT_INFO *pciCountersigner) +{ + FIXME("(%08lx, %08x, %p, %d, %p, %d, %p): stub\n", hCryptProv, + dwEncodingType, pbSignerInfo, cbSignerInfo, pbSignerInfoCountersignature, + cbSignerInfoCountersignature, pciCountersigner); + return FALSE; +} + BOOL WINAPI CryptMsgVerifyCountersignatureEncodedEx(HCRYPTPROV_LEGACY hCryptProv, DWORD dwEncodingType, PBYTE pbSignerInfo, DWORD cbSignerInfo, PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature,

1 0

Francois Gouget : testbot/TestAgent: Prevent _SendEntryHeader() from interfering with _SendFile()'s timeout mechanism.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: tools Branch: master Commit: 2ebf75b9c5dc489974e7119fccd6b403e566cc5f URL: http://source.winehq.org/git/tools.git/?a=commit;h=2ebf75b9c5dc489974e7119f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 23 11:48:29 2016 +0100 testbot/TestAgent: Prevent _SendEntryHeader() from interfering with _SendFile()'s timeout mechanism. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 1b2916f..a87b3f2 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -777,6 +777,8 @@ sub _SendFile($$$$) debug(" SendFile('$Name', '$Filename')\n"); my $Size = -s $Filename; + return undef if (!$self->_SendEntryHeader("$Name/Size", 'd', $Size)); + my ($Start, $Sent, $Remaining) = (now(), 0, $Size); my $Success; eval @@ -784,7 +786,6 @@ sub _SendFile($$$$) local $SIG{ALRM} = sub { die "timeout" }; $self->_SetAlarm(); - return if (!$self->_SendEntryHeader("$Name/Size", 'd', $Size)); while ($Remaining) { my $Buffer;

1 0

Francois Gouget : testbot/TestAgent: Clearly identify all the 'out of eval ' return calls.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: tools Branch: master Commit: 8a64b64f5a3ed581468096633c355b0eba4382f8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8a64b64f5a3ed58146809663… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 23 11:48:52 2016 +0100 testbot/TestAgent: Clearly identify all the 'out of eval' return calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index a87b3f2..f255e0f 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -266,13 +266,13 @@ sub _RecvRawData($$$) { alarm(0); $self->_SetError($FATAL, "network read error ($self->{rpc}:$Name:$Received/$Size): $!"); - return; + return; # out of eval } if ($r == 0) { alarm(0); $self->_SetError($FATAL, "network read got a premature EOF ($self->{rpc}:$Name:$Received/$Size)"); - return; + return; # out of eval } $Data .= $Buffer; $Received += $r; @@ -310,13 +310,13 @@ sub _SkipRawData($$) { alarm(0); $self->_SetError($FATAL, "network skip failed ($self->{rpc}:$Name:$Received/$Size): $!"); - return; + return; # out of eval } if ($n == 0) { alarm(0); $self->_SetError($FATAL, "network skip got a premature EOF ($self->{rpc}:$Name:$Received/$Size)"); - return; + return; # out of eval } $Received += $n; $Remaining -= $n; @@ -481,13 +481,13 @@ sub _RecvFile($$$$) { alarm(0); $self->_SetError($FATAL, "got a network error while receiving '$Filename' ($self->{rpc}:$Name:$Received/$Size): $!"); - return; + return; # out of eval } if ($r == 0) { alarm(0); $self->_SetError($FATAL, "got a premature EOF while receiving '$Filename' ($self->{rpc}:$Name:$Received/$Size)"); - return; + return; # out of eval } $Remaining -= $r; my $w = syswrite($Dst, $Buffer, $r, 0); @@ -497,7 +497,7 @@ sub _RecvFile($$$$) alarm(0); $self->_SetError($ERROR, "an error occurred while writing to '$Filename' ($self->{rpc}:$Name:$Received/$Size): $!"); $self->_SkipRawData($Name, $Remaining); - return; + return; # out of eval } } alarm(0); @@ -795,13 +795,13 @@ sub _SendFile($$$$) { alarm(0); $self->_SetError($FATAL, "an error occurred while reading from '$Filename' ($self->{rpc}:$Name:$Sent/$Size): $!"); - return; + return; # out of eval } if ($r == 0) { alarm(0); $self->_SetError($FATAL, "got a premature EOF while reading from '$Filename' ($self->{rpc}:$Name:$Sent/$Size)"); - return; + return; # out of eval } $Remaining -= $r; my $w = $self->_Write($Name, $Buffer); @@ -810,7 +810,7 @@ sub _SendFile($$$$) { alarm(0); $self->_SetError($FATAL, "got a network error while sending '$Filename' ($self->{rpc}:$Name:$Sent+$s/$Size): $!"); - return; + return; # out of eval } } alarm(0);

1 0

Jeremy Newman : set plural
by Jeremy Newman 22 Mar '16

22 Mar '16

Module: appdb Branch: master Commit: 779db21a87786cb2840226015bfdfeecb7f51399 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=779db21a87786cb284022601… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Mar 22 15:26:46 2016 -0500 set plural --- include/screenshot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index adb0658..692da89 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -534,12 +534,12 @@ class screenshot $sZoomIcon = Screenshot::get_zoomicon_overlay(); /* we have screenshots */ - if($hResult && query_num_rows($hResult)) + if($hResult && $numShots = query_num_rows($hResult)) { if($iVersionId) $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<br>View/Submit Screenshot</a></div>"; else - $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<br>View Screenshot</a></div>"; + $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<br>View Screenshot".($numShots > 1 ? "s" : "")."</a></div>"; } else if($iVersionId) /* we are asking for a specific app version but it has no screenshots */ { $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<br>Submit Screenshot</a></div>";

1 0

Jeremy Newman : imagejpeg second param should be null to output directly
by Jeremy Newman 22 Mar '16

22 Mar '16

Module: appdb Branch: master Commit: f69dfc770c66885f95ae8c6e7b7de30ccdc18638 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f69dfc770c66885f95ae8c6e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Mar 22 13:43:09 2016 -0500 imagejpeg second param should be null to output directly --- include/image.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/image.php b/include/image.php index 16e45dc..6f22aad 100644 --- a/include/image.php +++ b/include/image.php @@ -360,7 +360,7 @@ class Image { case 2: if($bHeader) header('Content-type: image/jpeg'); - imagejpeg($this->oImage,'',$iQuality); + imagejpeg($this->oImage,null,$iQuality); $this->set_debuglog("Outputed file as jpeg to browser"); break;

1 0

Jacek Caban : mshtml/tests: Fixed xmlhttprequest test failures.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: f8d47a66371579aef09670281928c03dce977b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d47a66371579aef09670281… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 22 13:10:42 2016 +0100 mshtml/tests: Fixed xmlhttprequest test failures. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index a16dad1..3153804 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -386,6 +386,7 @@ static void pump_msgs(BOOL *b) struct HEADER_TYPE { const char *key; const char *value; + BOOL skip_all_headers; }; static void create_xmlhttprequest(IHTMLDocument2 *doc) @@ -450,6 +451,9 @@ static void test_header(const struct HEADER_TYPE expect[], int num) SysFreeString(key); SysFreeString(text); + if(expect[i].skip_all_headers) + continue; + strcpy(buf, expect[i].key); strcat(buf, ": "); strcat(buf, expect[i].value); @@ -581,10 +585,9 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * LONG val; HRESULT hres; static const struct HEADER_TYPE expect_headers[] = { - {"Server", "Apache"}, {"Accept-Ranges", "bytes"}, {"Content-Length", "51"}, - {"Content-Type", "application/xml"} + {"Content-Type", "application/xml", TRUE} }; trace("test_sync_xhr\n");

1 0

Hans Leidekker : iphlpapi/tests: Trace network prefixes in the test for GetAdaptersAddresses.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: e8ceab5344e2ffa88a35727569294e0832f76c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8ceab5344e2ffa88a3572756… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 22 14:36:33 2016 +0100 iphlpapi/tests: Trace network prefixes in the test for GetAdaptersAddresses. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 92653ed5..73e4302 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1379,13 +1379,14 @@ static void test_GetAdaptersAddresses(void) size *= 2; osize = size; ptr = HeapAlloc(GetProcessHeap(), 0, osize); - ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &osize); + ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &osize); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); ok(osize == size, "expected %d, got %d\n", size, osize); for (aa = ptr; !ret && aa; aa = aa->Next) { char temp[128]; + IP_ADAPTER_PREFIX *prefix; ok(S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_LH) || S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_XP), @@ -1452,6 +1453,18 @@ static void test_GetAdaptersAddresses(void) sprintf(temp + strlen(temp), "%d ", aa->ZoneIndices[i]); trace("ZoneIndices: %s\n", temp); trace("FirstPrefix: %p\n", aa->FirstPrefix); + prefix = aa->FirstPrefix; + while (prefix) + { + trace("\tLength: %u\n", S(U(*prefix)).Length); + trace("\tFlags: 0x%08x\n", S(U(*prefix)).Flags); + trace("\tNext: %p\n", prefix->Next); + trace("\tAddress.lpSockaddr: %p\n", prefix->Address.lpSockaddr); + trace("\tAddress.iSockaddrLength: %d\n", prefix->Address.iSockaddrLength); + trace("\tPrefixLength: %u\n", prefix->PrefixLength); + trace("\n"); + prefix = prefix->Next; + } if (S(U(*aa)).Length < sizeof(IP_ADAPTER_ADDRESSES_LH)) continue; trace("TransmitLinkSpeed: %s\n", debugstr_longlong(aa->TransmitLinkSpeed));

1 0

Józef Kucia : wined3d: Fix driver version check.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 97c70c86be26e02a398411877d6e6a26367d3ab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97c70c86be26e02a398411877… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 22 13:41:46 2016 +0100 wined3d: Fix driver version check. The previous check didn't catch older Windows versions for which dwMinorVersion > 2. Spotted by Michael Müller. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index be3fdb0..f57f326 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1533,8 +1533,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, * In order to avoid this application bug we limit the amount of video memory * to LONG_MAX for older Windows versions. */ - if (os_version.dwMajorVersion <= 5 && os_version.dwMinorVersion <= 2 - && driver_info->vram_bytes > LONG_MAX) + if (driver_model < DRIVER_MODEL_NT6X && driver_info->vram_bytes > LONG_MAX) { TRACE("Limiting amount of video memory to %#lx bytes for OS version older than Vista.\n", LONG_MAX); driver_info->vram_bytes = LONG_MAX;

1 0