wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Alexander Nicolaysen Sørnes : screenshots.php: Prevent use of undefined input variable
by Alexander Nicolaysen Sørnes 12 Jan '14

12 Jan '14

Module: appdb Branch: master Commit: 56ca22a8d4ede8c417ffb29e4cdba02b3ed2fca7 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=56ca22a8d4ede8c417ffb29e… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:17:34 2014 +0100 screenshots.php: Prevent use of undefined input variable --- screenshots.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screenshots.php b/screenshots.php index 160eefe..c077cee 100644 --- a/screenshots.php +++ b/screenshots.php @@ -26,7 +26,7 @@ require_once(BASE."include/application.php"); require_once(BASE."include/version.php"); // we issued a command -if($aClean['sCmd']) +if(array_key_exists('sCmd', $aClean) && $aClean['sCmd']) { // process screenshot upload if($aClean['sCmd'] == "screenshot_upload")

1 0

Alexander Nicolaysen Sørnes : screenshots.php: Prevent use of unitialized variable
by Alexander Nicolaysen Sørnes 12 Jan '14

12 Jan '14

Module: appdb Branch: master Commit: e58d239b999b8526a7ccca181f00201f50c3fe91 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e58d239b999b8526a7ccca18… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sat Jan 11 17:51:04 2014 +0100 screenshots.php: Prevent use of unitialized variable --- screenshots.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/screenshots.php b/screenshots.php index d8ae285..160eefe 100644 --- a/screenshots.php +++ b/screenshots.php @@ -68,6 +68,8 @@ if($hResult && query_num_rows($hResult)) // display thumbnails $c = 1; + + $iCurrentVersionId = 0; // optimization so we don't have to perform as many database queries // only update this variable when $iCurrentVersionId changes

1 0

Alexander Nicolaysen Sørnes : comment: Declare static functions as such
by Alexander Nicolaysen Sørnes 12 Jan '14

12 Jan '14

