November 2006 - Wine-commits

appdb/include testData.php
by WineHQ 27 Nov '06

27 Nov '06

ChangeSet ID: 30028 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/11/26 20:32:22 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add basic rating logic checking to testData::CheckOutputEditorInput() to prevent people from saying a running application is garbage and an application that won't install is platinum. Patch: http://cvs.winehq.org/patch.py?id=30028 Old revision New revision Changes Path 1.10 1.11 +9 -1 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.10 appdb/include/testData.php:1.11 --- appdb/include/testData.php:1.10 27 Nov 2006 2:32:22 -0000 +++ appdb/include/testData.php 27 Nov 2006 2:32:22 -0000 @@ -582,7 +582,15 @@ class testData{ if (empty($aValues['sTestedRating'])) $errors .= "<li>Please enter a rating based on how well this application runs.</li>\n"; - + + // Basic checking of rating logic to ensure that the users test results + // are consistent + if (($aValues['sRuns'] != "Yes") && ($aValues['sTestedRating'] != GARBAGE_RATING)) + $errors .= "<li>Applications that do not run should be rated ‘Garbage’.</li>\n"; + + if (($aValues['sInstalls'] == "No") && ($aValues['sTestedRating'] == PLATINUM_RATING)) + $errors .= "<li>An application can only get a Platinum rating if it installs and runs ‘out of the box’.</li>\n"; + return $errors; }

1 0

appdb/help appdb_faq.help
by WineHQ 26 Nov '06

26 Nov '06

ChangeSet ID: 30027 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/11/26 12:17:29 Modified files: help : appdb_faq.help Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add a FAQ entry about the term 'vendor'. Patch: http://cvs.winehq.org/patch.py?id=30027 Old revision New revision Changes Path 1.9 1.10 +5 -0 appdb/help/appdb_faq.help Index: appdb/help/appdb_faq.help diff -u -p appdb/help/appdb_faq.help:1.9 appdb/help/appdb_faq.help:1.10 --- appdb/help/appdb_faq.help:1.9 26 Nov 2006 18:17:29 -0000 +++ appdb/help/appdb_faq.help 26 Nov 2006 18:17:29 -0000 @@ -81,6 +81,11 @@ Simply click on the button you will find <blockquote> A: A super maintainer maintains an application and all it's versions. A maintainer maintains only one specific version of an application. </blockquote> + +Q: What is meant by the term ‘vendor’? +<blockquote> +A: The vendor is the developer of an application. +</blockquote> </ul> If you have more questions you would like to add to our FAQ, please contact us

1 0

appdb/. index.php
by WineHQ 26 Nov '06

26 Nov '06

ChangeSet ID: 30026 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/11/26 12:16:20 Modified files: . : index.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix a typo on the main page. Patch: http://cvs.winehq.org/patch.py?id=30026 Old revision New revision Changes Path 1.39 1.40 +1 -1 appdb/index.php Index: appdb/index.php diff -u -p appdb/index.php:1.39 appdb/index.php:1.40 --- appdb/index.php:1.39 26 Nov 2006 18:16:20 -0000 +++ appdb/index.php 26 Nov 2006 18:16:20 -0000 @@ -47,7 +47,7 @@ if(!$_SESSION['current']->isLoggedIn()) $str_benefits - We'd like to thank your for being a member and being logged in the system. Your help in + We'd like to thank you for being a member and being logged in to the system. Your help in stomping out Wine issues will be greatly appreciated."; }

1 0

appdb/admin moveAppVersion.php
by WineHQ 26 Nov '06

26 Nov '06

