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

Juan Lang : ws2_32: Add debug support for IPv6 addresses.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: wine Branch: master Commit: 90c52c0180e2223fafb93b796751f738bd120c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90c52c0180e2223fafb93b796… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 3 09:33:02 2009 -0700 ws2_32: Add debug support for IPv6 addresses. --- dlls/ws2_32/socket.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2eb5837..a601521 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -170,10 +170,27 @@ union generic_unix_sockaddr static inline const char *debugstr_sockaddr( const struct WS_sockaddr *a ) { if (!a) return "(nil)"; - return wine_dbg_sprintf("{ family %d, address %s, port %d }", - ((const struct sockaddr_in *)a)->sin_family, - inet_ntoa(((const struct sockaddr_in *)a)->sin_addr), - ntohs(((const struct sockaddr_in *)a)->sin_port)); + switch (a->sa_family) + { + case WS_AF_INET: + return wine_dbg_sprintf("{ family AF_INET, address %s, port %d }", + inet_ntoa(((const struct sockaddr_in *)a)->sin_addr), + ntohs(((const struct sockaddr_in *)a)->sin_port)); + case WS_AF_INET6: + { + char buf[46]; + const char *p; + struct WS_sockaddr_in6 *sin = (struct WS_sockaddr_in6 *)a; + + p = WS_inet_ntop( WS_AF_INET6, &sin->sin6_addr, buf, sizeof(buf) ); + if (!p) + p = "(unknown IPv6 address)"; + return wine_dbg_sprintf("{ family AF_INET6, address %s, port %d }", + p, ntohs(sin->sin6_port)); + } + default: + return wine_dbg_sprintf("{ family %d }", a->sa_family); + } } /* HANDLE<->SOCKET conversion (SOCKET is UINT_PTR). */

1 0

