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

Piotr Caban : oleacc: Add tests for default client accessible object.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 7c029e02aed77b88a3e0342a071a91359c7614d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c029e02aed77b88a3e0342a0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:56:44 2014 +0200 oleacc: Add tests for default client accessible object. --- dlls/oleacc/tests/Makefile.in | 2 +- dlls/oleacc/tests/main.c | 114 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/tests/Makefile.in b/dlls/oleacc/tests/Makefile.in index 2b0157d..7773ba9 100644 --- a/dlls/oleacc/tests/Makefile.in +++ b/dlls/oleacc/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = oleacc.dll -IMPORTS = ole32 oleacc user32 +IMPORTS = ole32 oleacc oleaut32 user32 C_SRCS = \ main.c diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index c5c50b8..0162d72 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -215,6 +215,11 @@ static LRESULT WINAPI test_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA { switch(msg) { case WM_GETOBJECT: + if(lparam == OBJID_QUERYCLASSNAMEIDX) { + ok(!wparam, "wparam = %lx\n", wparam); + return 0; + } + ok(wparam==0xffffffff || broken(wparam==0x8000), "wparam = %lx\n", wparam); if(lparam == (DWORD)OBJID_CURSOR) return E_UNEXPECTED; @@ -274,6 +279,114 @@ static void test_AccessibleObjectFromWindow(void) DestroyWindow(hwnd); } +static void test_default_client_accessible_object(void) +{ + static const WCHAR testW[] = {'t','e','s','t',' ','t',' ','&','j','u','n','k',0}; + static const WCHAR shortcutW[] = {'A','l','t','+','t',0}; + + IAccessible *acc; + HWND chld, hwnd; + HRESULT hr; + VARIANT vid, v; + BSTR str; + LONG l; + + hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + chld = CreateWindowA("static", "message", WS_CHILD, + 0, 0, 0, 0, hwnd, NULL, NULL, NULL); + ok(chld != NULL, "CreateWindow failed\n"); + + hr = CreateStdAccessibleObject(NULL, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == E_FAIL, "got %x\n", hr); + + hr = CreateStdAccessibleObject(hwnd, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == S_OK, "got %x\n", hr); + + hr = IAccessible_get_accChildCount(acc, &l); + ok(hr == S_OK, "got %x\n", hr); + ok(l == 1, "l = %d\n", l); + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, testW), "name = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + V_I4(&vid) = 1; + str = (void*)0xdeadbeef; + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == E_INVALIDARG, "got %x\n", hr); + ok(!str, "str != NULL\n"); + V_I4(&vid) = CHILDID_SELF; + + str = (void*)0xdeadbeef; + hr = IAccessible_get_accValue(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + ok(!str, "str != NULL\n"); + + str = (void*)0xdeadbeef; + hr = IAccessible_get_accDescription(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + ok(!str, "str != NULL\n"); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (void*)0xdeadbeef; + hr = IAccessible_get_accRole(acc, vid, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == ROLE_SYSTEM_CLIENT, "V_I4(&v) = %d\n", V_I4(&v)); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (void*)0xdeadbeef; + hr = IAccessible_get_accState(acc, vid, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == (STATE_SYSTEM_FOCUSABLE|STATE_SYSTEM_INVISIBLE) || + broken(V_I4(&v) == STATE_SYSTEM_INVISIBLE), "V_I4(&v) = %x\n", V_I4(&v)); + + str = (void*)0xdeadbeef; + hr = IAccessible_get_accHelp(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + ok(!str, "str != NULL\n"); + + hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, shortcutW), "str = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hr = IAccessible_get_accDefaultAction(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + ok(!str, "str != NULL\n"); + + DestroyWindow(hwnd); + + hr = IAccessible_get_accChildCount(acc, &l); + ok(hr == S_OK, "got %x\n", hr); + ok(l == 0, "l = %d\n", l); + + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == E_INVALIDARG, "got %x\n", hr); + + hr = IAccessible_get_accValue(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + + hr = IAccessible_get_accRole(acc, vid, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == ROLE_SYSTEM_CLIENT, "V_I4(&v) = %d\n", V_I4(&v)); + + hr = IAccessible_get_accState(acc, vid, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == STATE_SYSTEM_INVISIBLE, "V_I4(&v) = %x\n", V_I4(&v)); + + IAccessible_Release(acc); +} + START_TEST(main) { int argc; @@ -304,6 +417,7 @@ START_TEST(main) test_getroletext(); test_LresultFromObject(argv[0]); test_AccessibleObjectFromWindow(); + test_default_client_accessible_object(); unregister_window_class(); CoUninitialize();

1 0

Ken Thomases : configure: Use the discovered LCMS2_LIBS when testing linking against lcms2.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: dfa98dfb497bf40324831661d90741a7f2865a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa98dfb497bf40324831661d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 30 17:48:09 2014 -0500 configure: Use the discovered LCMS2_LIBS when testing linking against lcms2. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1bca827..0db221c 100755 --- a/configure +++ b/configure @@ -11755,7 +11755,7 @@ if ${ac_cv_lib_lcms2_cmsOpenProfileFromFile+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-llcms2 $LIBS" +LIBS="-llcms2 $LCMS2_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/configure.ac b/configure.ac index 46602d6..673323a 100644 --- a/configure.ac +++ b/configure.ac @@ -1442,7 +1442,7 @@ then if test "$ac_cv_header_lcms2_h" = "yes" then AC_CHECK_LIB(lcms2, cmsOpenProfileFromFile, - [AC_DEFINE(HAVE_LCMS2, 1, [Define if you have the LittleCMS development environment])],[LCMS2_LIBS=""]) + [AC_DEFINE(HAVE_LCMS2, 1, [Define if you have the LittleCMS development environment])],[LCMS2_LIBS=""],[$LCMS2_LIBS]) else LCMS2_CFLAGS="" LCMS2_LIBS=""

1 0

Thomas Faber : usp10: Do not write to last script item if buffer space is insufficient.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 3f9c9eaa549e342870af2ee9454a93d29090c1b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9c9eaa549e342870af2ee94… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu May 1 08:57:09 2014 +0200 usp10: Do not write to last script item if buffer space is insufficient. --- dlls/usp10/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 94785b2..ae164d2 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1616,12 +1616,12 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, * item is set up to prevent random behaviour if the caller erroneously * checks the n+1 structure */ index++; + if (index + 1 > cMaxItems) return E_OUTOFMEMORY; memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos); /* Set one SCRIPT_STATE item being returned */ - if (index + 1 > cMaxItems) return E_OUTOFMEMORY; if (pcItems) *pcItems = index; /* Set SCRIPT_ITEM */

1 0

Hans Leidekker : msi: Avoid a crash when MIME entries point to non-existing extensions.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 95d72ae6f012968486402ac82f2758b9ee44008c URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d72ae6f012968486402ac82… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 1 10:07:23 2014 +0200 msi: Avoid a crash when MIME entries point to non-existing extensions. --- dlls/msi/classes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 2719a8e..df5c817 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -1452,14 +1452,14 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( mt, &package->mimes, MSIMIME, entry ) { - LPWSTR extension, key; + LPWSTR extension = NULL, key; /* * check if the MIME is to be installed. Either as requested by an * extension or Class */ if ((!mt->Class || mt->Class->action != INSTALLSTATE_LOCAL) && - mt->Extension->action != INSTALLSTATE_LOCAL) + (!mt->Extension || mt->Extension->action != INSTALLSTATE_LOCAL)) { TRACE("MIME %s not scheduled to be installed\n", debugstr_w(mt->ContentType)); continue; @@ -1467,7 +1467,7 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) TRACE("Registering MIME type %s\n", debugstr_w(mt->ContentType)); - extension = msi_alloc( (strlenW( mt->Extension->Extension ) + 2) * sizeof(WCHAR) ); + if (mt->Extension) extension = msi_alloc( (strlenW( mt->Extension->Extension ) + 2) * sizeof(WCHAR) ); key = msi_alloc( (strlenW( mt->ContentType ) + strlenW( szMIMEDatabase ) + 1) * sizeof(WCHAR) ); if (extension && key) @@ -1510,7 +1510,7 @@ UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) LPWSTR mime_key; if ((!mime->Class || mime->Class->action != INSTALLSTATE_ABSENT) && - mime->Extension->action != INSTALLSTATE_ABSENT) + (!mime->Extension || mime->Extension->action != INSTALLSTATE_ABSENT)) { TRACE("MIME %s not scheduled to be removed\n", debugstr_w(mime->ContentType)); continue;

1 0

Jérôme Gardou : msi: Expand REG_EXPAND_SZ keys when resolving AppSearch entries.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 70225a4de3acc2cb15034eae2b7f929078602f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70225a4de3acc2cb15034eae2… Author: Jérôme Gardou <jerome.gardou(a)reactos.org> Date: Wed Apr 30 16:08:43 2014 +0200 msi: Expand REG_EXPAND_SZ keys when resolving AppSearch entries. --- dlls/msi/appsearch.c | 13 +++++++++++++ dlls/msi/tests/package.c | 22 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 0d9c302..ae8c5c8 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -451,6 +451,19 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT if (sz == 0) goto end; + /* expand if needed */ + if (regType == REG_EXPAND_SZ) + { + sz = ExpandEnvironmentStringsW((LPCWSTR)value, NULL, 0); + if (sz) + { + LPWSTR buf = msi_alloc(sz * sizeof(WCHAR)); + ExpandEnvironmentStringsW((LPCWSTR)value, buf, sz); + msi_free(value); + value = (LPBYTE)buf; + } + } + if ((regType == REG_SZ || regType == REG_EXPAND_SZ) && (ptr = strchrW((LPWSTR)value, '"')) && (end = strchrW(++ptr, '"'))) *end = '\0'; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a0c0455..043baf9 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3689,6 +3689,8 @@ static void test_appsearch(void) MSIHANDLE hdb; CHAR prop[MAX_PATH]; DWORD size; + HKEY hkey; + const char reg_expand_value[] = "%systemroot%\\system32\\notepad.exe"; hdb = create_package_db(); ok ( hdb, "failed to create package database\n" ); @@ -3702,12 +3704,23 @@ static void test_appsearch(void) r = add_appsearch_entry( hdb, "'NOTEPAD', 'NewSignature2'" ); ok( r == ERROR_SUCCESS, "cannot add entry: %d\n", r ); + r = add_appsearch_entry( hdb, "'REGEXPANDVAL', 'NewSignature3'" ); + ok( r == ERROR_SUCCESS, "cannot add entry: %d\n", r ); + r = create_reglocator_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); r = add_reglocator_entry( hdb, "NewSignature1", 0, "htmlfile\\shell\\open\\command", "", 1 ); ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); + r = RegCreateKeyExA(HKEY_CURRENT_USER, "Software\\Winetest_msi", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); + ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); + r = RegSetValueExA(hkey, NULL, 0, REG_EXPAND_SZ, (const BYTE*)reg_expand_value, strlen(reg_expand_value) + 1); + ok( r == ERROR_SUCCESS, "Could not set key value: %d.\n", r); + RegCloseKey(hkey); + r = add_reglocator_entry( hdb, "NewSignature3", 1, "Software\\Winetest_msi", "", 1 ); + ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); + r = create_drlocator_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create DrLocator table: %d\n", r ); @@ -3723,6 +3736,9 @@ static void test_appsearch(void) r = add_signature_entry( hdb, "'NewSignature2', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); ok( r == ERROR_SUCCESS, "cannot add signature: %d\n", r ); + r = add_signature_entry( hdb, "'NewSignature3', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); + ok( r == ERROR_SUCCESS, "cannot add signature: %d\n", r ); + r = package_from_db( hdb, &hpkg ); if (r == ERROR_INSTALL_PACKAGE_REJECTED) { @@ -3749,9 +3765,15 @@ static void test_appsearch(void) r = MsiGetPropertyA( hpkg, "NOTEPAD", prop, &size ); ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + size = sizeof(prop); + r = MsiGetPropertyA( hpkg, "REGEXPANDVAL", prop, &size ); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); + done: MsiCloseHandle( hpkg ); DeleteFileA(msifile); + RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Winetest_msi"); } static void test_appsearch_complocator(void)

