October 2011 - Wine-Commits

Michael Stefaniuc : oleaut32: Fix some VarCyFrom* tests.
by Alexandre Julliard Oct. 8, 2011

Oct. 8, 2011

Module: wine Branch: master Commit: 38794b4ba0c73cbedbc5bba2d7ace58afdab835a URL: http://source.winehq.org/git/wine.git/?a=commit;h=38794b4ba0c73cbedbc5bba2d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 7 01:36:57 2011 +0200 oleaut32: Fix some VarCyFrom* tests. Due to a broken EXPECTRES macro the EXPECT_OVERFLOW accepts S_OK return values. --- dlls/oleaut32/tests/vartype.c | 8 ++++++-- dlls/oleaut32/vartype.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index b4f0731..e46a9b6 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3720,7 +3720,9 @@ static void test_VarCyFromUI8(void) CONVERT(VarCyFromUI8, 0); EXPECTCY(0); CONVERT(VarCyFromUI8, 1); EXPECTCY(1); CONVERT_I8(VarCyFromUI8, 214748, 1566804068); EXPECTCY64(2147483647ul, 4294951488ul); - CONVERT_I8(VarCyFromUI8, 214748, 1566804069); EXPECT_OVERFLOW; + CONVERT_I8(VarCyFromUI8, 214748, 1566804069); EXPECTCY64(2147483647ul, 4294961488ul); + CONVERT_I8(VarCyFromUI8, 214748, 1566804070); EXPECT_OVERFLOW; + CONVERT_I8(VarCyFromUI8, 214749, 1566804068); EXPECT_OVERFLOW; } static void test_VarCyFromDec(void) @@ -3736,7 +3738,9 @@ static void test_VarCyFromDec(void) CONVERT_DEC(VarCyFromDec,0,0,0,1); EXPECTCY(1); CONVERT_DEC64(VarCyFromDec,0,0,0,214748, 1566804068); EXPECTCY64(2147483647ul, 4294951488ul); - CONVERT_DEC64(VarCyFromDec,0,0,0,214748, 1566804069); EXPECT_OVERFLOW; + CONVERT_DEC64(VarCyFromDec,0,0,0,214748, 1566804069); EXPECTCY64(2147483647ul, 4294961488ul); + CONVERT_DEC64(VarCyFromDec,0,0,0,214748, 1566804070); EXPECT_OVERFLOW; + CONVERT_DEC64(VarCyFromDec,0,0,0,214749, 1566804068); EXPECT_OVERFLOW; CONVERT_DEC(VarCyFromDec,2,0,0,100); EXPECTCY(1); CONVERT_DEC(VarCyFromDec,2,0x80,0,100); EXPECTCY(-1); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 3dd65d8..2ab5438 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -3764,7 +3764,7 @@ HRESULT WINAPI VarCyFromI8(LONG64 llIn, CY* pCyOut) */ HRESULT WINAPI VarCyFromUI8(ULONG64 ullIn, CY* pCyOut) { - if (ullIn >= (I8_MAX/CY_MULTIPLIER)) return DISP_E_OVERFLOW; + if (ullIn > (I8_MAX/CY_MULTIPLIER)) return DISP_E_OVERFLOW; pCyOut->int64 = ullIn * CY_MULTIPLIER; return S_OK; }

1 0

Louis Lenders : netapi32: Add stub for NetScheduleJobEnum.
by Alexandre Julliard Oct. 8, 2011

Oct. 8, 2011

Module: wine Branch: master Commit: a9b473fa83d9436513610a665947a20ab5abb211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9b473fa83d9436513610a665… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Oct 5 20:28:19 2011 +0200 netapi32: Add stub for NetScheduleJobEnum. --- dlls/netapi32/netapi32.c | 10 ++++++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index fafce6b..a8ba41a 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -20,6 +20,7 @@ #include "wine/debug.h" #include "lm.h" +#include "lmat.h" #include "netbios.h" WINE_DEFAULT_DEBUG_CHANNEL(netbios); @@ -236,3 +237,12 @@ NET_API_STATUS WINAPI NetUseEnum(LMSTR server, DWORD level, LPBYTE* bufptr, DWOR entriesread, totalentries, resumehandle); return ERROR_NOT_SUPPORTED; } + +NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR server, LPBYTE* bufptr, DWORD prefmaxsize, LPDWORD entriesread, + LPDWORD totalentries, LPDWORD resumehandle) +{ + FIXME("stub (%s, %p, %d, %p, %p, %p)\n", debugstr_w(server), bufptr, prefmaxsize, entriesread, totalentries, resumehandle); + *entriesread = 0; + *totalentries = 0; + return NERR_Success; +} diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 28d6427..be62a6f 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -168,7 +168,7 @@ @ stub NetRplWkstaSetInfo @ stub NetScheduleJobAdd @ stub NetScheduleJobDel -@ stub NetScheduleJobEnum +@ stdcall NetScheduleJobEnum(wstr ptr long ptr ptr ptr) @ stub NetScheduleJobGetInfo @ stub NetServerComputerNameAdd @ stub NetServerComputerNameDel