Alexander Nicolaysen Sørnes : mshtml: Update Norwegian Bokmål translation.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: wine Branch: master Commit: 1cbef167a5c11e92dcda49bf0c72250badf60f05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cbef167a5c11e92dcda49bf0… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 30 17:28:13 2009 +0200 mshtml: Update Norwegian Bokmål translation. --- dlls/mshtml/No.rc | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/No.rc b/dlls/mshtml/No.rc index 4e24ece..83989a0 100644 --- a/dlls/mshtml/No.rc +++ b/dlls/mshtml/No.rc @@ -1,7 +1,7 @@ /* - * Norwegian Bokm�l language support + * Norwegian Bokmål language support * - * Copyright 2005-2007 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2009 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,11 +20,13 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE { - IDS_HTMLDISABLED "HTML-tegning er for �yeblikket deaktivert." + IDS_HTMLDISABLED "HTML-tegning er for øyeblikket deaktivert." IDS_HTMLDOCUMENT "HTML-dokument" IDS_DOWNLOADING "Laster ned..." IDS_INSTALLING "Installerer..." @@ -35,8 +37,8 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Installere Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Dette programmer pr�ver � vise en HTML-side. Wine trenger Gecko " \ - "(Mozillas HTML-motor) for � vise denne siden. Velg �Installer� hvis " \ + LTEXT "Dette programmer prøver å vise en HTML-side. Wine trenger Gecko " \ + "(Mozillas HTML-motor) for å vise denne siden. Velg «Installer» hvis " \ "du vil at Wine skal laste ned og installere Gecko automatisk.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP @@ -56,3 +58,14 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +}

1 0

Vincent Povirk : gdiplus: Ignore the graphics transforms in GdipGetRegionBounds.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: wine Branch: master Commit: c71853cda54f7442ee4baa13018340ce9ab3b7be URL: http://source.winehq.org/git/wine.git/?a=commit;h=c71853cda54f7442ee4baa130… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 3 10:09:07 2009 -0500 gdiplus: Ignore the graphics transforms in GdipGetRegionBounds. --- dlls/gdiplus/region.c | 3 ++- dlls/gdiplus/tests/graphics.c | 2 +- dlls/gdiplus/tests/region.c | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 8fe5e26..039e789 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -657,7 +657,8 @@ GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *region, GpGraphics *graphics, if(!region || !graphics || !rect) return InvalidParameter; - status = GdipGetRegionHRgn(region, graphics, &hrgn); + /* Contrary to MSDN, native ignores the graphics transform. */ + status = GdipGetRegionHRgn(region, NULL, &hrgn); if(status != Ok) return status; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 6fd49f7..fbd9a48 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -459,7 +459,7 @@ static void test_BeginContainer2(void) status = GdipEndContainer(graphics, cont2); GdipGetClipBounds(graphics, &clip); - todo_wine ok(fabs(defClip[0] - clip.X) < 0.0001 && + ok(fabs(defClip[0] - clip.X) < 0.0001 && fabs(defClip[1] - clip.Y) < 0.0001 && fabs(defClip[2] - clip.Width) < 0.0001 && fabs(defClip[3] - clip.Height) < 0.0001, diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index d48554c..8b1b04e 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -1176,6 +1176,29 @@ static void test_getbounds(void) ok(rectf.Width == 100.0, "Expected width = 0.0, got %.2f\n", rectf.Width); ok(rectf.Height == 100.0, "Expected height = 0.0, got %.2f\n", rectf.Height); + /* the world and page transforms are ignored */ + GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderPrepend); + GdipSetPageUnit(graphics, UnitInch); + GdipSetPageScale(graphics, 2.0); + status = GdipGetRegionBounds(region, graphics, &rectf); + ok(status == Ok, "status %08x\n", status); + ok(rectf.X == 10.0, "Expected X = 0.0, got %.2f\n", rectf.X); + ok(rectf.Y == 0.0, "Expected Y = 0.0, got %.2f\n", rectf.Y); + ok(rectf.Width == 100.0, "Expected width = 0.0, got %.2f\n", rectf.Width); + + rectf.X = 10.0; rectf.Y = 0.0; + rectf.Width = rectf.Height = 100.0; + status = GdipCombineRegionRect(region, &rectf, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + rectf.X = rectf.Y = 0.0; + rectf.Height = rectf.Width = 0.0; + status = GdipGetRegionBounds(region, graphics, &rectf); + ok(status == Ok, "status %08x\n", status); + ok(rectf.X == 10.0, "Expected X = 0.0, got %.2f\n", rectf.X); + ok(rectf.Y == 0.0, "Expected Y = 0.0, got %.2f\n", rectf.Y); + ok(rectf.Width == 100.0, "Expected width = 0.0, got %.2f\n", rectf.Width); + ok(rectf.Height == 100.0, "Expected height = 0.0, got %.2f\n", rectf.Height); + status = GdipDeleteRegion(region); ok(status == Ok, "status %08x\n", status); status = GdipDeleteGraphics(graphics);

1 0

Vincent Povirk : gdiplus: Fix rectangles of horizontal and vertical gradients.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: wine Branch: master Commit: ee74501102c530cda4d6bbd83a1bf44d6036f5a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee74501102c530cda4d6bbd83… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 3 09:02:49 2009 -0500 gdiplus: Fix rectangles of horizontal and vertical gradients. --- dlls/gdiplus/brush.c | 11 +++++++++++ dlls/gdiplus/tests/brush.c | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index bb19e43..be4298e 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -261,6 +261,17 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint, (*line)->rect.Width = fabs(startpoint->X - endpoint->X); (*line)->rect.Height = fabs(startpoint->Y - endpoint->Y); + if ((*line)->rect.Width == 0) + { + (*line)->rect.X -= (*line)->rect.Height / 2.0f; + (*line)->rect.Width = (*line)->rect.Height; + } + else if ((*line)->rect.Height == 0) + { + (*line)->rect.Y -= (*line)->rect.Width / 2.0f; + (*line)->rect.Height = (*line)->rect.Width; + } + (*line)->blendcount = 1; (*line)->blendfac = GdipAlloc(sizeof(REAL)); (*line)->blendpos = GdipAlloc(sizeof(REAL)); diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 7993d60..e0515f4 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -310,9 +310,9 @@ static void test_gradientgetrect(void) memset(&rectf, 0, sizeof(GpRectF)); status = GdipGetLineRect(brush, &rectf); expect(Ok, status); - todo_wine expectf(-5.0, rectf.X); + expectf(-5.0, rectf.X); expectf(0.0, rectf.Y); - todo_wine expectf(10.0, rectf.Width); + expectf(10.0, rectf.Width); expectf(10.0, rectf.Height); status = GdipDeleteBrush((GpBrush*)brush); /* horizontal gradient */ @@ -324,9 +324,9 @@ static void test_gradientgetrect(void) status = GdipGetLineRect(brush, &rectf); expect(Ok, status); expectf(0.0, rectf.X); - todo_wine expectf(-5.0, rectf.Y); + expectf(-5.0, rectf.Y); expectf(10.0, rectf.Width); - todo_wine expectf(10.0, rectf.Height); + expectf(10.0, rectf.Height); status = GdipDeleteBrush((GpBrush*)brush); /* slope = -1 */ pt1.X = pt1.Y = 0.0;

1 0

Alexandre Julliard : mountmgr: Increment the volume refcount in functions that return a volume.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: wine Branch: master Commit: b05ebca6181b26b0b1de9ed3a61560ae1807b30a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05ebca6181b26b0b1de9ed3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 4 12:36:34 2009 +0200 mountmgr: Increment the volume refcount in functions that return a volume. --- dlls/mountmgr.sys/device.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 03b1f89..d17f878 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -310,9 +310,10 @@ static void delete_disk_device( struct disk_device *device ) } /* grab another reference to a volume */ -static unsigned int grab_volume( struct volume *volume ) +static struct volume *grab_volume( struct volume *volume ) { - return ++volume->ref; + volume->ref++; + return volume; } /* release a volume and delete the corresponding disk device when refcount is 0 */ @@ -320,9 +321,9 @@ static unsigned int release_volume( struct volume *volume ) { unsigned int ret = --volume->ref; - TRACE( "%s udi %s count now %u\n", debugstr_guid(&volume->guid), debugstr_a(volume->udi), ret ); if (!ret) { + TRACE( "%s udi %s\n", debugstr_guid(&volume->guid), debugstr_a(volume->udi) ); assert( !volume->udi ); list_remove( &volume->entry ); if (volume->mount) delete_mount_point( volume->mount ); @@ -362,7 +363,7 @@ static NTSTATUS create_volume( const char *udi, enum device_type type, struct vo { if (udi) set_volume_udi( volume, udi ); list_add_tail( &volumes_list, &volume->entry ); - *volume_ret = volume; + *volume_ret = grab_volume( volume ); } else RtlFreeHeap( GetProcessHeap(), 0, volume ); @@ -383,14 +384,13 @@ static NTSTATUS create_dos_device( struct volume *volume, const char *udi, int l if (volume) { if (udi) set_volume_udi( volume, udi ); - drive->volume = volume; + drive->volume = grab_volume( volume ); status = STATUS_SUCCESS; } else status = create_volume( udi, type, &drive->volume ); if (status == STATUS_SUCCESS) { - grab_volume( drive->volume ); list_add_tail( &drives_list, &drive->entry ); *drive_ret = drive; } @@ -428,7 +428,7 @@ static struct volume *find_matching_volume( const char *udi, const char *device, if (mount_point && disk_device->unix_mount && strcmp( mount_point, disk_device->unix_mount )) continue; TRACE( "found matching volume %s for device %s mount %s type %u\n", debugstr_guid(&volume->guid), debugstr_a(device), debugstr_a(mount_point), type ); - return volume; + return grab_volume( volume ); } return NULL; } @@ -649,6 +649,7 @@ static void create_drive_devices(void) RtlFreeHeap( GetProcessHeap(), 0, link ); RtlFreeHeap( GetProcessHeap(), 0, device ); } + if (volume) release_volume( volume ); } RegCloseKey( drives_key ); RtlFreeHeap( GetProcessHeap(), 0, path ); @@ -674,6 +675,7 @@ NTSTATUS add_volume( const char *udi, const char *device, const char *mount_poin found: if (!status) status = set_volume_info( volume, NULL, device, mount_point, type, guid ); + if (volume) release_volume( volume ); LeaveCriticalSection( &device_section ); return status; } @@ -746,7 +748,7 @@ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, found: if (!guid && !volume) guid = get_default_uuid( letter ); - if (!volume) volume = drive->volume; + if (!volume) volume = grab_volume( drive->volume ); set_drive_info( drive, letter, volume ); p[0] = 'a' + drive->drive; p[2] = 0; @@ -776,6 +778,7 @@ found: if (udi) notify = drive->drive; done: + if (volume) release_volume( volume ); LeaveCriticalSection( &device_section ); RtlFreeHeap( GetProcessHeap(), 0, path ); if (notify != -1) send_notify( notify, DBT_DEVICEARRIVAL );

1 0

Alexander Nicolaysen Sørnes : objectManager: State number of matches when viewing tables
by Alexander Nicolaysen Sørnes 04 Aug '09

04 Aug '09

Module: appdb Branch: master Commit: fa2d3dc05aa8eb2a622010e962c8615350eb20cc URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fa2d3dc05aa8eb2a622010e9… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Aug 4 16:52:02 2009 +0200 objectManager: State number of matches when viewing tables --- include/objectManager.php | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 6b324f7..8f4ce34 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -342,6 +342,8 @@ class ObjectManager $sQueued = $this->getQueueString($this->getIsQueue(), $this->sState == 'rejected'); + $this->showNumberOfResults($oObject); + /* Should we let the class draw its own custom table? */ if(method_exists($this->sClass, 'objectWantCustomDraw') && $oObject->objectWantCustomDraw('table', $sQueued)) @@ -1643,6 +1645,21 @@ class ObjectManager } } + /* Shows how many entries we are displaying */ + private function showNumberOfResults($oObject) + { + $iTotalEntries = $oObject->objectGetEntriesCount($this->sState, $this->oFilters); + if($this->oMultiPage->isEnabled()) + { + $iShowingEntryFrom = $this->oMultiPage->iLowerLimit + 1; + $iShowingEntryTo = min($this->oMultiPage->iLowerLimit + $this->oMultiPage->iItemsPerPage, $iTotalEntries); + echo "Showing entry $iShowingEntryFrom to $iShowingEntryTo of $iTotalEntries<br /><br />\n"; + } else + { + echo "Showing $iTotalEntries entries"; + } + } + private function handleMultiPageControls($aClean, $bItemsPerPageSelector = TRUE) { /* Display multi-page browsing controls (prev, next etc.) if applicable. @@ -1796,6 +1813,11 @@ class MultiPage $this->iLowerLimit = $iLowerLimit; } + public function isEnabled() + { + return $this->bEnabled; + } + function getDataFromInput($aClean) { if(isset($aClean['iItemsPerPage']) && isset($aClean['iPage']))

1 0

Jacek Caban : winegecko.php: Added 1.0.0 release.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: tools Branch: master Commit: 23d986fa8d070d0ec58badb9619176f04afe5654 URL: http://source.winehq.org/git/tools.git/?a=commit;h=23d986fa8d070d0ec58badb9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 4 14:04:33 2009 +0200 winegecko.php: Added 1.0.0 release. --- winegecko.php | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/winegecko.php b/winegecko.php index 141c815..c33ea70 100644 --- a/winegecko.php +++ b/winegecko.php @@ -12,10 +12,14 @@ * Copyright (c) 2006 Jonathan Ernst */ -// Chek if a specific version was passed -if(isset($_GET['v'])) +// Check if a specific version was passed +if(isset($_GET['v'])) { $sVersion = $_GET['v']; + if(isset($_GET['arch'])) + $sVersion = $sVersion.'-'.$_GET['arch']; +} + // Name of the file $sFileName = "wine_gecko".($sVersion?'-'.$sVersion:'').".cab"; @@ -25,11 +29,16 @@ $aFileSizes = array( '0.0.1'=>5219822, '0.1.0'=>5746895, '0.9.0'=>7806669, - '0.9.1'=>7806837 + '0.9.1'=>7806837, + '1.0.0-x86'=>8119486 ); // Exact size of the file: -$iFileSize = ($sVersion?$aFileSizes[$sVersion]:$aFileSizes['default']); +$iFileSize = $aFileSizes[$sVersion ? $sVersion : 'default']; +if(!$iFileSize) { + header("HTTP/1.0 404 Not Found"); + exit; +} // List of additional locations (commonly used locations are already in download.inc.php) $aList = array();

1 0

Paul Vriens : transl: Group languages with the same translation percentage visually together.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: tools Branch: master Commit: 350a8117569dfa90e1203cef647bede6f03dca83 URL: http://source.winehq.org/git/tools.git/?a=commit;h=350a8117569dfa90e1203cef… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 31 20:15:38 2009 +0200 transl: Group languages with the same translation percentage visually together. --- transl/php/index.php | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/transl/php/index.php b/transl/php/index.php index 5a1772e..77c3e4b 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -94,7 +94,10 @@ for ($i = 0; $i < count($transl); $i++) if ($translated != $transl[$j]['translated']) break; $serial = $j - $i; - echo "<td rowspan=\"$serial\" style=\"text-align: center\">$nr"; + if ($serial > 1) + echo "<td rowspan=\"$serial\" style=\"text-align: center; border-right: thin solid #601919;\">$nr"; + else + echo "<td rowspan=\"$serial\" style=\"text-align: center\">$nr"; echo "</td>"; } echo "<td>".gen_lang_a($langid).$name."</a></td>";

1 0

Paul Vriens : transl: Move a function to lib_res for re-use.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: tools Branch: master Commit: cb5ab25ba9f41587abafc97b7bac748dacbe0ba5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cb5ab25ba9f41587abafc97b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 31 20:12:03 2009 +0200 transl: Move a function to lib_res for re-use. --- transl/php/lib_res.php | 25 +++++++++++++++++++++++++ transl/php/resource.php | 26 -------------------------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/transl/php/lib_res.php b/transl/php/lib_res.php index a7af016..21ba98d 100644 --- a/transl/php/lib_res.php +++ b/transl/php/lib_res.php @@ -253,6 +253,31 @@ function diff_sequences(&$res1, $count1, &$res2, $count2, $compare_method) return array_reverse($out); } +function load_resource(&$resources, $type, $id, $langid, &$res) +{ + $file_type = $type & 0xff; /* wrc adds 0x100 for *EX resource*/ + $resdata = $resources->loadResource($file_type, $id, get_lang_binid($langid)); + if (!$resdata) + die("Resource not found in *.res file\n"); + switch ($type) + { + case 4: /* RT_MENU */ + $res = new MenuResource($resdata[0], $resdata[1]); + return TRUE; + case 5: /* RT_DIALOG */ + case 261: /* res_dialogex */ + $res = new DialogResource($resdata[0], $resdata[1]); + return TRUE; + case 6: /* RT_STRING*/ + $res = new StringTable($resdata[0], $resdata[1], $id); + return TRUE; + case 11: /* RT_MESSAGETABLE */ + $res = new MessageTable($resdata[0], $resdata[1], $id); + return TRUE; + default: + die("Unhandled resource type $type"); + } +} class ResFile { diff --git a/transl/php/resource.php b/transl/php/resource.php index 4f51879..db9e3ac 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -25,32 +25,6 @@ $compare = isset($_REQUEST['compare']); <?php -function load_resource(&$resources, $type, $id, $langid, &$res) -{ - $file_type = $type & 0xff; /* wrc adds 0x100 for *EX resource*/ - $resdata = $resources->loadResource($file_type, $id, get_lang_binid($langid)); - if (!$resdata) - die("Resource not found in *.res file\n"); - switch ($type) - { - case 4: /* RT_MENU */ - $res = new MenuResource($resdata[0], $resdata[1]); - return TRUE; - case 5: /* RT_DIALOG */ - case 261: /* res_dialogex */ - $res = new DialogResource($resdata[0], $resdata[1]); - return TRUE; - case 6: /* RT_STRING*/ - $res = new StringTable($resdata[0], $resdata[1], $id); - return TRUE; - case 11: /* RT_MESSAGETABLE */ - $res = new MessageTable($resdata[0], $resdata[1], $id); - return TRUE; - default: - die("Unhandled resource type $type"); - } -} - $resources = new ResFile(get_res_path($resfile)); $res_lang = update_lang_from_resfile($lang, $resfile);

1 0

Paul Vriens : transl: Only add a margin to real text boxes, not to tables.
by Alexandre Julliard 04 Aug '09

04 Aug '09

Module: tools Branch: master Commit: 2ff5b8d7d7320861a68dac297bc2ba5312a54a57 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2ff5b8d7d7320861a68dac29… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 31 19:59:30 2009 +0200 transl: Only add a margin to real text boxes, not to tables. --- transl/php/lang.php | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/transl/php/lang.php b/transl/php/lang.php index 9f36d0c..304783d 100644 --- a/transl/php/lang.php +++ b/transl/php/lang.php @@ -58,7 +58,9 @@ function dump_table($table) { global $lang; if (count($table) == 0) { + echo "<div class=\"contents\">"; echo "none"; + echo "</div>"; return; } echo "<table>\n"; @@ -95,29 +97,25 @@ parse_file($lang); $translations = count($partial) + count($transl); if (preg_match("/:00/", $lang) && $translations == 0) { + echo "<div class=\"contents\">"; show_sublangs($lang); + echo "</div>"; exit(); } ?> <div class="group"> <h2>Partially translated modules</h2> -<div class="contents"> <?php dump_table($partial) ?> </div> -</div> <div class="group"> <h2>Modules not translated</h2> -<div class="contents"> <?php dump_table($notransl) ?> </div> -</div> <div class="group"> <h2>Fully translated modules</h2> -<div class="contents"> <?php dump_table($transl) ?> </div> -</div> </div> </html>

1 0