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

Henri Verbeet : wined3d: Remove some unused code.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 0f161dc10f4df26fbfa12f3b226a713c19a9c00f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f161dc10f4df26fbfa12f3b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 5 09:00:58 2009 +0200 wined3d: Remove some unused code. --- dlls/wined3d/wined3d_private.h | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bb8aae8..e01b5f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -181,9 +181,6 @@ const struct min_lookup minMipLookup_noFilter[WINED3DTEXF_ANISOTROPIC + 1]; const GLenum magLookup[WINED3DTEXF_ANISOTROPIC + 1]; const GLenum magLookup_noFilter[WINED3DTEXF_ANISOTROPIC + 1]; -extern const struct filter_lookup filter_lookup_nofilter; -extern struct filter_lookup filter_lookup; - /* float_16_to_32() and float_32_to_16() (see implementation in * surface_base.c) convert 16 bit floats in the FLOAT16 data type * to standard C floats and vice versa. They do not depend on the encoding @@ -1474,12 +1471,6 @@ extern const IWineD3DVtbl IWineD3D_Vtbl; BOOL InitAdapters(IWineD3DImpl *This); -/* TODO: setup some flags in the registry to enable, disable pbuffer support -(since it will break quite a few things until contexts are managed properly!) */ -extern BOOL pbuffer_support; -/* allocate one pbuffer per surface */ -extern BOOL pbuffer_per_surface; - /* A helper function that dumps a resource list */ void dumpResources(struct list *list); @@ -1794,10 +1785,6 @@ HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface, WINED3DT BOOL basetexture_set_dirty(IWineD3DBaseTexture *iface, BOOL dirty); DWORD basetexture_set_lod(IWineD3DBaseTexture *iface, DWORD new_lod); void basetexture_unload(IWineD3DBaseTexture *iface); -static inline void basetexture_setsrgbcache(IWineD3DBaseTexture *iface, BOOL srgb) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - This->baseTexture.is_srgb = srgb; -} /***************************************************************************** * IWineD3DTexture implementation structure (extends IWineD3DBaseTextureImpl)

1 0

Stefan Dösinger : wined3d: Enable WINED3DFMT_R16G16B16A16_UNORM.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 2858f67a2af5556cb7656045aea5588fd0fc5170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2858f67a2af5556cb7656045a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 4 19:27:04 2009 +0200 wined3d: Enable WINED3DFMT_R16G16B16A16_UNORM. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eb1cf66..8e5e08c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2881,6 +2881,7 @@ static BOOL CheckTextureCapability(struct WineD3DAdapter *adapter, case WINED3DFMT_A2R10G10B10: case WINED3DFMT_R10G10B10A2_UNORM: case WINED3DFMT_R16G16_UNORM: + case WINED3DFMT_R16G16B16A16_UNORM: TRACE_(d3d_caps)("[OK]\n"); return TRUE; @@ -2993,7 +2994,6 @@ static BOOL CheckTextureCapability(struct WineD3DAdapter *adapter, return FALSE; /* Not supported */ - case WINED3DFMT_R16G16B16A16_UNORM: case WINED3DFMT_A8R3G3B2: TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ return FALSE;

1 0