1 0

Francois Gouget : testbot/web: ObjectModel::CGI::Page::initialize() does not take a Collection argument.
by Alexandre Julliard 01 May '14

01 May '14

Module: tools Branch: master Commit: 9bfab74f78f79fd0829af32a702dca166a6594ab URL: http://source.winehq.org/git/tools.git/?a=commit;h=9bfab74f78f79fd0829af32a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:22:25 2014 +0200 testbot/web: ObjectModel::CGI::Page::initialize() does not take a Collection argument. --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index cfe966b..d0ba188 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -196,7 +196,7 @@ sub _initialize { my $self = shift; - $self->SUPER::_initialize(@_, CreateJobs()); + $self->SUPER::_initialize(@_); } sub OutputDot

1 0

Francois Gouget : testbot/WineSendLog: Remove FatalError().
by Alexandre Julliard 01 May '14

01 May '14

Module: tools Branch: master Commit: 4ae0a6dc40acb17291cd5ddeb4b3625a088a86f7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4ae0a6dc40acb17291cd5dde… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:22:59 2014 +0200 testbot/WineSendLog: Remove FatalError(). Its main point was to trace the JobId but the $Job parameter was never used. So the code is clearer without it. --- testbot/bin/WineSendLog.pl | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index b375447..24cdd48 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -42,16 +42,6 @@ use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::StepsTasks; -sub FatalError -{ - my ($ErrMessage, $Job) = @_; - - my $JobKey = defined($Job) ? $Job->GetKey() : "0"; - - LogMsg "$JobKey $ErrMessage"; - - exit 1; -} sub IsBotFailure { @@ -535,17 +525,19 @@ if ($JobId =~ /^(\d+)$/) } else { - FatalError "Invalid JobId $JobId\n"; + LogMsg "Invalid JobId $JobId\n"; + exit(1); } my $Job = CreateJobs()->GetItem($JobId); if (! defined($Job)) { - FatalError "Job $JobId doesn't exist\n"; + LogMsg "Job $JobId doesn't exist\n"; + exit(1); } SendLog($Job); LogMsg "Log for job $JobId sent\n"; -exit; +exit(0);