ChangeSet ID: 30025 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/11/26 11:15:38 Modified files: admin : moveAppVersion.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix moving versions by having the move version form update the internal version variable and then call the Version::update() method to perform the update. Patch: http://cvs.winehq.org/patch.py?id=30025 Old revision New revision Changes Path 1.9 1.10 +2 -1 appdb/admin/moveAppVersion.php Index: appdb/admin/moveAppVersion.php diff -u -p appdb/admin/moveAppVersion.php:1.9 appdb/admin/moveAppVersion.php:1.10 --- appdb/admin/moveAppVersion.php:1.9 26 Nov 2006 17:15:38 -0000 +++ appdb/admin/moveAppVersion.php 26 Nov 2006 17:15:38 -0000 @@ -22,7 +22,8 @@ if(!empty($aClean['sAction'])) { /* move this version to the given application */ $oVersion = new Version($aClean['iVersionId']); - $oVersion->update(null, null, null, null, $aClean['iAppId']); + $oVersion->iAppId = $aClean['iAppId']; + $oVersion->update(); /* redirect to the application we just moved this version to */ util_redirect_and_exit(apidb_fullurl("appview.php?iAppId=".$aClean['iAppId']));

1 0

appdb/ include/application.php include/categor ...
by WineHQ 25 Nov '06

25 Nov '06

ChangeSet ID: 30024 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/11/25 11:24:46 Modified files: include : application.php category.php distribution.php error_log.php image.php incl.php mail.php maintainer.php monitor.php note.php query.php screenshot.php session.php testData.php user.php version.php unit_test : run_tests.php test_application.php test_image.php test_query.php test_user.php Log message: Unit tests should run with E_ALL so we can detect all errors. Fix dozens of errors that popped up after enabling all errors. Patch: http://cvs.winehq.org/patch.py?id=30024 Old revision New revision Changes Path 1.75 1.76 +18 -12 appdb/include/application.php 1.22 1.23 +7 -5 appdb/include/category.php 1.1 1.2 +10 -7 appdb/include/distribution.php 1.2 1.3 +2 -2 appdb/include/error_log.php 1.7 1.8 +2 -3 appdb/include/image.php 1.37 1.38 +1 -1 appdb/include/incl.php 1.5 1.6 +2 -0 appdb/include/mail.php 1.17 1.18 +13 -10 appdb/include/maintainer.php 1.8 1.9 +7 -5 appdb/include/monitor.php 1.17 1.18 +12 -6 appdb/include/note.php 1.8 1.9 +1 -1 appdb/include/query.php 1.50 1.51 +11 -8 appdb/include/screenshot.php 1.13 1.14 +5 -2 appdb/include/session.php 1.9 1.10 +18 -15 appdb/include/testData.php 1.80 1.81 +35 -21 appdb/include/user.php 1.83 1.84 +28 -18 appdb/include/version.php 1.6 1.7 +1 -1 appdb/unit_test/run_tests.php 1.3 1.4 +3 -3 appdb/unit_test/test_application.php 1.2 1.3 +6 -6 appdb/unit_test/test_image.php 1.1 1.2 +2 -2 appdb/unit_test/test_query.php 1.7 1.8 +9 -3 appdb/unit_test/test_user.php

1 0

lostwages/include winehq.conf
by Alexandre Julliard 24 Nov '06

24 Nov '06

ChangeSet ID: 30023 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2006/11/24 11:01:04 Modified files: include : winehq.conf Log message: Release 0.9.26 Patch: http://cvs.winehq.org/patch.py?id=30023 Old revision New revision Changes Path 1.48 1.49 +1 -1 lostwages/include/winehq.conf Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.48 lostwages/include/winehq.conf:1.49 --- lostwages/include/winehq.conf:1.48 24 Nov 2006 17: 1: 4 -0000 +++ lostwages/include/winehq.conf 24 Nov 2006 17: 1: 4 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.25 +snapshot_date: 0.9.26 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2

1 0

Alexandre Julliard : Release 0.9.26.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: 573595a639f473ae930c8ca7d016103fae4f2da5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=573595a639f473ae930c8ca7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 17:18:04 2006 +0100 Release 0.9.26. --- ANNOUNCE | 829 +++++++++++++++--------------------- ChangeLog | 1418 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 1776 insertions(+), 491 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=573595a639f473ae930c8…