Dmitry Timoshkov : user32/tests: Use symbol charset when creating Marlett font.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 5b90101e2e53116cb9f8a24c456a4be2ef423e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b90101e2e53116cb9f8a24c4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Aug 5 11:03:39 2009 +0900 user32/tests: Use symbol charset when creating Marlett font. --- dlls/user32/tests/combo.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index f7450ea..8108dce 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -94,28 +94,29 @@ static void test_setitemheight(DWORD style) static void test_setfont(DWORD style) { - HWND hCombo = build_combo(style); - HFONT hFont1 = CreateFont(10, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); - HFONT hFont2 = CreateFont(8, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); + HWND hCombo; + HFONT hFont1, hFont2; RECT r; int i; + if (!is_font_installed("Marlett")) + { + skip("Marlett font not available\n"); + return; + } + trace("Style %x\n", style); + + hCombo = build_combo(style); + hFont1 = CreateFont(10, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, SYMBOL_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); + hFont2 = CreateFont(8, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, SYMBOL_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); + GetClientRect(hCombo, &r); expect_rect(r, 0, 0, 100, 24); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); todo_wine expect_rect(r, 5, 5, 105, 105); - if (!is_font_installed("Marlett")) - { - skip("Marlett font not available\n"); - DestroyWindow(hCombo); - DeleteObject(hFont1); - DeleteObject(hFont2); - return; - } - if (font_height(hFont1) == 10 && font_height(hFont2) == 8) { SendMessage(hCombo, WM_SETFONT, (WPARAM)hFont1, FALSE); @@ -140,11 +141,14 @@ static void test_setfont(DWORD style) todo_wine expect_rect(r, 5, 5, 105, 99); } else - skip("Invalid Marlett font heights\n"); + { + ok(0, "Expected Marlett font heights 10/8, got %d/%d\n", + font_height(hFont1), font_height(hFont2)); + } for (i = 1; i < 30; i++) { - HFONT hFont = CreateFont(i, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); + HFONT hFont = CreateFont(i, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, SYMBOL_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); int height = font_height(hFont); SendMessage(hCombo, WM_SETFONT, (WPARAM)hFont, FALSE);

1 0

Stefan Dösinger : wined3d: Preload the correct texture location.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: f3b39d908523ad3641de95e475402ae1436bb4ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3b39d908523ad3641de95e47… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 3 15:37:02 2009 +0200 wined3d: Preload the correct texture location. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b375df4..67a116b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -749,7 +749,7 @@ void surface_internal_preload(IWineD3DSurface *iface, enum WINED3DSRGB srgb) if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&baseTexture) == WINED3D_OK) { IWineD3DBaseTextureImpl *tex_impl = (IWineD3DBaseTextureImpl *) baseTexture; TRACE("Passing to container\n"); - tex_impl->baseTexture.internal_preload(baseTexture, SRGB_RGB); + tex_impl->baseTexture.internal_preload(baseTexture, srgb); IWineD3DBaseTexture_Release(baseTexture); } else { TRACE("(%p) : About to load surface\n", This);

1 0

Stefan Dösinger : wined3d: Only use WINE_normalized_texrect if ARB_texture_np2 is supported.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: f53451ddac712f4fa6f14ef1e680ab637a141753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53451ddac712f4fa6f14ef1e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 2 15:12:26 2009 +0200 wined3d: Only use WINE_normalized_texrect if ARB_texture_np2 is supported. --- dlls/wined3d/directx.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fc8fa61..eb1cf66 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -715,9 +715,12 @@ static void quirk_ati_dx9(struct wined3d_gl_info *gl_info) * fglrx doesn't advertise GL_ARB_texture_non_power_of_two, but it advertises opengl 2.0 which * has this extension promoted to core. The extension loading code sets this extension supported * due to that, so this code works on fglrx as well. */ - TRACE("GL_ARB_texture_non_power_of_two advertised on R500 or earlier card, removing.\n"); - gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; - gl_info->supported[WINE_NORMALIZED_TEXRECT] = TRUE; + if(gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) + { + TRACE("GL_ARB_texture_non_power_of_two advertised on R500 or earlier card, removing.\n"); + gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; + gl_info->supported[WINE_NORMALIZED_TEXRECT] = TRUE; + } /* fglrx has the same structural issues as the one described in quirk_apple_glsl_constants, although * it is generally more efficient. Reserve just 8 constants. */

1 0

Stefan Dösinger : wined3d: ARB clipplane init needs the helper constant.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 2e9362d0fb4f5044a283432af45ff24a0e07f70d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e9362d0fb4f5044a283432af… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 30 21:16:46 2009 +0200 wined3d: ARB clipplane init needs the helper constant. --- dlls/wined3d/arb_program_shader.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c6f4447..9b891a2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -49,11 +49,18 @@ static BOOL need_mova_const(IWineD3DBaseShader *shader, const struct wined3d_gl_ return !GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION); } +/* Returns TRUE if result.clip from GL_NV_vertex_program2 should be used and FALSE otherwise */ +static inline BOOL use_nv_clip(const struct wined3d_gl_info *gl_info) +{ + return GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION); +} + static BOOL need_helper_const(const struct wined3d_gl_info *gl_info) { if (!GL_SUPPORT(NV_VERTEX_PROGRAM) /* Need to init colors. */ - || gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT /* Load the immval offset. */ - || gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) /* Have to init texcoords. */ + || gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT /* Load the immval offset. */ + || gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W /* Have to init texcoords. */ + || (!use_nv_clip(gl_info)) /* Init the clip texcoord */) { return TRUE; } @@ -76,12 +83,6 @@ static inline BOOL ffp_clip_emul(IWineD3DStateBlockImpl *stateblock) return stateblock->lowest_disabled_stage < 7; } -/* Returns TRUE if result.clip from GL_NV_vertex_program2 should be used and FALSE otherwise */ -static inline BOOL use_nv_clip(const struct wined3d_gl_info *gl_info) -{ - return GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION); -} - /* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vshader_constantsF) - 1, * so upload them above that */

1 0

