October 2012 - Wine-Commits

Hans Leidekker : credui: Don' t save credentials if CREDUI_FLAGS_DO_NOT_PERSIST is specified.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: d6f8687630b3702e91aee5dadc5fd6b1842ba879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f8687630b3702e91aee5dad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 18 14:16:21 2012 +0200 credui: Don't save credentials if CREDUI_FLAGS_DO_NOT_PERSIST is specified. --- dlls/credui/credui_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index e3e964f..b470928 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -655,7 +655,7 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, LeaveCriticalSection(&csPendingCredentials); } - else + else if (!(dwFlags & CREDUI_FLAGS_DO_NOT_PERSIST)) result = save_credentials(pszTargetName, pszUsername, pszPassword, (dwFlags & CREDUI_FLAGS_GENERIC_CREDENTIALS) != 0); }

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_USHR in the GLSL shader backend.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: e31945b8aac8a629a643519a23702c957bd5db1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31945b8aac8a629a643519a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 17 23:08:02 2012 +0200 wined3d: Implement WINED3DSIH_USHR in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7269212..a66107c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2208,20 +2208,21 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) struct glsl_src_param src0_param; struct glsl_src_param src1_param; DWORD write_mask; - char op; + const char *op; /* Determine the GLSL operator to use based on the opcode */ switch (ins->handler_idx) { - case WINED3DSIH_ADD: op = '+'; break; - case WINED3DSIH_AND: op = '&'; break; - case WINED3DSIH_DIV: op = '/'; break; - case WINED3DSIH_IADD: op = '+'; break; - case WINED3DSIH_MUL: op = '*'; break; - case WINED3DSIH_SUB: op = '-'; break; - case WINED3DSIH_XOR: op = '^'; break; + case WINED3DSIH_ADD: op = "+"; break; + case WINED3DSIH_AND: op = "&"; break; + case WINED3DSIH_DIV: op = "/"; break; + case WINED3DSIH_IADD: op = "+"; break; + case WINED3DSIH_MUL: op = "*"; break; + case WINED3DSIH_SUB: op = "-"; break; + case WINED3DSIH_USHR: op = ">>"; break; + case WINED3DSIH_XOR: op = "^"; break; default: - op = ' '; + op = "<unhandled operator>"; FIXME("Opcode %#x not yet handled in GLSL\n", ins->handler_idx); break; } @@ -2229,7 +2230,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) write_mask = shader_glsl_append_dst(buffer, ins); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); - shader_addline(buffer, "%s %c %s);\n", src0_param.param_str, op, src1_param.param_str); + shader_addline(buffer, "%s %s %s);\n", src0_param.param_str, op, src1_param.param_str); } static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) @@ -5466,7 +5467,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, /* WINED3DSIH_UDIV */ shader_glsl_udiv, - /* WINED3DSIH_USHR */ NULL, + /* WINED3DSIH_USHR */ shader_glsl_binop, /* WINED3DSIH_UTOF */ shader_glsl_to_float, /* WINED3DSIH_XOR */ shader_glsl_binop, };

1 0