1 0

Louis Lenders : include: Add lmat.h.
by Alexandre Julliard Oct. 8, 2011

Oct. 8, 2011

Module: wine Branch: master Commit: 172cea748d99ff81a5d552deca6b94a2f022507b URL: http://source.winehq.org/git/wine.git/?a=commit;h=172cea748d99ff81a5d552dec… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Oct 5 20:16:34 2011 +0200 include: Add lmat.h. --- include/Makefile.in | 1 + include/lmat.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index fc9c38a..c5bea43 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -312,6 +312,7 @@ SRCDIR_INCLUDES = \ lm.h \ lmaccess.h \ lmapibuf.h \ + lmat.h \ lmbrowsr.h \ lmcons.h \ lmerr.h \ diff --git a/include/lmat.h b/include/lmat.h new file mode 100644 index 0000000..f5b6883 --- /dev/null +++ b/include/lmat.h @@ -0,0 +1,34 @@ +/* + * Schedule Service Functions + * + * Copyright (C) 2011 Louis Lenders + * + * 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 + */ + +#ifndef __WINE_LMAT_H +#define __WINE_LMAT_H + +#ifdef __cplusplus +extern "C" { +#endif + +NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_LMAT_H */

1 0

Alexander Nicolaysen Sørnes : session: Some memcached versions require a timeout parameter, even though it is deprecated
by Alexander Nicolaysen Sørnes Oct. 8, 2011

Oct. 8, 2011

Module: appdb Branch: master Commit: 582b3fdb99f231208fb8c0b50e0b5cdee78858eb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=582b3fdb99f231208fb8c0b5… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sat Oct 8 17:11:44 2011 +0200 session: Some memcached versions require a timeout parameter, even though it is deprecated --- include/session.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/session.php b/include/session.php index 8966261..7e05eb5 100644 --- a/include/session.php +++ b/include/session.php @@ -153,7 +153,7 @@ class session // Delete the Session function _destroy ($id) { - return $this->_db->delete($id); + return $this->_db->delete($id, 0); } // Garbage Collector (Not Needed for MemCache)

1 0

Alexander N. Sørnes : User: replace deprecated ereg calls with preg
by Alexander Nicolaysen Sørnes Oct. 8, 2011

Oct. 8, 2011

Module: appdb Branch: master Commit: c628c926fe5e37dda1631aff4d8f56b9401269a4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c628c926fe5e37dda1631aff… Author: Alexander N. Sørnes <alexsornes(a)gmail.com> Date: Tue Sep 27 12:15:54 2011 +0200 User: replace deprecated ereg calls with preg --- include/user.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/user.php b/include/user.php index b7cb192..4ebd925 100644 --- a/include/user.php +++ b/include/user.php @@ -456,7 +456,7 @@ class User { while (strlen($nps)<$pass_len) { $c = chr(mt_rand (0,255)); - if (eregi("^[a-z0-9]$", $c)) $nps = $nps.$c; + if (preg_match("/[a-zA-Z0-9]/", $c)) $nps = $nps.$c; } return ($nps); }

1 0

Alexander N. Sørnes : util: Replace deprecated ereg call with preg
by Alexander Nicolaysen Sørnes Oct. 8, 2011

Oct. 8, 2011

Module: appdb Branch: master Commit: d9439f493ffda75f3562fd7f8a16c5b3b3ff5c1a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d9439f493ffda75f3562fd7f… Author: Alexander N. Sørnes <alexsornes(a)gmail.com> Date: Tue Sep 27 12:23:46 2011 +0200 util: Replace deprecated ereg call with preg --- include/util.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/util.php b/include/util.php index add9963..f8a0678 100644 --- a/include/util.php +++ b/include/util.php @@ -121,10 +121,10 @@ function htmlify_urls($text) // html-ify urls $urlreg = "([a-zA-Z]+://([^\t\r\n ]+))"; - $text = ereg_replace($urlreg, "<a href=\"\\1\"> \\2 </a>", $text); + $text = preg_replace($urlreg, "<a href=\"$0\">$1</a>", $text); $emailreg = "([a-zA-Z0-9_%+.-]+@[^\t\r\n ]+)"; - $text = ereg_replace($emailreg, " <a href='mailto:\\1'>\\1</a>", $text); + $text = preg_replace($emailreg, " <a href='mailto:$0'>$0</a>", $text); $text = str_replace("\n", "<br>", $text);

1 0

Alexander N. Sørnes : util: Remove unused get_xml_tag
by Alexander Nicolaysen Sørnes Oct. 8, 2011

Oct. 8, 2011