Roderick Colenbrander : opengl32: Add opengl 3.2 extensions.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 5b5401064a5e19c9efb0906020aad6fe76ff201d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5401064a5e19c9efb090602… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Aug 4 23:42:41 2009 +0200 opengl32: Add opengl 3.2 extensions. --- dlls/opengl32/make_opengl | 3 + dlls/opengl32/opengl_ext.c | 480 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 459 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b5401064a5e19c9efb09…

1 0

Alexander Nicolaysen Sørnes : category: Don't use union operator to merge arrays in getOrderedList()
by Alexander Nicolaysen Sørnes 05 Aug '09

05 Aug '09

Module: appdb Branch: master Commit: 304b7e9f0056033d9006bffa74ee85184bc74cd7 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=304b7e9f0056033d9006bffa… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Aug 5 15:00:44 2009 +0200 category: Don't use union operator to merge arrays in getOrderedList() --- include/category.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/category.php b/include/category.php index 87f8c9d..8b7713e 100644 --- a/include/category.php +++ b/include/category.php @@ -171,7 +171,7 @@ class Category { $oCat->sName = 'Main'; $aCats = array($oCat); - $aCats += $oCat->getSubCatList(1); + $aCats = array_merge($aCats, $oCat->getSubCatList(1)); return $aCats; }

1 0

Alexander Nicolaysen Sørnes : category: Move code from appbrowse.php to the category class
by Alexander Nicolaysen Sørnes 05 Aug '09

05 Aug '09

Module: appdb Branch: master Commit: 3f17cf52d3df2d6947a495e53934cd4f9ff65631 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3f17cf52d3df2d6947a495e5… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Wed Aug 5 02:34:02 2009 +0200 category: Move code from appbrowse.php to the category class --- appbrowse.php | 165 +----------------------------------------- include/application.php | 2 +- include/category.php | 177 ++++++++++++++++++++++++++++++++++++++++++++- include/objectManager.php | 13 +++- include/version.php | 2 +- objectManager.php | 2 +- 6 files changed, 193 insertions(+), 168 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=3f17cf52d3df2d6947a4…

1 0

Alexander Nicolaysen Sørnes : Rename ' vendor' to 'developer' on places visible to users
by Alexander Nicolaysen Sørnes 05 Aug '09

05 Aug '09

