wine-commits September 2007

wine-commits@winehq.org

7 participants
787 discussions

Alexander Nicolaysen Sørnes : Use objectManager to display applications
by Chris Morgan 20 Sep '07

20 Sep '07

Module: appdb Branch: master Commit: af87e895357d62a90114ec87186e06bdd933e56c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=af87e895357d62a90114ec87… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Sep 18 14:04:23 2007 +0200 Use objectManager to display applications --- appview.php | 86 +++++++++-------------------------------------- help/appdb_faq.help | 2 +- include/application.php | 57 ++++++++++++++++++++++++++++--- 3 files changed, 69 insertions(+), 76 deletions(-) diff --git a/appview.php b/appview.php index 6b4e3b3..f154840 100644 --- a/appview.php +++ b/appview.php @@ -1,93 +1,39 @@ <?php /** - * Displays an application or a version. + * Previously used to display an application or a version. + * It still does that, but only for compatibility with old links * * Mandatory parameters: * - iAppId, application identifier * OR * - iVersionId, version identifier * - * Optional parameters: - * - sSub, action to perform ("delete", "unqueue", "Submit a new bug link.") - * - iBuglinkId, bug identifier to link a bug with a version - * - * TODO: - * - replace sSub with iAction and replace "delete", "unqueue", etc. with integer constants DELETE, UNQUEUE, etc. - * - move and rename display_bundle into its respective modules - * - replace require_once with require after checking that it won't break anything - */ +*/ -// application environment +// Basic environment require("path.php"); require(BASE."include/incl.php"); -require_once(BASE."include/application.php"); -require_once(BASE."include/appdb.php"); -require_once(BASE."include/vote.php"); -require_once(BASE."include/category.php"); -require_once(BASE."include/maintainer.php"); - -/** - * Displays the SUB apps that belong to this application. - */ -function display_bundle($iAppId) +if(isset($aClean['iAppId']) || isset($aClean['iVersionId'])) // Valid args { - $oApp = new Application($iAppId); - $hResult = query_parameters("SELECT appFamily.appId, appName, description FROM appBundle, appFamily ". - "WHERE appFamily.queued='false' AND bundleId = '?' AND appBundle.appId = appFamily.appId", - $iAppId); - if(!$hResult || query_num_rows($hResult) == 0) - { - return; // do nothing - } - - echo html_frame_start("","98%","",0); - echo "<table width=\"100%\" border=\"0\" cellpadding=\"3\" cellspacing=\"1\">\n\n"; - - echo "<tr class=\"color4\">\n"; - echo " <td>Application Name</td>\n"; - echo " <td>Description</td>\n"; - echo "</tr>\n\n"; - - $c = 0; - while($ob = query_fetch_object($hResult)) - { - $oApp = new application($ob->appId); - //set row color - $bgcolor = ($c % 2 == 0) ? "color0" : "color1"; - - //display row - echo "<tr class=\"$bgcolor\">\n"; - echo " <td>".$oApp->objectMakeLink()."</td>\n"; - echo " <td>".util_trim_description($oApp->sDescription)."</td>\n"; - echo "</tr>\n\n"; + if( isset($aClean['iAppId']) ) // Application + $oObject = new Application($aClean['iAppId']); + else // We want to see a particular version. + $oObject = new Version($aClean['iVersionId']); - $c++; - } + // header + apidb_header($oObject->objectGetCustomTitle("display")); - echo "</table>\n\n"; - echo html_frame_end(); -} + if(isset($aClean['iVersionId'])) + $oObject->display($aClean); + else + $oObject->display(); -/** - * We want to see an application family (=no version). - */ -if( isset($aClean['iAppId']) ) -{ - $oApp = new Application($aClean['iAppId']); - $oApp->display(); -} else if( isset($aClean['iVersionId']) ) // We want to see a particular version. -{ - $oVersion = new Version($aClean['iVersionId']); - - // header - apidb_header("Viewing App: ".version::fullName($oVersion->iVersionId)); - $oVersion->display($aClean); + apidb_footer(); } else { // Oops! Called with no params, bad llamah! util_show_error_page_and_exit('Page Called with No Params!'); } -apidb_footer(); ?> diff --git a/help/appdb_faq.help b/help/appdb_faq.help index 94657ae..3fa60ee 100644 --- a/help/appdb_faq.help +++ b/help/appdb_faq.help @@ -12,7 +12,7 @@ Application Database.</p> <p><b>A:</b> The Application Database is a repository for Windows application compatibility information with Wine. In particular it provides the following information:<br> -(see the <a href="/appview.php?iAppId=296">Visual FoxPro</a> entry for an +(see the <a href="/objectManager.php?sClass=application&iId=296">Visual FoxPro</a> entry for an example)<p> <ul> <li>Whether a given application works at all with Wine.</li> diff --git a/include/application.php b/include/application.php index 57a1345..b259934 100644 --- a/include/application.php +++ b/include/application.php @@ -628,6 +628,56 @@ class Application { $this->iMaintainerRequest = $aValues['iMaintainerRequest']; } + /** + * Displays the SUB apps that belong to this application. + */ + function displayBundle() + { + $hResult = query_parameters("SELECT appFamily.appId, appName, description FROM appBundle, appFamily ". + "WHERE appFamily.queued='false' AND bundleId = '?' AND appBundle.appId = appFamily.appId", + $this->iAppId); + if(!$hResult || query_num_rows($hResult) == 0) + { + return; // do nothing + } + + echo html_frame_start("","98%","",0); + echo "<table width=\"100%\" border=\"0\" cellpadding=\"3\" cellspacing=\"1\">\n\n"; + + echo "<tr class=\"color4\">\n"; + echo " <td>Application Name</td>\n"; + echo " <td>Description</td>\n"; + echo "</tr>\n\n"; + + for($c = 0; $ob = query_fetch_object($hResult); $c++) + { + $oApp = new application($ob->appId); + //set row color + $bgcolor = ($c % 2 == 0) ? "color0" : "color1"; + + //display row + echo "<tr class=\"$bgcolor\">\n"; + echo " <td>".$oApp->objectMakeLink()."</td>\n"; + echo " <td>".util_trim_description($oApp->sDescription)."</td>\n"; + echo "</tr>\n\n"; + } + + echo "</table>\n\n"; + echo html_frame_end(); + } + + function objectGetCustomTitle($sAction) + { + switch($sAction) + { + case "display": + return "Viewing App: ".$this->sName; + + default: + return null; + } + } + /* display this application */ function display() { @@ -635,9 +685,6 @@ class Application { if(!$_SESSION['current']->canViewApplication($this)) util_show_error_page_and_exit("Something went wrong with the application or version id"); - // header - apidb_header("Viewing App - ".$this->sName); - // cat display $oCategory = new Category($this->iCatId); $oCategory->display($this->iAppId); @@ -755,7 +802,7 @@ class Application { Version::displayList($this->aVersionsIds); // display bundle - display_bundle($this->iAppId); + $this->displayBundle(); } function lookup_name($appId) @@ -816,7 +863,7 @@ class Application { function objectMakeUrl() { - $sUrl = APPDB_ROOT."appview.php?iAppId=$this->iAppId"; + $sUrl = APPDB_ROOT."objectManager.php?sClass=application&iId=$this->iAppId"; return $sUrl; }