Module: appdb Branch: master Commit: 1056281263695c2a79b87db1e50b924e1b1528ce URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1056281263695c2a79b87db1… Author: Alexander N. Sørnes <alexsornes(a)gmail.com> Date: Tue Sep 27 12:24:35 2011 +0200 util: Remove unused get_xml_tag --- include/util.php | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) diff --git a/include/util.php b/include/util.php index f8a0678..2549b04 100644 --- a/include/util.php +++ b/include/util.php @@ -131,24 +131,6 @@ function htmlify_urls($text) return $text; } -// open file and display contents of selected tag -function get_xml_tag ($file, $mode = null) -{ - if ($mode and file_exists($file)) - { - $fp = @fopen($file, "r"); - $data = fread($fp, filesize($file)); - @fclose($fp); - if (eregi("<" . $mode . ">(.*)</" . $mode . ">", $data, $out)) - { - return $out[1]; - } - } - else - { - return null; - } -} /* bugzilla functions */

1 0

Alexandre Julliard : Make the fixed by SHA1 a URL in bug lists.
by Alexandre Julliard Oct. 8, 2011

Oct. 8, 2011

Module: bugzilla Branch: master Commit: a63ecd9f82ba88bb2bd27e1d77a7eb477545a45c URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=a63ecd9f82ba88bb2bd27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 8 16:46:00 2011 +0200 Make the fixed by SHA1 a URL in bug lists. --- template/en/default/list/table.html.tmpl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index 2b57c4a..08fbd5f 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -214,6 +214,9 @@ [% ELSIF column == 'cf_regression_sha1sum' && bug.cf_regression_sha1sum %] <a href="http://source.winehq.org/git/wine.git/commit/[% bug.cf_regression_sha1sum FILTER html %]"> [% bug.cf_regression_sha1sum.truncate(16) FILTER html %]</a> + [% ELSIF column == 'cf_fixedby_sha1sum' && bug.cf_fixedby_sha1sum %] + <a href="http://source.winehq.org/git/wine.git/commit/[% bug.cf_fixedby_sha1sum FILTER html %]"> + [% bug.cf_fixedby_sha1sum.truncate(16) FILTER html %]</a> [% ELSE %] [%- display_value(column, bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%] [% END %]

1 0

Alexandre Julliard : Make the fixed by SHA1 a URL in the edit form.
by Alexandre Julliard Oct. 8, 2011

Oct. 8, 2011

Module: bugzilla Branch: master Commit: c358ec715d4d2b4e1a041df3f9ea7465f5f8947b URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=c358ec715d4d2b4e1a041… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 8 16:45:52 2011 +0200 Make the fixed by SHA1 a URL in the edit form. --- template/en/default/bug/edit.html.tmpl | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 04a0c5f..8576189 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -929,6 +929,11 @@ desc_url = "http://source.winehq.org/git/wine.git/commit/${bug.cf_regression_sha1sum}" editable = bug.check_can_change_field(field.name, 0, 1) value_span = 2 %] + [% ELSIF field.name == 'cf_fixedby_sha1sum' && bug.${field.name} %] + [% PROCESS bug/field.html.tmpl value = bug.${field.name} + desc_url = "http://source.winehq.org/git/wine.git/commit/${bug.cf_fixedby_sha1sum}" + editable = bug.check_can_change_field(field.name, 0, 1) + value_span = 2 %] [% ELSE %] [% PROCESS bug/field.html.tmpl value = bug.${field.name} editable = bug.check_can_change_field(field.name, 0, 1)

1 0

Andrew Talbot : msi: Mark fall-throughs in switch statements.
by Alexandre Julliard Oct. 6, 2011

Oct. 6, 2011

Module: wine Branch: master Commit: 895b48e9ed38c14d9a88eb03cfc61a62296c68d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=895b48e9ed38c14d9a88eb03c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Oct 6 22:29:46 2011 +0100 msi: Mark fall-throughs in switch statements. --- dlls/msi/automation.c | 1 + dlls/msi/database.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 26ed87f..d62c989 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1510,6 +1510,7 @@ static void variant_from_registry_value(VARIANT *pVarResult, DWORD dwType, LPBYT while (idx >= 0 && !szString[idx]) idx--; for (; idx >= 0; idx--) if (!szString[idx]) szString[idx] = '\n'; + /* fall through */ case REG_SZ: V_VT(pVarResult) = VT_BSTR; V_BSTR(pVarResult) = SysAllocStringByteLen((LPCSTR)szString, dwSize); diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 3813f30..1f3ab81 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -658,6 +658,7 @@ static LPWSTR msi_build_createsql_columns(LPWSTR *columns_data, LPWSTR *types, D { case 'l': lstrcpyW(extra, type_notnull); + /* fall through */ case 'L': lstrcatW(extra, localizable); type = type_char; @@ -665,12 +666,14 @@ static LPWSTR msi_build_createsql_columns(LPWSTR *columns_data, LPWSTR *types, D break; case 's': lstrcpyW(extra, type_notnull); + /* fall through */ case 'S': type = type_char; sprintfW(size, size_fmt, ptr); break; case 'i': lstrcpyW(extra, type_notnull); + /* fall through */ case 'I': if (len <= 2) type = type_int; @@ -685,6 +688,7 @@ static LPWSTR msi_build_createsql_columns(LPWSTR *columns_data, LPWSTR *types, D break; case 'v': lstrcpyW(extra, type_notnull); + /* fall through */ case 'V': type = type_object; break;

1 0