1 0

Francois Gouget : testbot/CGI: Remove an unused variable.
by Alexandre Julliard 01 May '14

01 May '14

Module: tools Branch: master Commit: 0d41b6cba9042a1d4271cd7ab48666fc345304bc URL: http://source.winehq.org/git/tools.git/?a=commit;h=0d41b6cba9042a1d4271cd7a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:23:30 2014 +0200 testbot/CGI: Remove an unused variable. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index eb859a0..c9dfb04 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -223,7 +223,6 @@ sub GetInputType my $self = shift; my $PropertyDescriptor = shift; - my $Class=$PropertyDescriptor->GetClass(); if ($PropertyDescriptor->GetClass() eq "Enum") { return "select";

1 0

Francois Gouget : testbot/CGI: Fix the CallGenerateError(Div|Popup)() calls in CollectionBlock.
by Alexandre Julliard 01 May '14

01 May '14

Module: tools Branch: master Commit: 21c991065acc16bb51faec0a5e0cc54f52ff9915 URL: http://source.winehq.org/git/tools.git/?a=commit;h=21c991065acc16bb51faec0a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:34:19 2014 +0200 testbot/CGI: Fix the CallGenerateError(Div|Popup)() calls in CollectionBlock. They were passing too many parameters. --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 79c21ef..b663208 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -196,14 +196,14 @@ sub CallGenerateErrorDiv { my $self = shift; - $self->{EnclosingPage}->GenerateErrorDiv($self, @_); + $self->{EnclosingPage}->GenerateErrorDiv(); } sub CallGenerateErrorPopup { my $self = shift; - $self->{EnclosingPage}->GenerateErrorPopup($self, @_); + $self->{EnclosingPage}->GenerateErrorPopup(); } sub CallGenerateFormEnd