Henri Verbeet : user32: Implement GetRawInputDeviceList().
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 3ed797b265572751e0b45d6292f54ddb4876ffc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ed797b265572751e0b45d629… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 17 23:08:03 2012 +0200 user32: Implement GetRawInputDeviceList(). --- dlls/user32/input.c | 28 ++++++++++++++++++++++------ dlls/user32/message.c | 3 --- dlls/user32/user_private.h | 3 +++ 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 3ca71a6..76c05df 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -478,14 +478,30 @@ BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO plii) /****************************************************************** * GetRawInputDeviceList (USER32.@) */ -UINT WINAPI GetRawInputDeviceList(PRAWINPUTDEVICELIST pRawInputDeviceList, PUINT puiNumDevices, UINT cbSize) +UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_count, UINT size) { - FIXME("(pRawInputDeviceList=%p, puiNumDevices=%p, cbSize=%d) stub!\n", pRawInputDeviceList, puiNumDevices, cbSize); + TRACE("devices %p, device_count %p, size %u.\n", devices, device_count, size); - if(pRawInputDeviceList) - memset(pRawInputDeviceList, 0, sizeof *pRawInputDeviceList); - *puiNumDevices = 0; - return 0; + if (size != sizeof(*devices) || !device_count) return ~0U; + + if (!devices) + { + *device_count = 2; + return 0; + } + + if (*device_count < 2) + { + *device_count = 2; + return ~0U; + } + + devices[0].hDevice = WINE_MOUSE_HANDLE; + devices[0].dwType = RIM_TYPEMOUSE; + devices[1].hDevice = WINE_KEYBOARD_HANDLE; + devices[1].dwType = RIM_TYPEKEYBOARD; + + return 2; } diff --git a/dlls/user32/message.c b/dlls/user32/message.c index fa52207..c1fe036 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -51,9 +51,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msg); WINE_DECLARE_DEBUG_CHANNEL(relay); WINE_DECLARE_DEBUG_CHANNEL(key); -#define WINE_MOUSE_HANDLE ((HANDLE)1) -#define WINE_KEYBOARD_HANDLE ((HANDLE)2) - #define WM_NCMOUSEFIRST WM_NCMOUSEMOVE #define WM_NCMOUSELAST (WM_NCMOUSEFIRST+(WM_MOUSELAST-WM_MOUSEFIRST)) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 3afc7cf..6d717fa 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -35,6 +35,9 @@ #define WM_SYSTIMER 0x0118 #define WM_POPUPSYSTEMMENU 0x0313 +#define WINE_MOUSE_HANDLE ((HANDLE)1) +#define WINE_KEYBOARD_HANDLE ((HANDLE)2) + struct window_surface; /* internal messages codes */

1 0