1 0

Alexander Nicolaysen Sørnes : Use objectManager to add and edit notes
by Chris Morgan 20 Sep '07

20 Sep '07

Module: appdb Branch: master Commit: 72a250b2b062e49eb1e5d5bfff22f11f71db53df URL: http://source.winehq.org/git/appdb.git/?a=commit;h=72a250b2b062e49eb1e5d5bf… Author: Alexander Nicolaysen Sørnes <alexander(a)kurt.alexstyrt> Date: Wed Sep 19 20:12:37 2007 +0200 Use objectManager to add and edit notes --- admin/addAppNote.php | 61 --------------------------------------------- admin/editAppNote.php | 61 --------------------------------------------- include/note.php | 30 +++++++++++++++++++--- include/objectManager.php | 18 ++++++------ include/version.php | 10 +++---- objectManager.php | 4 +- 6 files changed, 41 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=72a250b2b062e49eb1e5…

1 0

Alexander Nicolaysen Sørnes : Use objectManager to display versions
by Chris Morgan 20 Sep '07

20 Sep '07

Module: appdb Branch: master Commit: a6a62a22994e644788f5a87030f8d737959b1d9c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a6a62a22994e644788f5a870… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Sep 18 13:18:50 2007 +0200 Use objectManager to display versions --- appview.php | 2 +- include/objectManager.php | 23 +++++++++++++++++++++++ include/version.php | 16 ++++++++++++++-- objectManager.php | 17 +++++++++++++---- 4 files changed, 51 insertions(+), 7 deletions(-) diff --git a/appview.php b/appview.php index 4ad6e8a..6b4e3b3 100644 --- a/appview.php +++ b/appview.php @@ -79,7 +79,7 @@ if( isset($aClean['iAppId']) ) } else if( isset($aClean['iVersionId']) ) // We want to see a particular version. { $oVersion = new Version($aClean['iVersionId']); - $iTestingId = isset($aClean['iTestingId']) ? $aClean['iTestingId'] : null; + // header apidb_header("Viewing App: ".version::fullName($oVersion->iVersionId)); $oVersion->display($aClean); diff --git a/include/objectManager.php b/include/objectManager.php index 1b2737a..7473998 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -700,6 +700,29 @@ class ObjectManager } } + /* Gets the title of the page to be displayed. Classes can set + the page title depending on the action, or return null to + let objectManager use one, normally the title specified in + the URL. Since this only affects the user interface and not + functionality, objectGetCustomTitle is not a required method. + Why do we need this method? Think of the versions, for instance. + If we were to fetch the name from the URL, that would mean + that changes to the version name would not be reflected in + static URLs, like external links to the AppDB. */ + function get_title($sAction) + { + $oObject = new $this->sClass($this->iId); + $sTitle = ""; + + if(method_exists($oObject, "objectGetCustomTitle")) + $sTitle = $oObject->objectGetCustomTitle($sAction); + + if(!$sTitle) + $sTitle = $this->sTitle; + + return $sTitle; + } + /* Gets the custom variables, if any, from a class depending on the action which is being taken, such as viewing an entry, editing one etc. diff --git a/include/version.php b/include/version.php index 1d14db2..85c723b 100644 --- a/include/version.php +++ b/include/version.php @@ -719,6 +719,18 @@ class version { $this->iObsoleteBy = 0; } + function objectGetCustomTitle($sAction) + { + switch($sAction) + { + case "display": + return "Viewing App: ".version::fullName($this->iVersionId); + + default: + return null; + } + } + function objectGetCustomVars($aClean, $sAction) { switch($sAction) @@ -986,7 +998,7 @@ class version { // show the test results table if($oTest->iTestingId) { - $oTest->ShowVersionsTestingTable($_SERVER['PHP_SELF']."?iVersionId=".$this->iVersionId."&iTestingId=", + $oTest->ShowVersionsTestingTable($this->objectMakeUrl()."&iTestingId=", 5); } if($_SESSION['current']->isLoggedIn()) @@ -1278,7 +1290,7 @@ class version { function objectMakeUrl() { - return APPDB_ROOT."appview.php?iVersionId=$this->iVersionId"; + return APPDB_ROOT."objectManager.php?sClass=version&iId=$this->iVersionId"; } function objectMakeLink() diff --git a/objectManager.php b/objectManager.php index 7052c62..e880a68 100644 --- a/objectManager.php +++ b/objectManager.php @@ -79,12 +79,21 @@ if(isset($aClean['sAction']) && $aClean['sAction'] == "add") if($oObject->iId && $aClean['sAction'] == "moveChildren" && $aClean['iNewId']) $oObject->move_children($aClean['iNewId']); -apidb_header($oObject->sTitle); +$sAction = $aClean['sAction']; + +/* If no action is specified, use a default depending on other parameters */ +if(!$sAction) +{ + if($oObject->iId) + $sAction = "display"; +} + +apidb_header($oObject->get_title($sAction)); /* display a particular element */ if($oObject->iId) { - switch($aClean['sAction']) + switch($sAction) { case "cancel": $oObject->display_table($aClean); /* go back to the queue */ @@ -102,11 +111,11 @@ if($oObject->iId) $oObject->delete_prompt(); break; - default: + case "display": $oObject->view($_SERVER['REQUEST_URI'], $aClean); break; } -} else if (isset($aClean['sAction']) && $aClean['sAction'] == "add") +} else if ($sAction == "add") { $oObject->add_entry($_SERVER['REQUEST_URI'], $sErrors); } else

