August 2009 - Wine-commits - list.winehq.org

Juan Lang : wcmd: Only execute non-empty commands.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: 9c7ded0973e5956ef8668301e76314b351c7aa6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c7ded0973e5956ef8668301e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 12 18:15:37 2009 -0700 wcmd: Only execute non-empty commands. --- programs/cmd/builtins.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 0e99f52..b544a37 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1061,7 +1061,7 @@ void WCMD_part_execute(CMD_LIST **cmdList, WCHAR *firstcmd, WCHAR *variable, /* FIXME: Only if previous call worked for && or failed for || */ if ((*cmdList)->prevDelim == CMD_ONFAILURE || (*cmdList)->prevDelim != CMD_ONSUCCESS) { - if (processThese) { + if (processThese && (*cmdList)->command) { WCMD_execute ((*cmdList)->command, (*cmdList)->redirects, variable, value, cmdList); }

1 0

Nikolay Sivov : comctl32/listview: Block redrawing entirely after WM_SETREDRAW wParam=FALSE.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: e8846b7c78b008bbd5deb7d9f9c7a7793db32c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8846b7c78b008bbd5deb7d9f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Aug 13 01:38:08 2009 +0400 comctl32/listview: Block redrawing entirely after WM_SETREDRAW wParam=FALSE. --- dlls/comctl32/listview.c | 23 +++++++++++++++++++++-- dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a65d832..36e7b7e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9727,7 +9727,7 @@ static LRESULT LISTVIEW_NotifyFormat(LISTVIEW_INFO *infoPtr, HWND hwndFrom, INT /*** * DESCRIPTION: - * Paints/Repaints the listview control. + * Paints/Repaints the listview control. Internal use. * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure @@ -9766,6 +9766,25 @@ static LRESULT LISTVIEW_Paint(LISTVIEW_INFO *infoPtr, HDC hdc) return 0; } +/*** + * DESCRIPTION: + * Paints/Repaints the listview control, WM_PAINT handler. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * [I] hdc : device context handle + * + * RETURN: + * Zero + */ +static inline LRESULT LISTVIEW_WMPaint(LISTVIEW_INFO *infoPtr, HDC hdc) +{ + TRACE("(hdc=%p)\n", hdc); + + if (!is_redrawing(infoPtr)) return 0; + + return LISTVIEW_Paint(infoPtr, hdc); +} /*** * DESCRIPTION: @@ -10802,7 +10821,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_PrintClient(infoPtr, (HDC)wParam, (DWORD)lParam); case WM_PAINT: - return LISTVIEW_Paint(infoPtr, (HDC)wParam); + return LISTVIEW_WMPaint(infoPtr, (HDC)wParam); case WM_RBUTTONDBLCLK: return LISTVIEW_RButtonDblClk(infoPtr, (WORD)wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 516445c..fb90196 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2834,7 +2834,7 @@ static void test_setredraw(void) InvalidateRect(hwnd, NULL, TRUE); UpdateWindow(hwnd); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, - "redraw after WM_SETREDRAW (FALSE)", TRUE); + "redraw after WM_SETREDRAW (FALSE)", FALSE); ret = SendMessage(hwnd, LVM_SETBKCOLOR, 0, CLR_NONE); expect(TRUE, ret); @@ -2842,7 +2842,7 @@ static void test_setredraw(void) InvalidateRect(hwnd, NULL, TRUE); UpdateWindow(hwnd); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, - "redraw after WM_SETREDRAW (FALSE) with CLR_NONE bkgnd", TRUE); + "redraw after WM_SETREDRAW (FALSE) with CLR_NONE bkgnd", FALSE); /* message isn't forwarded to header */ subclass_header(hwnd);

1 0

Alexandre Julliard : transl: Remove one subdirectory level now that everything is in the php subdir.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: tools Branch: master Commit: 818a216d2846fa2cd236c91bec0883a35e6c231a URL: http://source.winehq.org/git/tools.git/?a=commit;h=818a216d2846fa2cd236c91b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 13 16:02:40 2009 +0200 transl: Remove one subdirectory level now that everything is in the php subdir. --- transl/.gitignore | 10 ++++---- transl/{php => }/Master.sh | 0 transl/README | 22 +++++++++--------- transl/{php => }/config-example | 2 +- transl/{php => }/config.php | 0 transl/{php => }/img/bar0.gif | Bin 112 -> 112 bytes transl/{php => }/img/bar1.gif | Bin 112 -> 112 bytes transl/{php => }/img/bar2.gif | Bin 112 -> 112 bytes transl/{php => }/img/bar3.gif | Bin 111 -> 111 bytes transl/{php => }/img/bar4.gif | Bin 112 -> 112 bytes transl/{php => }/img/bar5.gif | Bin 112 -> 112 bytes transl/{php => }/img/bar6.gif | Bin 112 -> 112 bytes transl/{php => }/img/icon-error.png | Bin 1582 -> 1582 bytes transl/{php => }/img/icon-missing.gif | Bin 292 -> 292 bytes transl/{php => }/img/icon-ok.png | Bin 941 -> 941 bytes transl/{php => }/img/icon-warning.png | Bin 1692 -> 1692 bytes transl/{php => }/img/iconsm-check.png | Bin 177 -> 177 bytes transl/{php => }/img/tree-empty.png | Bin 97 -> 97 bytes transl/{php => }/img/tree-l.png | Bin 113 -> 113 bytes transl/{php => }/img/tree-t.png | Bin 116 -> 116 bytes transl/{php => }/img/tree-vert.png | Bin 114 -> 114 bytes transl/{php => }/index.php | 4 +- transl/{php => }/lang.php | 0 transl/{php => }/lib.php | 2 +- transl/{php => }/lib_res.php | 40 ++++++++++++++++---------------- transl/{php => }/parse_resfiles.php | 0 transl/{php => }/redirect.php | 0 transl/{php => }/resfile.php | 4 +- transl/{php => }/resource.php | 2 +- transl/{php => }/runlog.php | 0 transl/{php => }/style.css | 0 winetest/make-winetest | 2 +- 32 files changed, 44 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=818a216d2846fa2cd236…

1 0

Alexandre Julliard : transl: Get rid of the config file parsing in parse_resfiles.php.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: tools Branch: master Commit: 568a700b1f2f1c720b7713264d2f32c22e102578 URL: http://source.winehq.org/git/tools.git/?a=commit;h=568a700b1f2f1c720b771326… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 13 16:00:06 2009 +0200 transl: Get rid of the config file parsing in parse_resfiles.php. --- transl/php/parse_resfiles.php | 29 +---------------------------- 1 files changed, 1 insertions(+), 28 deletions(-) diff --git a/transl/php/parse_resfiles.php b/transl/php/parse_resfiles.php index c6db13b..4c2feca 100644 --- a/transl/php/parse_resfiles.php +++ b/transl/php/parse_resfiles.php @@ -11,7 +11,6 @@ function resource_name2($resource) function create_resfiles($dir, $check) { global $objdir, $srcdir, $toolsdir, $workdir; - global $wrc; $srcs = ""; $targets = ""; @@ -55,30 +54,6 @@ function create_resfiles($dir, $check) system("$toolsdir/tools/winebuild/winebuild --resources -o $workdir/res/$norm_fn.res $objs"); } -// Parse config file -$CONFIG = array(); -if (file_exists("config")) -{ - $config = fopen("config", "r"); - while ($line = fgets($config, 4096)) - { - if (preg_match("/^([A-Z_]+)=([^\s]+)\s*$/", $line, $m)) - { - $CONFIG[$m[1]] = $m[2]; - } - else if (!preg_match("/(^#|^$)/", $line)) - { - print("checkmakefile.pl: Can't parse config line: $line\n"); - } - } - fclose($config); -} - -$srcdir = isset($CONFIG['SOURCEROOT']) ? $CONFIG['SOURCEROOT'] : ""; -$objdir = isset($CONFIG['BUILDROOT']) ? $CONFIG['BUILDROOT'] : ""; -$toolsdir = isset($CONFIG['WRCROOT']) ? $CONFIG['WRCROOT'] : ""; -$workdir = isset($CONFIG['WORKDIR']) ? $CONFIG['WORKDIR'] : ""; - $script = $argv[0]; array_shift($argv); while (count($argv) != 0 && preg_match("/^-/", $argv[0])) @@ -108,9 +83,7 @@ if ($objdir == "") if ($toolsdir == "") $toolsdir = $objdir; -$wrc = "$toolsdir/tools/wrc/wrc"; - -if ($srcdir == "" || $wrc == "/tools/wrc/wrc" || $workdir == "") +if ($srcdir == "" || $toolsdir == "" || $workdir == "") { die("Config entry for SOURCEROOT, WRCROOT or WORKDIR missing\n"); }

1 0

Paul Vriens : transl: Move parse script to the php directory to overcome include issues.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: tools Branch: master Commit: 34441783af76a889bb2c46f2363e9f4f51e33a2d URL: http://source.winehq.org/git/tools.git/?a=commit;h=34441783af76a889bb2c46f2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Aug 12 21:25:22 2009 +0200 transl: Move parse script to the php directory to overcome include issues. --- transl/.gitignore | 6 +++--- transl/{scripts => php}/Master.sh | 0 transl/{scripts => php}/config-example | 4 ++-- transl/{scripts => php}/parse_resfiles.php | 4 ++-- winetest/make-winetest | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/transl/.gitignore b/transl/.gitignore index 3be2009..bf08c19 100644 --- a/transl/.gitignore +++ b/transl/.gitignore @@ -1,5 +1,5 @@ /work/* -/scripts/config -/scripts/local-posthook.sh -/scripts/local-prehook.sh +/php/config +/php/local-posthook.sh +/php/local-prehook.sh /php/data diff --git a/transl/scripts/Master.sh b/transl/php/Master.sh similarity index 100% rename from transl/scripts/Master.sh rename to transl/php/Master.sh diff --git a/transl/scripts/config-example b/transl/php/config-example similarity index 96% rename from transl/scripts/config-example rename to transl/php/config-example index 2409d13..7b73d8e 100644 --- a/transl/scripts/config-example +++ b/transl/php/config-example @@ -6,12 +6,12 @@ SOURCEROOT=/path/to/wine-src # Path to the Wine build tree (if different from SOURCEROOT) BUILDROOT=/path/to/wine-src -# Path to the Wine tree to take wrc from. Usually the same as SOURCEROOT. +# Path to the Wine tree to take wrc from. Usually the same as SOURCEROOT. WRCROOT=/path/to/wine-src # The directory where to store the generated langs/ and dumps/. Usually the # directory with the PHP scripts. -DESTDIR=../php +DESTDIR=. # Temporary directory for some scratch files. Must be writable. WORKDIR=../work diff --git a/transl/scripts/parse_resfiles.php b/transl/php/parse_resfiles.php similarity index 99% rename from transl/scripts/parse_resfiles.php rename to transl/php/parse_resfiles.php index 41ed364..c6db13b 100644 --- a/transl/scripts/parse_resfiles.php +++ b/transl/php/parse_resfiles.php @@ -1,6 +1,6 @@ <?php -include("../php/lib.php"); -include("../php/lib_res.php"); +require("lib.php"); +require("lib_res.php"); function resource_name2($resource) { diff --git a/winetest/make-winetest b/winetest/make-winetest index 6494a5e..9211c38 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -132,7 +132,7 @@ umask 022 rm -rf data mkdir data data/res - php $toolsdir/transl/scripts/parse_resfiles.php -S ./wine -T ./build-mingw -t ./build-native -w ./data 2>>data/run.log + php $toolsdir/transl/php/parse_resfiles.php -S ./wine -T ./build-mingw -t ./build-native -w ./data 2>>data/run.log mv -f $transldir/data $transldir/data.old mv -f data $transldir/data rm -rf $transldir/data.old

1 0

Alexander Nicolaysen Sørnes : objectManager: Only init filterInfo when needed
by Alexander Nicolaysen Sørnes 13 Aug '09

13 Aug '09

Module: appdb Branch: master Commit: db6d9b5723c4c0e3bd4adaab1cc9a0c7086dfb8c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=db6d9b5723c4c0e3bd4adaab… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 13 15:54:16 2009 +0200 objectManager: Only init filterInfo when needed --- include/objectManager.php | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 182b373..e345020 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -64,8 +64,15 @@ class ObjectManager return $this->sState; } + private function initFilterInfo() + { + $this->oFilters = $this->getOptionalSetting('objectGetFilterInfo', FALSE); + } + public function getFilterInfoFromInput($aClean) { + $this->initFilterInfo(); + if($this->oFilters) $this->oFilters->readInput($aClean); } @@ -132,7 +139,7 @@ class ObjectManager $this->oMultiPage = new MultiPage(FALSE); $this->oTableRow = new OMTableRow(null); $this->sState = 'accepted'; - $this->oFilters = $this->getOptionalSetting('objectGetFilterInfo', FALSE); + $this->oFilters = null; // We only fill this when needed, as it can be quite slow // initialize the common responses array $this->aCommonResponses = array();

1 0

Alexander Nicolaysen Sørnes : screenshot : Show delete link in 'Browse Screenshots' for users with permission
by Alexander Nicolaysen Sørnes 13 Aug '09

13 Aug '09

Module: appdb Branch: master Commit: 5a9e078df620ab1f29ace3f9f6f78ced726c762b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5a9e078df620ab1f29ace3f9… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 13 15:58:14 2009 +0200 screenshot: Show delete link in 'Browse Screenshots' for users with permission --- include/screenshot.php | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index 91378fc..a48b375 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -659,6 +659,12 @@ class screenshot echo "<br>[".$oVersion->objectMakeLink()."]"; + if($oScreenshot->canEdit()) + { + $oM = new objectManager('screenshot'); + echo '<br />[<a href="'.$oM->makeUrl('delete', $oScreenshot->objectGetId(), 'Delete Screenshot').'">Delete</a>]'; + } + echo "</div></td>\n"; // end row if counter of 3 if($i % 3 == 0)

1 0

Alexander Nicolaysen Sørnes : Manage Screenshots: Correctly call objectGetEntriesCount(), fix SQL accordingly
by Alexander Nicolaysen Sørnes 13 Aug '09

13 Aug '09

Module: appdb Branch: master Commit: 3668b29e8e1550958a5379b04a738e51e2fbb8b0 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3668b29e8e1550958a5379b0… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 13 15:00:34 2009 +0200 Manage Screenshots: Correctly call objectGetEntriesCount(), fix SQL accordingly --- admin/adminScreenshots.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/adminScreenshots.php b/admin/adminScreenshots.php index 85e6669..96e3759 100644 --- a/admin/adminScreenshots.php +++ b/admin/adminScreenshots.php @@ -59,8 +59,7 @@ $ItemsPerPage = isset($aClean['iItemsPerPage']) ? $aClean['iItemsPerPage'] : 6; $currentPage = isset($aClean['iPage']) ? $aClean['iPage'] : 1; $ItemsPerPage = min($ItemsPerPage,100); -$totalPages = ceil(appData::objectGetEntriesCount("all", false, - "screenshot")/$ItemsPerPage); +$totalPages = ceil(screenshot::objectGetEntriesCount('accepted')/$ItemsPerPage); $currentPage = min($currentPage,$totalPages); $offset = (($currentPage-1) * $ItemsPerPage); @@ -96,7 +95,8 @@ echo "</center>"; /* query for all of the Screenshots in assending order */ $Ids = query_parameters("SELECT * from appData - WHERE type = 'screenshot' + WHERE type = 'screenshot' + AND state = 'accepted' ORDER BY id ASC LIMIT ?, ?", $offset, $ItemsPerPage); $c = 1; echo "<div align=center><table><tr>\n";

1 0

Dylan Smith : richedit: Use ME_Cursor instead of offsets for ME_GetTextRange.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: c92bb271b769b627fa551f41d0b3e450adc1c03c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c92bb271b769b627fa551f41d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Aug 12 09:06:18 2009 -0400 richedit: Use ME_Cursor instead of offsets for ME_GetTextRange. --- dlls/riched20/editor.c | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b866a13..e9da20b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1916,18 +1916,16 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText) } static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, - int nStart, int nLen, BOOL unicode) + const ME_Cursor *start, int nLen, BOOL unicode) { - ME_Cursor start; if (!strText) return 0; - ME_CursorFromCharOfs(editor, nStart, &start); if (unicode) { - return ME_GetTextW(editor, strText, INT_MAX, &start, nLen, 0); + return ME_GetTextW(editor, strText, INT_MAX, start, nLen, 0); } else { int nChars; WCHAR *p = ALLOC_N_OBJ(WCHAR, nLen+1); if (!p) return 0; - nChars = ME_GetTextW(editor, p, nLen, &start, nLen, 0); + nChars = ME_GetTextW(editor, p, nLen, start, nLen, 0); WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)strText, nLen+1, NULL, NULL); FREE_OBJ(p); @@ -3566,10 +3564,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return ME_GetTextEx(editor, (GETTEXTEX*)wParam, lParam); case EM_GETSELTEXT: { - int from, to; - ME_GetSelectionOfs(editor, &from, &to); + int nFrom, nTo, nStartCur = ME_GetSelectionOfs(editor, &nFrom, &nTo); + ME_Cursor *from = &editor->pCursors[nStartCur]; return ME_GetTextRange(editor, (WCHAR *)lParam, from, - to - from, unicode); + nTo - nFrom, unicode); } case EM_GETSCROLLPOS: { @@ -3586,17 +3584,20 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_GETTEXTRANGE: { TEXTRANGEW *rng = (TEXTRANGEW *)lParam; - int start = rng->chrg.cpMin; - int end = rng->chrg.cpMax; + ME_Cursor start; + int nStart = rng->chrg.cpMin; + int nEnd = rng->chrg.cpMax; int textlength = ME_GetTextLength(editor); - TRACE("EM_GETTEXTRANGE min=%d max=%d unicode=%d emul1.0=%d length=%d\n", - rng->chrg.cpMin, rng->chrg.cpMax, unicode, - editor->bEmulateVersion10, ME_GetTextLength(editor)); - if (start < 0) return 0; - if ((start == 0 && end == -1) || end > textlength) - end = textlength; - if (start >= end) return 0; - return ME_GetTextRange(editor, rng->lpstrText, start, end - start, unicode); + + TRACE("EM_GETTEXTRANGE min=%d max=%d unicode=%d textlength=%d\n", + rng->chrg.cpMin, rng->chrg.cpMax, unicode, textlength); + if (nStart < 0) return 0; + if ((nStart == 0 && nEnd == -1) || nEnd > textlength) + nEnd = textlength; + if (nStart >= nEnd) return 0; + + ME_CursorFromCharOfs(editor, nStart, &start); + return ME_GetTextRange(editor, rng->lpstrText, &start, nEnd - nStart, unicode); } case EM_GETLINE: {

1 0

Dylan Smith : richedit: Use ME_Cursor instead of offsets for ME_SetCharFormat.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 2da0d8e933b087a3edb87a18e5a44dd4d336603b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da0d8e933b087a3edb87a18e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Aug 12 09:06:13 2009 -0400 richedit: Use ME_Cursor instead of offsets for ME_SetCharFormat. The test that succeeded from this change was as a result of allowing the end of the character format change be specified using NULL as the rest of the text. Before, the end paragraph run at the end of the text was not being set for this case, when all the text was supposed to have its character format changed. --- dlls/riched20/editor.c | 12 ++++-- dlls/riched20/editor.h | 2 +- dlls/riched20/para.c | 17 +++++--- dlls/riched20/run.c | 86 +++++++++++++++++++++++++++--------------- dlls/riched20/tests/editor.c | 2 +- dlls/riched20/undo.c | 5 ++- 6 files changed, 80 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2da0d8e933b087a3edb87…

1 0