Module: appdb Branch: master Commit: db87518ddcc1d8ea458421bfb7672e5a32af06c4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=db87518ddcc1d8ea458421bf… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Tue Aug 4 22:08:28 2009 +0200 Rename 'vendor' to 'developer' on places visible to users --- include/application.php | 18 +++++++++--------- include/application_queue.php | 2 +- include/vendor.php | 16 ++++++++-------- include/version.php | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/application.php b/include/application.php index 2a1a704..75a12e2 100644 --- a/include/application.php +++ b/include/application.php @@ -225,7 +225,7 @@ class Application { return false; $oVendorBefore = new Vendor($oApp->iVendorId); $oVendorAfter = new Vendor($this->iVendorId); - $sWhatChanged .= "Vendor was changed from ".$oVendorBefore->sName." to ".$oVendorAfter->sName.".\n\n"; + $sWhatChanged .= "Developer was changed from ".$oVendorBefore->sName." to ".$oVendorAfter->sName.".\n\n"; } if ($this->iCatId && ($this->iCatId!=$oApp->iCatId)) @@ -594,7 +594,7 @@ class Application { if($this->iSubmitterId != $_SESSION['current']->iUserId) { $sVendorHelp .= "The user added a new one; review ". - "it in the vendor form below or ". + "it in the Developer form below or ". "replace it with an existing one."; } else { @@ -605,7 +605,7 @@ class Application { } } // vendor name - echo '<tr valign=top><td class="color0"><b>Vendor</b></td>',"\n"; + echo '<tr valign=top><td class="color0"><b>Developer</b></td>',"\n"; echo "<td>$sVendorHelp</td></tr>\n"; // alt vendor @@ -672,7 +672,7 @@ class Application { // No vendor entered, and nothing in the list is selected if (empty($aValues['sVendorName']) && !$aValues['iAppVendorId']) - $errors .= "<li>Please enter a vendor.</li>\n"; + $errors .= "<li>Please enter a developer.</li>\n"; if (empty($aValues['shAppDescription'])) $errors .= "<li>Please enter a description of your application.</li>\n"; @@ -763,7 +763,7 @@ class Application { $oCategory = new Category($this->iCatId); $oCategory->display($this->iAppId); - // set Vendor + // set developer $oVendor = new Vendor($this->iVendorId); // set URL @@ -777,7 +777,7 @@ class Application { echo ' <table width="250" border="0" cellpadding="3" cellspacing="1">',"\n"; echo " <tr class=color0 valign=top><td width=\"100\"><b>Name</b></td><td width='100%'> ".$this->sName." </td>\n"; - echo " <tr class=\"color1\"><td><b>Vendor</b></td><td> ". + echo " <tr class=\"color1\"><td><b>Developer</b></td><td> ". $oVendor->objectMakeLink()." \n"; echo " </td></tr>\n"; @@ -792,7 +792,7 @@ class Application { $img = Screenshot::get_random_screenshot_img($this->iAppId, null, false); echo "<tr><td align=\"center\" colspan=\"2\">$img</td></tr>\n"; - echo " </table>\n"; /* close of name/vendor/bugs/url table */ + echo " </table>\n"; /* close of name/developer/bugs/url table */ echo " </td></tr>\n"; echo " <tr><td>\n"; @@ -916,7 +916,7 @@ class Application { $oTableRow = new TableRow(); $oTableRow->AddTextCell("Application"); $oTableRow->AddTextCell("Description"); - $oTableRow->AddTextCell("Vendor"); + $oTableRow->AddTextCell("Developer"); $oTableRow->AddTextCell("Submission Date"); $oTableRow->SetClass("color4"); $oTable->SetHeader($oTableRow); @@ -1130,7 +1130,7 @@ class Application { /* Only show submitter when processing queued entries */ $oTableRow->AddTextCell('Submitter'); - $oTableRow->AddSortableTextCell('Vendor', 'vendorName'); + $oTableRow->AddSortableTextCell('Developer', 'vendorName'); $oTableRow->AddSortableTextCell('Application', 'appName'); } return $oTableRow; diff --git a/include/application_queue.php b/include/application_queue.php index a3de51b..44d4901 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -221,7 +221,7 @@ class application_queue are processing an application and the vendor is queued */ if(!$this->oApp->iAppId || $this->oVendor->objectGetState() != 'accepted') { - echo html_frame_start("New Vendor", "90%"); + echo html_frame_start("New Developer", "90%"); $this->oVendor->outputEditor(); echo html_frame_end(); } diff --git a/include/vendor.php b/include/vendor.php index e85966a..6242978 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -4,7 +4,7 @@ /**********************************/ /** - * Vendor class for handling vendors. + * Vendor class for handling developers. */ class Vendor { var $iVendorId; @@ -94,7 +94,7 @@ class Vendor { } else { - addmsg("Error while creating a new vendor.", "red"); + addmsg("Error while creating a new developer.", "red"); return false; } } @@ -208,7 +208,7 @@ class Vendor { // name $oTableRow = new TableRow(); - $oTableCell = new TableCell("Vendor Name:"); + $oTableCell = new TableCell("Developer name:"); $oTableCell->SetAlign("right"); $oTableCell->SetClass("color0"); $oTableCell->SetBold(true); @@ -223,7 +223,7 @@ class Vendor { // Url $oTableRow = new TableRow(); - $oTableCell = new TableCell("Vendor URL:"); + $oTableCell = new TableCell("Developer URL:"); $oTableCell->SetAlign("right"); $oTableCell->SetClass("color0"); $oTableCell->SetBold(true); @@ -372,17 +372,17 @@ class Vendor { function display() { - echo 'Vendor Name: '.$this->sName,"\n"; + echo 'Developer name: '.$this->sName,"\n"; if($this->canEdit()) { echo "[<a href=\"".$_SERVER['PHP_SELF']."?sClass=vendor&sAction=edit&". - "iId=$this->iVendorId&sTitle=Edit%20Vendor\">edit</a>]"; + "iId=$this->iVendorId&sTitle=Edit%20Developer\">edit</a>]"; } echo '<br>',"\n"; if ($this->sWebpage) { - echo 'Vendor URL: <a href="'.$this->sWebpage.'">'. + echo 'Developer URL: <a href="'.$this->sWebpage.'">'. $this->sWebpage.'</a> <br>',"\n"; } @@ -409,7 +409,7 @@ class Vendor { /* Make a URL for viewing the specified vendor */ function objectMakeUrl() { - $oManager = new objectManager("vendor", "View Vendor"); + $oManager = new objectManager("vendor", "View Developer"); return $oManager->makeUrl("view", $this->iVendorId); } diff --git a/include/version.php b/include/version.php index 5afa0b5..bb0dc36 100644 --- a/include/version.php +++ b/include/version.php @@ -1576,7 +1576,7 @@ class version { $oTableRow = new TableRow(); $oTableRow->AddTextCell("Submission Date"); $oTableRow->AddTextCell("Submitter"); - $oTableRow->AddTextCell("Vendor"); + $oTableRow->AddTextCell("Developer"); $oTableRow->AddTextCell("Application"); $oTableRow->AddTextCell("Version"); $oTableRow->AddTextCell("Has Maintainer");

1 0