1 0

Alexander Nicolaysen Sørnes : version: urlencode the sReturnTo value when submitting test results
by Chris Morgan 20 Sep '07

20 Sep '07

Module: appdb Branch: master Commit: 69b14f58c75454c3fb52fe47a69a6f90f667dda1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=69b14f58c75454c3fb52fe47… Author: Alexander Nicolaysen Sørnes <alexander(a)kurt.alexstyrt> Date: Wed Sep 19 20:26:05 2007 +0200 version: urlencode the sReturnTo value when submitting test results --- include/version.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/version.php b/include/version.php index bba4efc..1d14db2 100644 --- a/include/version.php +++ b/include/version.php @@ -994,7 +994,7 @@ class version { echo '<form method=post name=sMessage action=objectManager.php?'. 'sClass=testData_queue&sAction=add&iVersionId='.$this->iVersionId. '&sTitle=Add+Test+Data&sReturnTo='. - $this->objectMakeUrl().'>'."\n"; + urlencode($this->objectMakeUrl()).'>'."\n"; echo "\t".'<input type=submit value="Add Test Data" class="button" />'."\n"; echo '</form>'."\n"; } else

1 0

Alexander Nicolaysen Sørnes : Remove unused code from deleteAny.php
by Chris Morgan 20 Sep '07