1 0

Tag wine-0.9.26 : Alexandre Julliard : Release 0.9.26
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: refs/tags/wine-0.9.26 Tag: 84aad0c6405f7fa219f1354b560166711ffb8d8b URL: http://source.winehq.org/git/wine.git/?a=tag;h=84aad0c6405f7fa219f1354b5601… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 17:18:06 2006 +0100 Release 0.9.26

1 0

Markus Amsler : d3d: Fix partially applied patch: Remove AddRef from GetDirect3D.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: 3fd8fe089c5337c76c55c4beb74c53576f51776e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd8fe089c5337c76c55c4beb… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Wed Nov 22 13:30:09 2006 +0100 d3d: Fix partially applied patch: Remove AddRef from GetDirect3D. --- dlls/wined3d/device.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3f93aca..e703e91 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2296,7 +2296,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; *ppD3D= This->wineD3D; TRACE("(%p) : wineD3D returning %p\n", This, *ppD3D); - IWineD3D_AddRef(*ppD3D); return WINED3D_OK; }

1 0

Christoph Frick : dinput: Simplify the code that finds the offset of the given linux event.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: 53620bc77b50a87cec767e292b572302f47a6e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=53620bc77b50a87cec767e292… Author: Christoph Frick <frick(a)sc-networks.de> Date: Fri Nov 24 09:19:57 2006 +0100 dinput: Simplify the code that finds the offset of the given linux event. --- dlls/dinput/joystick_linuxinput.c | 88 ++++++++++++------------------------- 1 files changed, 29 insertions(+), 59 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 18588aa..66aa43e 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -154,7 +154,7 @@ static void fake_current_js_state(Joysti static int find_property_offset(JoystickImpl *This, LPCDIPROPHEADER ph); static DWORD map_pov(int event_value, int is_x); static void find_joydevs(void); -static int lxinput_to_djoy2_offset(int ie_type, int ie_code); +static int lxinput_to_user_offset(JoystickImpl *This, int ie_type, int ie_code); static int offset_to_object(JoystickImpl *This, int offset); static void calculate_ids(LPDIDATAFORMAT df); @@ -761,41 +761,42 @@ static int find_property_offset(Joystick /* defines how the linux input system offset mappings into c_dfDIJoystick2 */ static int -lxinput_to_djoy2_offset( int ie_type, int ie_code ) +lxinput_to_user_offset(JoystickImpl *This, int ie_type, int ie_code ) { + int offset = -1; switch (ie_type) { case EV_ABS: switch (ie_code) { - case ABS_X: return 0; - case ABS_Y: return 1; - case ABS_Z: return 2; - case ABS_RX: return 3; - case ABS_RY: return 4; - case ABS_RZ: return 5; - case ABS_THROTTLE: return 6; - case ABS_RUDDER: return 7; - case ABS_HAT0X: - case ABS_HAT0Y: return 8; - case ABS_HAT1X: - case ABS_HAT1Y: return 9; - case ABS_HAT2X: - case ABS_HAT2Y: return 10; - case ABS_HAT3X: - case ABS_HAT3Y: return 11; + case ABS_X: offset = 0; break; + case ABS_Y: offset = 1; break; + case ABS_Z: offset = 2; break; + case ABS_RX: offset = 3; break; + case ABS_RY: offset = 4; break; + case ABS_RZ: offset = 5; break; + case ABS_THROTTLE: offset = 6; break; + case ABS_RUDDER: offset = 7; break; + case ABS_HAT0X: case ABS_HAT0Y: offset = 8; break; + case ABS_HAT1X: case ABS_HAT1Y: offset = 9; break; + case ABS_HAT2X: case ABS_HAT2Y: offset = 10; break; + case ABS_HAT3X: case ABS_HAT3Y: offset = 11; break; + /* XXX when adding new axes here also fix the offset for the buttons bellow */ default: FIXME("Unhandled EV_ABS(0x%02X)\n", ie_code); return -1; } + break; case EV_KEY: - if (ie_code < 128) { - return 12 + ie_code; - } else { + if (ie_code >= 128) { WARN("DX8 does not support more than 128 buttons\n"); + return -1; } + offset = 12 + ie_code; /* XXX */ + break; + default: + FIXME("Unhandled type(0x%02X)\n", ie_type); return -1; } - FIXME("Unhandled type(0x%02X)\n", ie_type); - return -1; + return This->offsets[offset]; } /* convert wine format offset to user format object index */ @@ -888,14 +889,7 @@ static void joy_polldev(JoystickImpl *Th TRACE("(%p) %d -> %d\n", This, ie.code, btn); if (btn&0x80) { btn &= 0x7F; - /* see if there is a mapping */ - offset = lxinput_to_djoy2_offset(ie.type, btn); - if (offset==-1) { - return; - } - /* and see if there is an offset in the df */ - offset = This->offsets[offset]; - if (offset==-1) { + if ((offset = lxinput_to_user_offset(This, ie.type, btn)) == -1) { return; } This->js.rgbButtons[btn] = ie.value?0x80:0x00; @@ -903,14 +897,7 @@ static void joy_polldev(JoystickImpl *Th } break; case EV_ABS: - /* see if there is a mapping */ - offset = lxinput_to_djoy2_offset(ie.type, ie.code); - if (offset==-1) { - return; - } - /* and see if there is an offset in the df */ - offset = This->offsets[offset]; - if (offset==-1) { + if ((offset = lxinput_to_user_offset(This, ie.type, ie.code)) == -1) { return; } switch (ie.code) { @@ -1289,8 +1276,6 @@ static HRESULT WINAPI JoystickAImpl_Enum ddoi.guidType = GUID_RzAxis; break; case ABS_THROTTLE: - ddoi.guidType = GUID_Slider; - break; case ABS_RUDDER: ddoi.guidType = GUID_Slider; break; @@ -1304,12 +1289,7 @@ static HRESULT WINAPI JoystickAImpl_Enum FIXME("unhandled abs axis 0x%02x, ignoring!\n",i); continue; } - user_offset = lxinput_to_djoy2_offset(EV_ABS, i); - if (user_offset == -1) { - continue; - } - user_offset = This->offsets[user_offset]; - if (user_offset == -1) { + if ((user_offset = lxinput_to_user_offset(This, EV_ABS, i)) == -1) { continue; } user_object = offset_to_object(This, user_offset); @@ -1334,12 +1314,7 @@ static HRESULT WINAPI JoystickAImpl_Enum ddoi.guidType = GUID_POV; for (i=0; i<4; i++) { if (test_bit(This->joydev->absbits,ABS_HAT0X+(i<<1)) && test_bit(This->joydev->absbits,ABS_HAT0Y+(i<<1))) { - user_offset = lxinput_to_djoy2_offset(EV_ABS, ABS_HAT0X+i); - if (user_offset == -1) { - continue; - } - user_offset = This->offsets[user_offset]; - if (user_offset == -1) { + if ((user_offset = lxinput_to_user_offset(This, EV_ABS, ABS_HAT0X+i))== -1) { continue; } user_object = offset_to_object(This, user_offset); @@ -1364,12 +1339,7 @@ static HRESULT WINAPI JoystickAImpl_Enum for (i = 0; i < KEY_MAX; i++) { if (!test_bit(This->joydev->keybits,i)) continue; - user_offset = lxinput_to_djoy2_offset(EV_KEY, btncount); - if (user_offset == -1) { - continue; - } - user_offset = This->offsets[user_offset]; - if (user_offset == -1) { + if ((user_offset = lxinput_to_user_offset(This, EV_KEY, btncount)) == -1) { continue; } user_object = offset_to_object(This, user_offset);

1 0