Francois Gouget : wined3d: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 23470870a1fac9a07eaf5bc9355b896c7200f3e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23470870a1fac9a07eaf5bc93… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 17 23:24:43 2012 +0200 wined3d: Add a trailing '\n' to a Wine trace. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7213d05..b18a99f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2186,7 +2186,7 @@ static enum wined3d_pci_device select_card_handler(const struct gl_vendor_select TRACE("Applying card selector \"%s\".\n", table[i].description); return table[i].select_card(gl_info, gl_renderer); } - FIXME("Couldn't find a suitable card selector for GL vendor %04x (using GL_RENDERER %s)", + FIXME("Couldn't find a suitable card selector for GL vendor %04x (using GL_RENDERER %s)\n", gl_vendor, debugstr_a(gl_renderer)); return PCI_DEVICE_NONE;

1 0

Henri Verbeet : wined3d: Explicitly check the shader type in shader_glsl_gen_sample_code().
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: e832978adb04b99e67fa2d7b8cc8d6861d63e26e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e832978adb04b99e67fa2d7b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 17 23:07:59 2012 +0200 wined3d: Explicitly check the shader type in shader_glsl_gen_sample_code(). --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 199695b..a585b1d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2140,6 +2140,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s DWORD sampler, const struct glsl_sample_function *sample_function, DWORD swizzle, const char *dx, const char *dy, const char *bias, const char *coord_reg_fmt, ...) { + const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; const char *sampler_base; char dst_swizzle[6]; struct color_fixup_desc fixup; @@ -2148,7 +2149,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s shader_glsl_swizzle_to_str(swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); - if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) + if (version->type == WINED3D_SHADER_TYPE_PIXEL) { const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; fixup = priv->cur_ps_args->color_fixup[sampler];

1 0

Alexandre Julliard : winex11: Don't delete the DC if it' s not for a valid pbuffer.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 64aed7c5be455db9315a39e33fdc84dd3a284255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64aed7c5be455db9315a39e33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 21:40:52 2012 +0200 winex11: Don't delete the DC if it's not for a valid pbuffer. --- dlls/winex11.drv/opengl.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5151e20..cf99876 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2318,14 +2318,17 @@ static int X11DRV_wglReleasePbufferDCARB( struct wgl_pbuffer *object, HDC hdc ) TRACE("(%p, %p)\n", object, hdc); EnterCriticalSection( &context_section ); + if (!XFindContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char **)&gl )) { XDeleteContext( gdi_display, (XID)hdc, gl_pbuffer_context ); free_gl_drawable( gl ); } + else hdc = 0; + LeaveCriticalSection( &context_section ); - return DeleteDC(hdc); + return hdc && DeleteDC(hdc); } /**

1 0

Alexandre Julliard : user32: Don't free a clip region twice.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 6cda76fd997078a28125fa56b87f7130e43625db URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cda76fd997078a28125fa56b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 21:40:18 2012 +0200 user32: Don't free a clip region twice. --- dlls/user32/painting.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 7d106bb..e9705fe 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -790,7 +790,6 @@ void move_window_bits( HWND hwnd, struct window_surface *old_surface, bits, info, DIB_RGB_COLORS ); old_surface->funcs->unlock( old_surface ); ReleaseDC( hwnd, hdc ); - DeleteObject( rgn ); } }

1 0

Alexandre Julliard : gdi32: Add a generation count in the high word of GDI handles.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: wine Branch: master Commit: 091c342f32583464df5ef45ae314d34e9a511c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=091c342f32583464df5ef45ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 16:58:28 2012 +0200 gdi32: Add a generation count in the high word of GDI handles. --- dlls/gdi32/enhmfdrv/objects.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdiobj.c | 108 +++++++++++++++++++++++++++------------- dlls/gdi32/mfdrv/objects.c | 2 +- dlls/gdi32/palette.c | 3 + 5 files changed, 79 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=091c342f32583464df5ef…

1 0

Francois Gouget : testbot/scripts: Add a TestAgent script to test the TestAgentd server.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: tools Branch: master Commit: 655c406c0a44b561cc3810d16bb87c24f3cf9bce URL: http://source.winehq.org/git/tools.git/?a=commit;h=655c406c0a44b561cc3810d1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 18 15:37:21 2012 +0200 testbot/scripts: Add a TestAgent script to test the TestAgentd server. --- testbot/scripts/TestAgent | 179 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 179 insertions(+), 0 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent new file mode 100755 index 0000000..2e9850d --- /dev/null +++ b/testbot/scripts/TestAgent @@ -0,0 +1,179 @@ +#!/usr/bin/perl -w +# +# This is a testagentd client. It can be used to exchange files or run +# commands on VMs, mostly for testing purposes. +# +# Copyright 2012 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +use strict; + +my $name0=$0; +$name0 =~ s+^.*/++; + + +my $Dir; +sub BEGIN +{ + $0 =~ m=^(.*)/[^/]*$=; + $Dir = $1; +} +use lib "$Dir/../lib"; + +use WineTestBot::Config; +use WineTestBot::TestAgent; +use WineTestBot::Log; + +sub error(@) +{ + print STDERR "$name0:error: ", @_; +} + +my ($Cmd, $Hostname, $HostPathName, $GuestPathName, $Script, $ScriptTimeout); +my $Port; +my $Timeout; +my $Usage; + +sub check_opt_val($$) +{ + my ($option, $val)=@_; + + if (defined $val) + { + error("$option can only be specified once\n"); + $Usage=2; # but continue processing this option + } + if (!@ARGV) + { + error("missing value for $option\n"); + $Usage=2; + return undef; + } + return shift @ARGV; +} + +while (@ARGV) +{ + my $arg=shift @ARGV; + if ($arg eq "--help") + { + $Usage=0; + } + elsif ($arg eq "--port") + { + $Port=check_opt_val($arg, $Port); + } + elsif ($arg eq "--timeout") + { + $ScriptTimeout=check_opt_val($arg, $ScriptTimeout); + } + elsif (!defined $Hostname) + { + $Hostname = $arg; + } + elsif ($arg eq "send") + { + $HostPathName=check_opt_val($arg, $HostPathName); + $GuestPathName=check_opt_val($arg, $GuestPathName) if (!$Usage); + $Cmd = $arg; + } + elsif ($arg eq "get") + { + $GuestPathName=check_opt_val($arg, $GuestPathName); + $HostPathName=check_opt_val($arg, $HostPathName) if (!$Usage); + $Cmd = $arg; + } + elsif ($arg eq "runscript") + { + $Script=check_opt_val($arg, $Script); + $Cmd = $arg; + } + elsif ($arg eq "status") + { + $Cmd = $arg; + } + else + { + error("unknown command $arg\n"); + $Usage = 2; + } +} + +if (!defined $Usage) +{ + if (!defined $Cmd) + { + error("you must specify a command to run\n"); + $Usage = 2; + } + $AgentPort = $Port if (defined $Port); +} +if (defined $Usage) +{ + if ($Usage) + { + error("try '$name0 --help' for more information\n"); + exit $Usage; + } + print "Usage: $name0 [options] <hostname> send <hostpath> <guestpath>\n"; + print "or $name0 [options] <hostname> get <guestpath> <hostpath>\n"; + print "or $name0 [options] <hostname> runscript <command>\n"; + print "or $name0 [options] <hostname> status\n"; + print "\n"; + print "This is a testagentd client. It can be used to send/receive files and to run scripts on the specified guest host.\n"; + print "\n"; + print "Where:\n"; + print " send Sends the <hostpath> file and saves it as <guestpath> on the\n"; + print " guest.\n"; + print " get Retrieves the <guestpath> file from the guest and saves it as\n"; + print " <hostpath>.\n"; + print " runscript Runs the specified <command> on the guest.\n"; + print " status Retrieves the status of the last command that was run on the\n"; + print " guest.\n"; + print " <hostname> Is the hostname of the guest.\n"; + print " --port <port> Use the specified port number instead of the default one.\n"; + print " --timeout <timeout> Use the specified timeout (in seconds) instead of the\n"; + print " default one.\n"; + print " --help Shows this usage message.\n"; + exit 0; +} + +my $Err; +if ($Cmd eq "send") +{ + $Err = TestAgent::SendFile($Hostname, $HostPathName, $GuestPathName); +} +elsif ($Cmd eq "get") +{ + $Err = TestAgent::GetFile($Hostname, $GuestPathName, $HostPathName); +} +elsif ($Cmd eq "runscript") +{ + $Err = TestAgent::RunScript($Hostname, $Script, $ScriptTimeout); +} +elsif ($Cmd eq "status") +{ + my $Status; + ($Status, $Err) = TestAgent::GetStatus($Hostname); + print "Status=$Status"; +} + +if ($Err) +{ + error("$Err\n"); + exit 1; +} + +exit 0;

1 0

Francois Gouget : testbot/VMs: Use a TestAgent tool instead of VMware to run scripts on or copy files from /to the VMs.
by Alexandre Julliard Oct. 18, 2012

Oct. 18, 2012

Module: tools Branch: master Commit: ff92857532c2623b1c5dd89afb2a8d0043764508 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ff92857532c2623b1c5dd89a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 18 15:34:36 2012 +0200 testbot/VMs: Use a TestAgent tool instead of VMware to run scripts on or copy files from/to the VMs. --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunReconfig.pl | 2 +- testbot/bin/WineRunTask.pl | 2 +- testbot/bin/build/Reconfig.pl | 33 ++ testbot/ddl/winetestbot.sql | 1 + testbot/doc/INSTALL.txt | 14 +- testbot/doc/winetestbot-schema.dia | 24 +- testbot/lib/WineTestBot/Config.pm | 10 +- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 3 + testbot/lib/WineTestBot/TestAgent.pm | 250 ++++++++++ testbot/lib/WineTestBot/VMs.pm | 109 +---- testbot/src/testagentd/.gitignore | 4 + testbot/src/testagentd/Makefile | 40 ++ testbot/src/testagentd/platform.h | 85 ++++ testbot/src/testagentd/platform_unix.c | 203 ++++++++ testbot/src/testagentd/platform_windows.c | 267 ++++++++++ testbot/src/testagentd/testagentd.c | 626 ++++++++++++++++++++++++ 17 files changed, 1574 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=ff92857532c2623b1c5d…

1 0