20 Sep '07

Module: appdb Branch: master Commit: 1a91a5cdf2f629e195445e03512a2422a82b8a3b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1a91a5cdf2f629e195445e03… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Sep 19 11:42:20 2007 +0200 Remove unused code from deleteAny.php --- admin/deleteAny.php | 28 +++------------------------- 1 files changed, 3 insertions(+), 25 deletions(-) diff --git a/admin/deleteAny.php b/admin/deleteAny.php index 7679675..2f146be 100644 --- a/admin/deleteAny.php +++ b/admin/deleteAny.php @@ -19,40 +19,18 @@ if($aClean['sConfirmed'] != "yes") // could do some Real Damage if someone accidently hits the delete button on the main category :) // // perhaps we can do this with some javascript, popup - + util_show_error_page_and_exit("Not confirmed"); } -if($aClean['sWhat']) +if(isset($aClean['sWhat']) && $aClean['sWhat'] == "category") { - switch($aClean['sWhat']) - { - case "category": // delete category and the apps in it $oCategory = new Category($aClean['iCatId']); if(!$oCategory->delete()) util_show_error_page_and_exit(); else util_redirect_and_exit(BASE."appbrowse.php"); - break; - case "appFamily": - // delete app family & all its versions - $oApp = new Application($aClean['iAppId']); - if(!$oApp->delete()) - util_show_error_page_and_exit(); - else - util_redirect_and_exit(BASE."appbrowse.php"); - break; - case "appVersion": - $oVersion = new Version($aClean['iVersionId']); - if(!$oVersion->delete()) - util_show_error_page_and_exit(); - else - { - $oApp = new application($aClean['iAppId']); - util_redirect_and_exit($oApp->objectMakeUrl()); - } - break; - } } + ?>

1 0

Tijl Coosemans : msvcrt: Resolve symbols clashes with FreeBSD libc.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 6bbd3cacb82e371e23f2695c09fbbcad5f9c509b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bbd3cacb82e371e23f2695c0… Author: Tijl Coosemans <tijl(a)ulyssis.org> Date: Tue Sep 18 16:33:34 2007 +0200 msvcrt: Resolve symbols clashes with FreeBSD libc. --- dlls/msvcrt/dir.c | 6 ++-- dlls/msvcrt/errno.c | 8 +++--- dlls/msvcrt/file.c | 60 +++++++++++++++++++++++----------------------- dlls/msvcrt/misc.c | 2 +- dlls/msvcrt/msvcrt.h | 10 ++++---- dlls/msvcrt/msvcrt.spec | 34 +++++++++++++------------- dlls/msvcrt/process.c | 32 ++++++++++++------------ 7 files changed, 76 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bbd3cacb82e371e23f26…