1 0

Francois Gouget : testbot/VMs: Fix a couple of indentation bugs.
by Alexandre Julliard 01 May '14

01 May '14

Module: tools Branch: master Commit: 3b7db0fc973933eccb3aa3b1eb9876b401c76f87 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3b7db0fc973933eccb3aa3b1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:35:09 2014 +0200 testbot/VMs: Fix a couple of indentation bugs. --- testbot/lib/WineTestBot/VMs.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 55c7c6c..be95bcc 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -416,11 +416,11 @@ my %StreamData; sub _Stream2Image($$$) { - my ($Stream, $Data, $Size) = @_; - my $Image=$StreamData{$Stream}; - $Image->{Size} += $Size; - $Image->{Bytes} .= $Data; - return $Size; + my ($Stream, $Data, $Size) = @_; + my $Image = $StreamData{$Stream}; + $Image->{Size} += $Size; + $Image->{Bytes} .= $Data; + return $Size; } sub CaptureScreenImage($) @@ -507,7 +507,7 @@ sub Validate if ($self->Type ne "win32" && $self->Type ne "win64" && ($self->Role eq "winetest" || $self->Role eq "extra")) { - return ("Role", "Only win32 and win64 VMs can have a role of '" . $self->Role . "'"); + return ("Role", "Only win32 and win64 VMs can have a role of '" . $self->Role . "'"); } return $self->SUPER::Validate(@_); }

1 0