Module: appdb Branch: master Commit: d91eef59cf1f5c967d4e6896be229867674519c2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d91eef59cf1f5c967d4e6896… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sat Jan 11 17:45:18 2014 +0100 comment: Declare static functions as such --- include/comment.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/comment.php b/include/comment.php index 3532e2c..a364d76 100644 --- a/include/comment.php +++ b/include/comment.php @@ -197,7 +197,7 @@ class Comment { return false; } - function get_comment_count_for_versionid($iVersionId) + public static function get_comment_count_for_versionid($iVersionId) { $sQuery = "SELECT count(*) as cnt from appComments where versionId = '?'"; $hResult = query_parameters($sQuery, $iVersionId); @@ -226,7 +226,7 @@ class Comment { /** * Displays the body of one comment. */ - function view_comment_body($iCommentId) + public static function view_comment_body($iCommentId) { $hResult = Comment::grab_comment($iCommentId); @@ -240,7 +240,7 @@ class Comment { /** * display a single comment (in $oRow) */ - function view_app_comment($oRow, $bShowAppName = false) + public static function view_app_comment($oRow, $bShowAppName = false) { $oComment = new comment(null, $oRow); $oComment->output_comment($bShowAppName); @@ -411,7 +411,7 @@ class Comment { /** * grab single comment for commentId */ - function grab_comment($iCommentId) + public static function grab_comment($iCommentId) { $iCommentId = query_escape_string($iCommentId); @@ -433,7 +433,7 @@ class Comment { * grab comments for appId / versionId * if parentId is not -1 only comments for that thread are returned */ - function grab_comments($iVersionId, $iParentId = null) + public static function grab_comments($iVersionId, $iParentId = null) { /* TODO: remove the logging when we figure out where the */ /* invalid $iVersionId is coming */ @@ -475,7 +475,7 @@ class Comment { * display nested comments * handle is a db result set */ - function do_display_comments_nested($hResult) + public static function do_display_comments_nested($hResult) { while($oRow = query_fetch_object($hResult)) { @@ -490,7 +490,7 @@ class Comment { } } - function display_comments_nested($versionId, $threadId) + public static function display_comments_nested($versionId, $threadId) { $hResult = Comment::grab_comments($versionId, $threadId); Comment::do_display_comments_nested($hResult); @@ -499,7 +499,7 @@ class Comment { /** * Generates the link to show the comment. */ - function comment_link($oRow) + public static function comment_link($oRow) { $sLink = "commentview.php?iAppId={$oRow->appId}&iVersionId=". "{$oRow->versionId}&iThreadId={$oRow->parentId}"; @@ -519,7 +519,7 @@ class Comment { * display threaded comments * handle is a db result set */ - function do_display_comments_threaded($hResult, $is_main) + public static function do_display_comments_threaded($hResult, $is_main) { if (!$is_main) echo "<ul>\n"; @@ -676,7 +676,7 @@ class Comment { return $aObjects; } - function display_comments_threaded($versionId, $threadId = 0) + public static function display_comments_threaded($versionId, $threadId = 0) { $hResult = Comment::grab_comments($versionId, $threadId); @@ -686,7 +686,7 @@ class Comment { /** * display flat comments */ - function display_comments_flat($versionId) + public static function display_comments_flat($versionId) { $hResult = Comment::grab_comments($versionId); if ($hResult) @@ -698,7 +698,7 @@ class Comment { } } - function view_app_comments($versionId, $threadId = 0) + public static function view_app_comments($versionId, $threadId = 0) { global $aClean;

1 0

Alexandre Julliard : Wine release 1.6.2
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: website Branch: master Commit: be7cc027d071cc5aa3a47df7f04e2ccbc58b6495 URL: http://source.winehq.org/git/website.git/?a=commit;h=be7cc027d071cc5aa3a47d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 10 21:45:10 2014 +0100 Wine release 1.6.2 --- news/en/2014011001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2014011001.xml b/news/en/2014011001.xml new file mode 100644 index 0000000..6d4dffb --- /dev/null +++ b/news/en/2014011001.xml @@ -0,0 +1,13 @@ +<news> +<date>January 10, 2014</date> +<title>Wine 1.6.2 Released</title> +<body> + The Wine maintenance release 1.6.2 is now available. + <a href="{$root}/announce/1.6.2">What's new</a> in this release: +<ul> + <li>Color management support updated to liblcms version 2.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.2.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.6.2 : Alexandre Julliard : Release 1.6.2
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: refs/tags/wine-1.6.2 Tag: 2a0860e5e2b30a7d40c3e721374ded8f054a3108 URL: http://source.winehq.org/git/wine.git/?a=tag;h=2a0860e5e2b30a7d40c3e721374d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 10 21:37:29 2014 +0100 Release 1.6.2

1 0

Alexandre Julliard : Release 1.6.2.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 40dc905fac617f06e69fe803a8313fa5e6a953b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40dc905fac617f06e69fe803a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 10 21:37:29 2014 +0100 Release 1.6.2. --- .mailmap | 1 + ANNOUNCE | 603 +++++++++++++++++++++++-------------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 5 files changed, 244 insertions(+), 384 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40dc905fac617f06e69fe…

1 0

Hans Leidekker : mscms: Port to liblcms2.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 5a51c3dfeee562b9342350b3c1ee61cfd8874554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a51c3dfeee562b9342350b3c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 26 13:02:40 2013 +0200 mscms: Port to liblcms2. (cherry picked from commit d40c91262b91f72c44151a1481a77acfe71ba044) --- configure | 70 +++++++++--------- configure.ac | 20 +++--- dlls/mscms/Makefile.in | 4 +- dlls/mscms/handle.c | 14 ++-- dlls/mscms/icc.c | 93 ++++++++++++++---------- dlls/mscms/mscms_main.c | 22 ++---- dlls/mscms/mscms_priv.h | 70 +++--------------- dlls/mscms/profile.c | 184 ++++++++++++++++++----------------------------- dlls/mscms/transform.c | 28 ++++---- include/config.h.in | 9 +-- 10 files changed, 211 insertions(+), 303 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a51c3dfeee562b934235…

1 0

Austin English : dinput: Consistently use GetCurrentTime().
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 9d44303a2963bdcd4a2c6ae107e248f2fdfef9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d44303a2963bdcd4a2c6ae10… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 10 16:45:28 2013 -0800 dinput: Consistently use GetCurrentTime(). (cherry picked from commit bfafb1ffc5a102966025b5b9f3acb81fea5435d1) --- dlls/dinput/joystick_linux.c | 3 +-- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/keyboard.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index d973a84..dc6e9e3 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -689,8 +689,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) } } if (inst_id >= 0) - queue_event(iface, inst_id, - value, jse.time, This->generic.base.dinput->evsequence++); + queue_event(iface, inst_id, value, GetCurrentTime(), This->generic.base.dinput->evsequence++); } } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 5d1cacc..23d8d45 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -873,7 +873,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) } if (inst_id >= 0) queue_event(iface, inst_id, - value, ie.time.tv_usec, This->generic.base.dinput->evsequence++); + value, GetCurrentTime(), This->generic.base.dinput->evsequence++); } } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index e8e7515..a5967d7 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -126,7 +126,7 @@ static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM EnterCriticalSection(&This->base.crit); queue_event(iface, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON, - new_diks, hook->time, This->base.dinput->evsequence++); + new_diks, GetCurrentTime(), This->base.dinput->evsequence++); LeaveCriticalSection(&This->base.crit); return ret;

1 0

Austin English : ntdll: Return success for FSCTL_IS_VOLUME_MOUNTED ioctl.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 18175bbc8524c30d6a6e051bdfc46c817af215ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=18175bbc8524c30d6a6e051bd… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Dec 19 17:47:02 2013 -0800 ntdll: Return success for FSCTL_IS_VOLUME_MOUNTED ioctl. (cherry picked from commit 0dac887f48f2067f90c4556cb5b082345b0ad403) --- dlls/ntdll/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 6e5d2a3..f6b5622 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1491,6 +1491,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc status = RtlImpersonateSelf( SecurityImpersonation ); break; + case FSCTL_IS_VOLUME_MOUNTED: case FSCTL_LOCK_VOLUME: case FSCTL_UNLOCK_VOLUME: FIXME("stub! return success - Unsupported fsctl %x (device=%x access=%x func=%x method=%x)\n",

1 0

Huw Davies : riched20: Ensure the cursors are correctly ordered in the case of a zero (logical) length selection bridging two runs.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 333365369674b7f1f8d00be4d0c6686c235100a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=333365369674b7f1f8d00be4d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 10 11:19:08 2013 +0000 riched20: Ensure the cursors are correctly ordered in the case of a zero (logical) length selection bridging two runs. (cherry picked from commit b0f177b61913b9fac1cf8952582d77576705bad1) --- dlls/riched20/caret.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index fd7034d..4b1fea5 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -56,7 +56,19 @@ int ME_GetSelectionOfs(ME_TextEditor *editor, int *from, int *to) int ME_GetSelection(ME_TextEditor *editor, ME_Cursor **from, ME_Cursor **to) { - if (ME_GetCursorOfs(&editor->pCursors[0]) < ME_GetCursorOfs(&editor->pCursors[1])) + int from_ofs = ME_GetCursorOfs( &editor->pCursors[0] ); + int to_ofs = ME_GetCursorOfs( &editor->pCursors[1] ); + BOOL swap = (from_ofs > to_ofs); + + if (from_ofs == to_ofs) + { + /* If cursor[0] is at the beginning of a run and cursor[1] at the end + of the prev run then we need to swap. */ + if (editor->pCursors[0].nOffset < editor->pCursors[1].nOffset) + swap = TRUE; + } + + if (!swap) { *from = &editor->pCursors[0]; *to = &editor->pCursors[1];

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2014