January 2014 - Wine-commits

Alexander Nicolaysen Sørnes : version_queue: Fix invocation of non-static function
by Alexander Nicolaysen Sørnes 12 Jan '14

12 Jan '14

Module: appdb Branch: master Commit: 7bbc11aba8edb84953ed691b96882db250fc14ef URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7bbc11aba8edb84953ed691b… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:32:51 2014 +0100 version_queue: Fix invocation of non-static function --- include/version_queue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/version_queue.php b/include/version_queue.php index d922adc..0b3f132 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -353,7 +353,7 @@ class version_queue function objectDisplayQueueProcessingHelp() { - version::objectDisplayQueueProcessingHelp(); + $this->oVersion->objectDisplayQueueProcessingHelp(); } function objectMoveChildren($iNewId)

1 0

Alexander Nicolaysen Sørnes : downloadurl: Mark a function as static
by Alexander Nicolaysen Sørnes 12 Jan '14

12 Jan '14

Module: appdb Branch: master Commit: 16b8b1ef8024a76cabb69e64ffe70ee189f6262e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=16b8b1ef8024a76cabb69e64… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:33:27 2014 +0100 downloadurl: Mark a function as static --- include/downloadurl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/downloadurl.php b/include/downloadurl.php index d4d4b03..312c542 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -45,7 +45,7 @@ class downloadurl } /* Display download links for a given version */ - function display($iVersionId) + public static function display($iVersionId) { if(!($hResult = appData::getData($iVersionId, "downloadurl"))) return FALSE;

1 0

Alexander Nicolaysen Sørnes : distribution: Mark some functions as static
by Alexander Nicolaysen Sørnes 12 Jan '14

12 Jan '14

Module: appdb Branch: master Commit: 71ac4f0c838324748f17d8e2a526153318c9a849 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=71ac4f0c838324748f17d8e2… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 15:34:44 2014 +0100 distribution: Mark some functions as static --- include/distribution.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/distribution.php b/include/distribution.php index 354e585..3031d6d 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -504,7 +504,7 @@ class distribution { } /* Get the total number of Distributions in the database */ - function objectGetEntriesCount($sState, $oFilter = null) + public static function objectGetEntriesCount($sState, $oFilter = null) { /* Not implemented */ if($sState == 'rejected') @@ -528,7 +528,7 @@ class distribution { } /* Make a dropdown list of distributions */ - function make_distribution_list($varname, $cvalue) + public static function make_distribution_list($varname, $cvalue) { $sQuery = "SELECT name, distributionId FROM distributions WHERE state = 'accepted' @@ -572,7 +572,7 @@ class distribution { return 'name'; } - function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "name", $bAscending = TRUE, $oFilter = null) + public static function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "name", $bAscending = TRUE, $oFilter = null) { /* Not implemented */ if($sState == 'rejected')

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

Huw Davies : mshtml: Remove a double-Release.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 79054f2fd43d02d14d204a8c30a65f78186a45bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=79054f2fd43d02d14d204a8c3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 20 14:29:34 2013 +0000 mshtml: Remove a double-Release. (cherry picked from commit 72297ebfbb31bd8c5848687e915b785d87e44621) --- dlls/mshtml/nsio.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index da7d930..11d10b1 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1501,9 +1501,6 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, } } - if(This->post_data_stream) - nsIInputStream_Release(This->post_data_stream); - if(aContentLength != -1) FIXME("Unsupported acontentLength = %s\n", wine_dbgstr_longlong(aContentLength));

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

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

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

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

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