April 2014 - Wine-commits - list.winehq.org

Henri Verbeet : d3d8/tests: Get rid of some pointless BeginScene() checks.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 3a87b3a6db7aa5880af8dc044139a443fd241af9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a87b3a6db7aa5880af8dc044… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 14 09:59:26 2014 +0200 d3d8/tests: Get rid of some pointless BeginScene() checks. --- dlls/d3d8/tests/device.c | 16 +- dlls/d3d8/tests/visual.c | 456 +++++++++++++++++++++------------------------- 2 files changed, 216 insertions(+), 256 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a87b3a6db7aa5880af8d…

1 0

Henri Verbeet : d3d9/tests: Properly declare matrices.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: b97570fe1cea5ef506d5cfb1c80602fff63e88be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b97570fe1cea5ef506d5cfb1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 14 09:59:27 2014 +0200 d3d9/tests: Properly declare matrices. --- dlls/d3d9/tests/visual.c | 278 ++++++++++++++++++++++++++-------------------- 1 file changed, 156 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b97570fe1cea5ef506d5c…

1 0

Henri Verbeet : d3d8/tests: Properly declare matrices.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 54029915d5cb2aa7374d5dd73a4dcc9b7bae34bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=54029915d5cb2aa7374d5dd73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 14 09:59:28 2014 +0200 d3d8/tests: Properly declare matrices. --- dlls/d3d8/tests/visual.c | 102 +++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 74d9a0e..4b743a8 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -183,50 +183,52 @@ static void lighting_test(IDirect3DDevice8 *device) DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; DWORD color; - float mat[16] = { 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f }; - - struct vertex unlitquad[] = + static const struct vertex unlitquad[] = { - {-1.0f, -1.0f, 0.1f, 0xffff0000}, - {-1.0f, 0.0f, 0.1f, 0xffff0000}, - { 0.0f, 0.0f, 0.1f, 0xffff0000}, - { 0.0f, -1.0f, 0.1f, 0xffff0000}, + {-1.0f, -1.0f, 0.1f, 0xffff0000}, + {-1.0f, 0.0f, 0.1f, 0xffff0000}, + { 0.0f, 0.0f, 0.1f, 0xffff0000}, + { 0.0f, -1.0f, 0.1f, 0xffff0000}, }; - struct vertex litquad[] = + static const struct vertex litquad[] = { - {-1.0f, 0.0f, 0.1f, 0xff00ff00}, - {-1.0f, 1.0f, 0.1f, 0xff00ff00}, - { 0.0f, 1.0f, 0.1f, 0xff00ff00}, - { 0.0f, 0.0f, 0.1f, 0xff00ff00}, + {-1.0f, 0.0f, 0.1f, 0xff00ff00}, + {-1.0f, 1.0f, 0.1f, 0xff00ff00}, + { 0.0f, 1.0f, 0.1f, 0xff00ff00}, + { 0.0f, 0.0f, 0.1f, 0xff00ff00}, }; - struct nvertex unlitnquad[] = + static const struct nvertex unlitnquad[] = { - { 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, }; - struct nvertex litnquad[] = + static const struct nvertex litnquad[] = { - { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 0.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + { 0.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, }; - WORD Indices[] = {0, 1, 2, 2, 3, 0}; + static const WORD Indices[] = {0, 1, 2, 2, 3, 0}; + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed with %#08x\n", hr); /* Setup some states that may cause issues */ - hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLDMATRIX(0), (D3DMATRIX *) mat); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLDMATRIX(0), &mat); ok(hr == D3D_OK, "IDirect3DDevice8_SetTransform returned %#08x\n", hr); - hr = IDirect3DDevice8_SetTransform(device, D3DTS_VIEW, (D3DMATRIX *)mat); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_VIEW, &mat); ok(hr == D3D_OK, "IDirect3DDevice8_SetTransform returned %#08x\n", hr); - hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, (D3DMATRIX *) mat); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &mat); ok(hr == D3D_OK, "IDirect3DDevice8_SetTransform returned %#08x\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState returned %#08x\n", hr); @@ -422,34 +424,34 @@ static void fog_test(IDirect3DDevice8 *device) WORD Indices[] = {0, 1, 2, 2, 3, 0}; D3DCAPS8 caps; - float ident_mat[16] = - { + static const D3DMATRIX ident_mat = + {{{ 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f - }; - float world_mat1[16] = - { + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + static const D3DMATRIX world_mat1 = + {{{ 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, -0.5f, 1.0f - }; - float world_mat2[16] = - { + 0.0f, 0.0f, -0.5f, 1.0f, + }}}; + static const D3DMATRIX world_mat2 = + {{{ 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 1.0f - }; - float proj_mat[16] = - { + 0.0f, 0.0f, 1.0f, 1.0f, + }}}; + static const D3DMATRIX proj_mat = + {{{ 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, -1.0f, 1.0f - }; + 0.0f, 0.0f, -1.0f, 1.0f, + }}}; struct sVertex far_quad1[] = { @@ -551,7 +553,7 @@ static void fog_test(IDirect3DDevice8 *device) if (caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE) { /* A simple fog + non-identity world matrix test */ - hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLDMATRIX(0), (D3DMATRIX *) world_mat1); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLDMATRIX(0), &world_mat1); ok(hr == D3D_OK, "IDirect3DDevice8_SetTransform returned %#08x\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR); @@ -584,9 +586,9 @@ static void fog_test(IDirect3DDevice8 *device) IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); /* Test fog behavior with an orthogonal (but not identity) projection matrix */ - hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLDMATRIX(0), (D3DMATRIX *) world_mat2); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLDMATRIX(0), &world_mat2); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); - hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, (D3DMATRIX *) proj_mat); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &proj_mat); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); @@ -613,9 +615,9 @@ static void fog_test(IDirect3DDevice8 *device) IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLDMATRIX(0), (D3DMATRIX *) ident_mat); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLDMATRIX(0), &ident_mat); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); - hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, (D3DMATRIX *) ident_mat); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &ident_mat); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); } else

1 0

Alexandre Julliard : testbot: Always use the configured web host name in registration emails.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: tools Branch: master Commit: c9aca501f71e74ef3ab76eba7202f45dd2e48c37 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c9aca501f71e74ef3ab76eba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 19:06:41 2014 +0200 testbot: Always use the configured web host name in registration emails. --- testbot/web/Register.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index d5eb4cd..ca82d55 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -110,8 +110,8 @@ sub OnSendRequest { $Msg .= "Remarks:\n" . $self->GetParam("Remarks") . "\n"; } - my $URL = MakeSecureURL("/admin/UserDetails.pl?Key=" . - uri_escape($self->GetParam("Name"))); + my $URL = ($UseSSL ? "https://" : "http://") . $WebHostName . + "/admin/UserDetails.pl?Key=" . uri_escape($self->GetParam("Name")); $Msg .= "\nTo approve or deny the request, please go to " . $URL; open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq");

1 0

Francois Gouget : testbot/testagentd: Generate debugging information when compiling.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: tools Branch: master Commit: bffa9e544e9b676747ce58d75fea294157938a4a URL: http://source.winehq.org/git/tools.git/?a=commit;h=bffa9e544e9b676747ce58d7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 14:46:46 2014 +0200 testbot/testagentd: Generate debugging information when compiling. This way one just has to comment out the strip commands to get binaries with useful debug information. --- testbot/src/testagentd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index 676d71c..5a7b735 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -13,7 +13,7 @@ $(builddir)/testagentd: testagentd.o platform_unix.o strip $@ .c.o: - gcc -Wall -c -o $@ $< + gcc -Wall -g -c -o $@ $< TestAgentd.exe: testagentd.obj platform_windows.obj @@ -22,7 +22,7 @@ TestAgentd.exe: testagentd.obj platform_windows.obj .SUFFIXES: .obj .c.obj: - $(CROSSCC32) -Wall -c -o $@ $< + $(CROSSCC32) -Wall -g -c -o $@ $< testagentd.o testagentd.obj: platform.h platform_unix.o: platform.h list.h

1 0

Francois Gouget : testbot/testagentd: Avoid crashing when the server cannot create its master socket.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: tools Branch: master Commit: 410bea9e02ee9cbae4445b2788be92b0dccacf8c URL: http://source.winehq.org/git/tools.git/?a=commit;h=410bea9e02ee9cbae4445b27… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 14:48:35 2014 +0200 testbot/testagentd: Avoid crashing when the server cannot create its master socket. --- testbot/src/testagentd/testagentd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 35b42f3..b8f9c57 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1192,7 +1192,8 @@ int main(int argc, char** argv) break; closesocket(master); }; - addrlen = addrp->ai_addrlen; + if (addrp) + addrlen = addrp->ai_addrlen; ta_freeaddrinfo(addresses); if (addrp == NULL) {

1 0

Francois Gouget : testbot/testagent: Always strip the trailing '\0' from strings, even for error messages.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: tools Branch: master Commit: fa4327a3d2e74df70924c2e7a7c7b93069a30b6b URL: http://source.winehq.org/git/tools.git/?a=commit;h=fa4327a3d2e74df70924c2e7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:10 2014 +0200 testbot/testagent: Always strip the trailing '\0' from strings, even for error messages. --- testbot/lib/WineTestBot/TestAgent.pm | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index c9895ba..178cf51 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -323,6 +323,20 @@ sub _SkipRawData($$) return $Success; } +sub _RecvRawString($$$) +{ + my ($self, $Name, $Size) = @_; + + my $Str = $self->_RecvRawData($Name, $Size); + if (defined $Str) + { + # Remove the trailing '\0' + chop $Str; + debug(" RecvRawString('$Name') -> '$Str'\n"); + } + return $Str; +} + sub _RecvRawUInt32($$) { my ($self, $Name) = @_; @@ -379,7 +393,7 @@ sub _ExpectEntryHeader($$$;$) if ($HType eq 'e') { # The expected data was replaced with an error message - my $Message = $self->_RecvRawData("$Name.e", $HSize); + my $Message = $self->_RecvRawString("$Name.e", $HSize); return undef if (!defined $Message); $self->_SetError($ERROR, $Message); } @@ -502,7 +516,7 @@ sub _SkipEntries($$) if ($Type eq 'e') { # The expected data was replaced with an error message - my $Message = $self->_RecvRawData("Skip$i.e", $Size); + my $Message = $self->_RecvRawString("Skip$i.e", $Size); return undef if (!defined $Message); $self->_SetError($ERROR, $Message); } @@ -599,7 +613,7 @@ sub _RecvErrorList($) } elsif ($Type eq 's') { - my $Status = $self->_RecvRawData("Err$i.s", $Size); + my $Status = $self->_RecvRawString("Err$i.s", $Size); return $self->GetLastError() if (!defined $Status); debug(" RecvStatus() -> '$Status'\n"); push @$Errors, $Status; @@ -607,7 +621,7 @@ sub _RecvErrorList($) elsif ($Type eq 'e') { # The expected data was replaced with an error message - my $Message = $self->_RecvRawData("Err$i.e", $Size); + my $Message = $self->_RecvRawString("Err$i.e", $Size); if (defined $Message) { debug(" RecvError() -> '$Message'\n");

1 0

Francois Gouget : testbot/testagentd: Child processes should not inherit the server's sockets ( and other file descriptors).
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: tools Branch: master Commit: 1ed804c36b35bf4fd51876b4d02e92f64afb0fb5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1ed804c36b35bf4fd51876b4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:24 2014 +0200 testbot/testagentd: Child processes should not inherit the server's sockets (and other file descriptors). --- testbot/src/testagentd/platform_windows.c | 2 +- testbot/src/testagentd/testagentd.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 9dda56a..89e435d 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -126,7 +126,7 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) si.hStdInput = fhs[0]; si.hStdOutput = fhs[1]; si.hStdError = fhs[2]; - if (!CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, + if (!CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi)) { set_status(ST_ERROR, "could not run '%s': %lu", cmdline, GetLastError()); diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index b8f9c57..230683a 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1067,7 +1067,7 @@ int main(int argc, char** argv) char* opt_port = NULL; char* opt_srchost = NULL; struct addrinfo *addresses, *addrp; - int rc, addrlen; + int rc, sockflags, addrlen; int opt_usage = 0; SOCKET master; int on = 1; @@ -1171,6 +1171,11 @@ int main(int argc, char** argv) } /* Bind to the host in a protocol neutral way */ +#ifdef SOCK_CLOEXEC + sockflags = SOCK_CLOEXEC; +#else + sockflags = 0; +#endif rc = ta_getaddrinfo(NULL, opt_port, &addresses); if (rc) { @@ -1182,7 +1187,8 @@ int main(int argc, char** argv) debug("trying family=%d\n", addrp->ai_family); if (addrp->ai_family != PF_INET) continue; - master = socket(addrp->ai_family, addrp->ai_socktype, addrp->ai_protocol); + master = socket(addrp->ai_family, addrp->ai_socktype | sockflags, + addrp->ai_protocol); if (master < 0) continue; setsockopt(master, SOL_SOCKET, SO_REUSEADDR, (void*)&on, sizeof(on)); @@ -1212,6 +1218,9 @@ int main(int argc, char** argv) SOCKET client; debug("Waiting in accept()\n"); client = accept(master, NULL, NULL); +#ifdef O_CLOEXEC + fcntl(client, F_SETFL, fcntl(client, F_GETFL, 0) | O_CLOEXEC); +#endif if (client >= 0) { if (is_host_allowed(client, opt_srchost, addrlen))

1 0

Francois Gouget : testbot/testagentd: Add a function to simplify formatting a message.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: tools Branch: master Commit: 5179c8ff848da8da501c773a38bd8d9c9d0818ba URL: http://source.winehq.org/git/tools.git/?a=commit;h=5179c8ff848da8da501c773a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:36 2014 +0200 testbot/testagentd: Add a function to simplify formatting a message. --- testbot/src/testagentd/testagentd.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 230683a..d5d8dfc 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -129,31 +129,38 @@ const char* status_names[] = {"ok:", "error:", "fatal:"}; /* If true, then the current connection is in a broken state */ static int broken = 0; -/* This is a message which indicates the reason for the status */ -static char* status_msg = NULL; -static unsigned status_size = 0; -static void vset_status_msg(const char* format, va_list valist) + +static char* vformat_msg(char** buf, unsigned* size, const char* format, va_list valist) { - int len; + unsigned len; va_list args; len = 1; do { - if (len >= status_size) + if (len >= *size) { /* len does not count the trailing '\0'. So add 1 and round up * to the next 16 bytes multiple. */ - status_size = (len + 1 + 0xf) & ~0xf; - status_msg = realloc(status_msg, status_size); + *size = (len + 1 + 0xf) & ~0xf; + *buf = realloc(*buf, *size); } va_copy(args, valist); - len = vsnprintf(status_msg, status_size, format, args); + len = vsnprintf(*buf, *size, format, args); va_end(args); if (len < 0) - len = status_size * 1.1; + len = *size * 1.1; } - while (len >= status_size); + while (len >= *size); + return *buf; +} + +/* This is a message which indicates the reason for the status */ +static char* status_msg = NULL; +static unsigned status_size = 0; +static void vset_status_msg(const char* format, va_list valist) +{ + vformat_msg(&status_msg, &status_size, format, valist); if (opt_debug || status != ST_OK) fprintf(stderr, "%s%s: %s\n", status_names[status], rpc_name(rpcid), status_msg); }

1 0

Francois Gouget : testbot/testagentd: Add support for upgrading the TestAgent server.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: tools Branch: master Commit: 891882fd982ed745d5fb6fb3eaaf610b661a6a27 URL: http://source.winehq.org/git/tools.git/?a=commit;h=891882fd982ed745d5fb6fb3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:45 2014 +0200 testbot/testagentd: Add support for upgrading the TestAgent server. --- testbot/lib/WineTestBot/TestAgent.pm | 100 ++++++++++++++++++++++++++ testbot/src/testagentd/platform.h | 7 ++ testbot/src/testagentd/platform_unix.c | 31 ++++++++ testbot/src/testagentd/platform_windows.c | 33 +++++++++ testbot/src/testagentd/testagentd.c | 112 ++++++++++++++++++++++++++++- 5 files changed, 281 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=891882fd982ed745d5fb…

1 0