1 0

Andrew Talbot : dmband: Fix a memory leak.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 8086079b2fb722531c9f718d3c41033b90c8b2ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=8086079b2fb722531c9f718d3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Sep 18 22:58:29 2007 +0100 dmband: Fix a memory leak. --- dlls/dmband/band.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 4cd5b42..067fc38 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -463,6 +463,8 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrument (LPPERSISTSTR hr = IDirectMusicObject_QueryInterface (pObject, &IID_IDirectMusicCollection, (void**) &pCol); if (FAILED(hr)) { ERR(": failed to get IDirectMusicCollection Interface from DMObject\n"); + HeapFree(GetProcessHeap(), 0, pNewInstrument); + return hr; } pNewInstrument->ppReferenceCollection = pCol;

1 0

Clinton Stimpson : riched20: Add test for event masks and notifications.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 77fe86620cfc88b99507af3aad386684ec58077d URL: http://source.winehq.org/git/wine.git/?a=commit;h=77fe86620cfc88b99507af3aa… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Wed Sep 19 00:01:09 2007 -0600 riched20: Add test for event masks and notifications. --- dlls/riched20/tests/editor.c | 67 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index a1407b7..e67c028 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1910,6 +1910,72 @@ static void test_EM_GETTEXTLENGTHEX(void) DestroyWindow(hwnd); } + +/* globals that parent and child access when checking event masks & notifications */ +static HWND eventMaskEditHwnd = 0; +static int queriedEventMask; +static int watchForEventMask = 0; + +/* parent proc that queries the edit's event mask when it gets a WM_COMMAND */ +static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + if(message == WM_COMMAND && (watchForEventMask & (wParam >> 16))) + { + queriedEventMask = SendMessage(eventMaskEditHwnd, EM_GETEVENTMASK, 0, 0); + } + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +/* test event masks in combination with WM_COMMAND */ +static void test_eventMask(void) +{ + HWND parent; + int ret; + WNDCLASSA cls; + const char text[] = "foo bar\n"; + int eventMask; + + /* register class to capture WM_COMMAND */ + cls.style = 0; + cls.lpfnWndProc = ParentMsgCheckProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "EventMaskParentClass"; + if(!RegisterClassA(&cls)) assert(0); + + parent = CreateWindow(cls.lpszClassName, NULL, WS_POPUP|WS_VISIBLE, + 0, 0, 200, 60, NULL, NULL, NULL, NULL); + ok (parent != 0, "Failed to create parent window\n"); + + eventMaskEditHwnd = new_richedit(parent); + ok(eventMaskEditHwnd != 0, "Failed to create edit window\n"); + + eventMask = ENM_CHANGE | ENM_UPDATE; + ret = SendMessage(eventMaskEditHwnd, EM_SETEVENTMASK, 0, (LPARAM) eventMask); + ok(ret == ENM_NONE, "wrong event mask\n"); + ret = SendMessage(eventMaskEditHwnd, EM_GETEVENTMASK, 0, 0); + ok(ret == eventMask, "failed to set event mask\n"); + + /* check what happens when we ask for EN_CHANGE and send WM_SETTEXT */ + queriedEventMask = 0; /* initialize to something other than we expect */ + watchForEventMask = EN_CHANGE; + ret = SendMessage(eventMaskEditHwnd, WM_SETTEXT, 0, (LPARAM) text); + ok(ret == TRUE, "failed to set text\n"); + /* richedit should mask off ENM_CHANGE when it sends an EN_CHANGE + notification in response to WM_SETTEXT */ +todo_wine { + ok(queriedEventMask == (eventMask & ~ENM_CHANGE), + "wrong event mask (0x%x) during WM_COMMAND\n", queriedEventMask); +} + +} + + START_TEST( editor ) { MSG msg; @@ -1944,6 +2010,7 @@ START_TEST( editor ) test_unicode_conversions(); test_EM_GETTEXTLENGTHEX(); test_EM_REPLACESEL(); + test_eventMask(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Dmitry Timoshkov : kernel32: Add a test for rw mapping of a read-only section.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: c6b7f7ccbe4ccb256b378fa632bcb263f39fc4ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6b7f7ccbe4ccb256b378fa63… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Sep 19 20:01:22 2007 +0900 kernel32: Add a test for rw mapping of a read-only section. --- dlls/kernel32/tests/virtual.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 7727c65..5bfa3e9 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -416,6 +416,17 @@ static void test_MapViewOfFile(void) CloseHandle( file ); DeleteFileA( testfile ); + + file = CreateFileMapping( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, "Global\\Foo"); + ok( file != 0, "CreateFileMapping PAGE_READWRITE failed\n" ); + + mapping = OpenFileMapping( FILE_MAP_READ, FALSE, "Global\\Foo" ); + ok( mapping != 0, "OpenFileMapping FILE_MAP_READ failed\n" ); + ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); +todo_wine ok( !ptr, "MapViewOfFile FILE_MAP_WRITE should fail\n" ); + CloseHandle( mapping ); + + CloseHandle( file ); } static DWORD (WINAPI *pNtMapViewOfSection)( HANDLE handle, HANDLE process, PVOID *addr_ptr,

1 0

Maarten Lankhorst : gdi: Implement line-by-line phase of the BiDi algorithm .
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: b6f9a30a5d27e31e6bd27f24f7e1457c6aae334b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f9a30a5d27e31e6bd27f24f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Sep 15 15:21:00 2007 +0200 gdi: Implement line-by-line phase of the BiDi algorithm. --- dlls/gdi32/bidi.c | 237 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 229 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 7a93ec6..5993e92 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -814,6 +814,231 @@ static void resolveImplicit(const WORD * pcls, WORD *plevel, int cch) } } +/* REORDER */ +/*------------------------------------------------------------------------ + Function: resolveLines + + Breaks a paragraph into lines + + Input: Character count + In/Out: Array of characters + Array of line break flags + + Returns the count of characters on the first line + + Note: This function only breaks lines at hard line breaks. Other + line breaks can be passed in. If pbrk[n] is TRUE, then a break + occurs after the character in pszInput[n]. Breaks before the first + character are not allowed. +------------------------------------------------------------------------*/ +static int resolveLines(WCHAR * pszInput, BOOL * pbrk, int cch) +{ + /* skip characters not of type LS */ + int ich = 0; + for(; ich < cch; ich++) + { + if (pszInput[ich] == (WCHAR)'\n' || (pbrk && pbrk[ich])) + { + ich++; + break; + } + } + + return ich; +} + +/*------------------------------------------------------------------------ + Function: resolveWhiteSpace + + Resolves levels for WS and S + Implements rule L1 of the Unicode bidi Algorithm. + + Input: Base embedding level + Character count + Array of direction classes (for one line of text) + + In/Out: Array of embedding levels (for one line of text) + + Note: this should be applied a line at a time. The default driver + code supplied in this file assumes a single line of text; for + a real implementation, cch and the initial pointer values + would have to be adjusted. +------------------------------------------------------------------------*/ +static void resolveWhitespace(int baselevel, const WORD *pcls, WORD *plevel, int cch) +{ + int cchrun = 0; + int oldlevel = baselevel; + + int ich = 0; + for (; ich < cch; ich++) + { + switch(pcls[ich]) + { + default: + cchrun = 0; /* any other character breaks the run */ + break; + case WS: + cchrun++; + break; + + case RLE: + case LRE: + case LRO: + case RLO: + case PDF: + case BN: + plevel[ich] = oldlevel; + cchrun++; + break; + + case S: + case B: + /* reset levels for WS before eot */ + SetDeferredRun(plevel, cchrun, ich, baselevel); + cchrun = 0; + plevel[ich] = baselevel; + break; + } + oldlevel = plevel[ich]; + } + /* reset level before eot */ + SetDeferredRun(plevel, cchrun, ich, baselevel); +} + + +/*------------------------------------------------------------------------ + Functions: reorder/reorderLevel + + Recursively reorders the display string + "From the highest level down, reverse all characters at that level and + higher, down to the lowest odd level" + + Implements rule L2 of the Unicode bidi Algorithm. + + Input: Array of embedding levels + Character count + Flag enabling reversal (set to false by initial caller) + + In/Out: Text to reorder + + Note: levels may exceed 15 resp. 61 on input. + + Rule L3 - reorder combining marks is not implemented here + Rule L4 - glyph mirroring is implemented as a display option below + + Note: this should be applied a line at a time +-------------------------------------------------------------------------*/ +static int reorderLevel(int level, LPWSTR pszText, const WORD* plevel, int cch, BOOL fReverse) +{ + int ich = 0; + + /* true as soon as first odd level encountered */ + fReverse = fReverse || odd(level); + + for (; ich < cch; ich++) + { + if (plevel[ich] < level) + { + break; + } + else if (plevel[ich] > level) + { + ich += reorderLevel(level + 1, pszText + ich, plevel + ich, + cch - ich, fReverse) - 1; + } + } + if (fReverse) + { + reverse(pszText, ich); + } + return ich; +} + +static int reorder(int baselevel, LPWSTR pszText, const WORD* plevel, int cch) +{ + int ich = 0; + + while (ich < cch) + { + ich += reorderLevel(baselevel, pszText + ich, plevel + ich, + cch - ich, FALSE); + } + return ich; +} + +/* DISPLAY OPTIONS */ +/*----------------------------------------------------------------------- + Function: mirror + + Crudely implements rule L4 of the Unicode Bidirectional Algorithm + Demonstrate mirrored brackets, braces and parens + + + Input: Array of levels + Count of characters + + In/Out: Array of characters (should be array of glyph ids) + + Note; + A full implementation would need to substitute mirrored glyphs even + for characters that are not paired (e.g. integral sign). +-----------------------------------------------------------------------*/ +static void mirror(LPWSTR pszInput, const WORD* plevel, int cch) +{ + static int warn_once; + int i; + + for (i = 0; i < cch; ++i) + { + if (!odd(plevel[i])) + continue; + /* This needs the data from http://www.unicode.org/Public/UNIDATA/BidiMirroring.txt */ + if (!warn_once++) + FIXME("stub: mirroring of characters not yet implemented\n"); + break; + } +} + +/*------------------------------------------------------------------------ + Function: BidiLines + + Implements the Line-by-Line phases of the Unicode Bidi Algorithm + + Input: Count of characters + flag whether to mirror + + Inp/Out: Input text + Array of character directions + Array of levels + +------------------------------------------------------------------------*/ +static void BidiLines(int baselevel, WCHAR * pszLine, WORD * pclsLine, WORD * plevelLine, int cchPara, int fMirror, BOOL * pbrk) +{ + int cchLine = 0; + + do + { + /* break lines at LS */ + cchLine = resolveLines(pszLine, pbrk, cchPara); + + /* resolve whitespace */ + resolveWhitespace(baselevel, pclsLine, plevelLine, cchLine); + + if (fMirror) + mirror(pszLine, plevelLine, cchLine); + + /* reorder each line in place */ + reorder(baselevel, pszLine, plevelLine, cchLine); + + pszLine += cchLine; + plevelLine += cchLine; + pbrk += pbrk ? cchLine : 0; + pclsLine += cchLine; + cchPara -= cchLine; + + } while (cchPara); +} + /************************************************************* * BIDI_Reorder */ @@ -915,14 +1140,10 @@ BOOL BIDI_Reorder( /* resolveImplicit */ resolveImplicit(chartype, levels, i); - /* Temporary stub: Just reverse the odd levels */ - for (j = lastgood = 0; j < i; ++j) - if (levels[j] != levels[lastgood]) - { - if (odd(levels[lastgood])) - reverse(lpOutString + done + lastgood, j - 1); - lastgood = j; - } + /* assign directional types again, but for WS, S this time */ + classify(lpOutString + done, chartype, i); + + BidiLines(baselevel, lpOutString + done, chartype, levels, i, !(dwFlags & GCP_SYMSWAPOFF), 0); if (lpOrder) {

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
79
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 September 2007