June 2008 - Wine-commits - list.winehq.org

Alexander Nicolaysen Sørnes : db_filter_ui: Fix a case where input wasn't escaped
by Chris Morgan 19 Jun '08

19 Jun '08

Module: appdb Branch: master Commit: 3069294936229011adbe64de5a52afe5f6c9ed0a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3069294936229011adbe64de… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jun 18 10:27:04 2008 +0200 db_filter_ui: Fix a case where input wasn't escaped --- include/db_filter_ui.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/db_filter_ui.php b/include/db_filter_ui.php index a2644ce..7fe459d 100644 --- a/include/db_filter_ui.php +++ b/include/db_filter_ui.php @@ -420,7 +420,7 @@ class FilterInterface { $sColumn = $this->escapeChars($oOption->getColumn()); $i = sizeof($aReturn); - $sData = $aClean["s{$sColumn}Data"]; + $sData = query_escape_string($aClean["s{$sColumn}Data"]); $iOp = $aClean["i{$sColumn}Op"];

1 0

Alexander Nicolaysen Sørnes : browse apps: Allow filtering by Wine version
by Chris Morgan 19 Jun '08

19 Jun '08

Module: appdb Branch: master Commit: d98e38e3059bab7c8d5eee20a7bf1248892e71ba URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d98e38e3059bab7c8d5eee20… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jun 16 10:53:49 2008 +0200 browse apps: Allow filtering by Wine version --- include/application.php | 2 ++ include/util.php | 28 +++++++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/include/application.php b/include/application.php index 44bc97b..6baeeaa 100644 --- a/include/application.php +++ b/include/application.php @@ -1031,8 +1031,10 @@ class Application { } $aLicenses = version::getLicenses(); + $aWineVersions = get_bugzilla_versions(); $oFilter->AddFilterInfo('appVersion.rating', 'Rating', array(FILTER_EQUALS), FILTER_VALUES_ENUM, array('Platinum', 'Gold', 'Silver', 'Bronze', 'Garbage')); + $oFilter->AddFilterInfo('appVersion.ratingRelease', 'Tested Wine version', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aWineVersions); $oFilter->AddFilterInfo('appFamily.catId', 'Category', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aCatIds, $aCatNames); $oFilter->AddFilterInfo('appVersion.license', 'License', array(FILTER_EQUALS), FILTER_VALUES_ENUM, $aLicenses); $oFilter->AddFilterInfo('appFamily.appName', 'Name', array(FILTER_CONTAINS, FILTER_STARTS_WITH, FILTER_ENDS_WITH), FILTER_VALUES_NORMAL); diff --git a/include/util.php b/include/util.php index 55af094..fe80fc3 100644 --- a/include/util.php +++ b/include/util.php @@ -163,28 +163,38 @@ function get_xml_tag ($file, $mode = null) } /* bugzilla functions */ -// $sVarname - name of the selection array that this function will output -// this is the name to use to retrieve the selection on the form postback -// $sSelectedValue - the currently selected entry -// returns a string that contains the version list output -function make_bugzilla_version_list($sVarname, $sSelectedValue) -{ - $sStr = ""; +// Returns an array containg the Wine versions stored in our Bugzilla DB +function get_bugzilla_versions() +{ + $aVersions = array(); $sTable = BUGZILLA_DB.".versions"; $sWhere = "WHERE product_id=".BUGZILLA_PRODUCT_ID; $sQuery = "SELECT value FROM $sTable $sWhere ORDER BY id desc limit 6"; $hResult = query_bugzilladb($sQuery); - if(!$hResult) return; + if(!$hResult) return $aVersions; // empty // build the list of versions - $aVersions = array(); while(list($sValue) = query_fetch_row($hResult)) { $aVersions[] = $sValue; } + return $aVersions; +} + +// $sVarname - name of the selection array that this function will output +// this is the name to use to retrieve the selection on the form postback +// $sSelectedValue - the currently selected entry +// returns a string that contains the version list output +function make_bugzilla_version_list($sVarname, $sSelectedValue) +{ + $sStr = ""; + + // build the list of versions + $aVersions = get_bugzilla_versions(); + // build the selection array $sStr.= "<select name='$sVarname'>\n"; $sStr.= "<option value=\"\">Choose ...</option>\n";

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/source /git/website
by Jeremy Newman 18 Jun '08

18 Jun '08

Module: website Branch: master Commit: 26b610e2bb35ea93739be8dfd0a9afc7631eeeda URL: http://source.winehq.org/git/website.git/?a=commit;h=26b610e2bb35ea93739be8… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jun 18 17:11:19 2008 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Marcus Meissner : website: updated SUSE entry to match current versions
by Jeremy Newman 18 Jun '08

18 Jun '08

Module: website Branch: master Commit: 1259f47aa69d0ddba7020c4e7c3223b834744849 URL: http://source.winehq.org/git/website.git/?a=commit;h=1259f47aa69d0ddba7020c… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Jun 18 14:18:20 2008 +0100 website: updated SUSE entry to match current versions --- templates/en/download.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 4fdcb9d..6df9b7d 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -39,7 +39,7 @@ for post-installation instructions. <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE</a> - release binary and source .rpms and daily snapshot RPMs for SUSE Linux 10.0, 10.1, openSUSE 10.2 and 10.3. + release binary and source .rpms and daily snapshot RPMs for SUSE Linux 10.1, openSUSE 10.2, 10.3 and 11.0. Old versions available on <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td>

1 0

Dmitry Timoshkov : winmm: Clear the fccType in mmioDescend for a not RIFF/ LIST case.
by Alexandre Julliard 18 Jun '08

18 Jun '08

Module: wine Branch: master Commit: efcdb202b2c37f1696f196955c6bbf4a523da4c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efcdb202b2c37f1696f196955… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 18 18:53:05 2008 +0900 winmm: Clear the fccType in mmioDescend for a not RIFF/LIST case. --- dlls/winmm/mmio.c | 3 +++ dlls/winmm/tests/mmio.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index d0a4f49..42f1d32 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -1224,7 +1224,10 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, if (lpck->ckid == FOURCC_RIFF || lpck->ckid == FOURCC_LIST) mmioSeek(hmmio, lpck->dwDataOffset + sizeof(DWORD), SEEK_SET); else + { mmioSeek(hmmio, lpck->dwDataOffset, SEEK_SET); + lpck->fccType = 0; + } TRACE("lpck: ckid=%.4s, cksize=%d, dwDataOffset=%d fccType=%08X (%.4s)!\n", (LPSTR)&lpck->ckid, lpck->cksize, lpck->dwDataOffset, lpck->fccType, srchType?(LPSTR)&lpck->fccType:""); diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 856e6e0..5fac90a 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -32,7 +32,7 @@ static DWORD RIFF_buf[] = { FOURCC_RIFF, 7*sizeof(DWORD)+sizeof(MainAVIHeader), mmioFOURCC('A','V','I',' '), FOURCC_LIST, sizeof(DWORD)+sizeof(MMCKINFO)+sizeof(MainAVIHeader), listtypeAVIHEADER, - ckidAVIMAINHDR, sizeof(MainAVIHeader), + ckidAVIMAINHDR, sizeof(MainAVIHeader), 0xdeadbeef, 0xdeadbeef, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

1 0

Dmitry Timoshkov : gdi32: Add a test for combined mapping mode/ world transform changes.
by Alexandre Julliard 18 Jun '08

18 Jun '08

Module: wine Branch: master Commit: e976877fa5de037afbd74b7383448072bb036969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e976877fa5de037afbd74b738… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 18 18:52:33 2008 +0900 gdi32: Add a test for combined mapping mode/world transform changes. --- dlls/gdi32/tests/mapping.c | 145 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 143 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 91e487a..210f783 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -2,6 +2,7 @@ * Unit tests for mapping functions * * Copyright (c) 2005 Huw Davies + * Copyright (c) 2008 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,6 +29,146 @@ #include "winuser.h" #include "winerror.h" +#define rough_match(got, expected) (abs((got) - (expected)) <= 5) + +#define expect_LPtoDP(_hdc, _x, _y) \ +{ \ + POINT _pt = { 1000, 1000 }; \ + LPtoDP(_hdc, &_pt, 1); \ + ok(rough_match(_pt.x, _x), "expected x %d, got %d\n", (_x), _pt.x); \ + ok(rough_match(_pt.y, _y), "expected y %d, got %d\n", (_y), _pt.y); \ +} + +#define expect_world_trasform(_hdc, _em11, _em22) \ +{ \ + BOOL _ret; \ + XFORM _xform; \ + SetLastError(0xdeadbeef); \ + _ret = GetWorldTransform(_hdc, &_xform); \ + if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) \ + { \ + ok(_ret, "GetWorldTransform error %u\n", GetLastError()); \ + ok(_xform.eM11 == (_em11), "expected %f, got %f\n", (_em11), _xform.eM11); \ + ok(_xform.eM12 == 0.0, "expected 0.0, got %f\n", _xform.eM12); \ + ok(_xform.eM21 == 0.0, "expected 0.0, got %f\n", _xform.eM21); \ + ok(_xform.eM22 == (_em22), "expected %f, got %f\n", (_em22), _xform.eM22); \ + ok(_xform.eDx == 0.0, "expected 0.0, got %f\n", _xform.eDx); \ + ok(_xform.eDy == 0.0, "expected 0.0, got %f\n", _xform.eDy); \ + } \ +} + +#define expect_dc_ext(_func, _hdc, _cx, _cy) \ +{ \ + BOOL _ret; \ + SIZE _size; \ + SetLastError(0xdeadbeef); \ + _ret = _func(_hdc, &_size); \ + ok(_ret, #_func " error %u\n", GetLastError()); \ + ok(_size.cx == (_cx), "expected cx %d, got %d\n", (_cx), _size.cx); \ + ok(_size.cy == (_cy), "expected cy %d, got %d\n", (_cy), _size.cy); \ +} + +#define expect_viewport_ext(_hdc, _cx, _cy) expect_dc_ext(GetViewportExtEx, _hdc, _cx, _cy) +#define expect_window_ext(_hdc, _cx, _cy) expect_dc_ext(GetWindowExtEx, _hdc, _cx, _cy) + +static void test_world_transform(void) +{ + BOOL is_win9x; + HDC hdc; + INT ret, size_cx, size_cy, res_x, res_y; + XFORM xform; + + SetLastError(0xdeadbeef); + GetWorldTransform(0, NULL); + is_win9x = GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; + + hdc = CreateCompatibleDC(0); + + size_cx = GetDeviceCaps(hdc, HORZSIZE); + size_cy = GetDeviceCaps(hdc, VERTSIZE); + res_x = GetDeviceCaps(hdc, HORZRES); + res_y = GetDeviceCaps(hdc, VERTRES); + trace("dc size %d x %d, resolution %d x %d\n", size_cx, size_cy, res_x, res_y); + + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_trasform(hdc, 1.0, 1.0); + expect_LPtoDP(hdc, 1000, 1000); + + SetLastError(0xdeadbeef); + ret = SetMapMode(hdc, MM_LOMETRIC); + ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); + + if (is_win9x) + { + expect_viewport_ext(hdc, 96, 96); + expect_window_ext(hdc, 254, -254); + } + else + { + expect_viewport_ext(hdc, res_x, -res_y); + expect_window_ext(hdc, size_cx * 10, size_cy * 10); + } + expect_world_trasform(hdc, 1.0, 1.0); + expect_LPtoDP(hdc, MulDiv(1000 / 10, res_x, size_cx), -MulDiv(1000 / 10, res_y, size_cy)); + + SetLastError(0xdeadbeef); + ret = SetMapMode(hdc, MM_TEXT); + ok(ret == MM_LOMETRIC, "expected MM_LOMETRIC, got %d\n", ret); + + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_trasform(hdc, 1.0, 1.0); + expect_LPtoDP(hdc, 1000, 1000); + + ret = SetGraphicsMode(hdc, GM_ADVANCED); + if (!ret) + { + DeleteDC(hdc); + skip("GM_ADVANCED is not supported on this platform\n"); + return; + } + + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_trasform(hdc, 1.0, 1.0); + expect_LPtoDP(hdc, 1000, 1000); + + xform.eM11 = 20.0f; + xform.eM12 = 0.0f; + xform.eM21 = 0.0f; + xform.eM22 = 20.0f; + xform.eDx = 0.0f; + xform.eDy = 0.0f; + SetLastError(0xdeadbeef); + ret = SetWorldTransform(hdc, &xform); + ok(ret, "SetWorldTransform error %u\n", GetLastError()); + + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_trasform(hdc, 20.0, 20.0); + expect_LPtoDP(hdc, 20000, 20000); + + SetLastError(0xdeadbeef); + ret = SetMapMode(hdc, MM_LOMETRIC); + ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); + + expect_viewport_ext(hdc, res_x, -res_y); + expect_window_ext(hdc, size_cx * 10, size_cy * 10); + expect_world_trasform(hdc, 20.0, 20.0); + expect_LPtoDP(hdc, MulDiv(1000 * 2, res_x, size_cx), -MulDiv(1000 * 2, res_y, size_cy)); + + SetLastError(0xdeadbeef); + ret = SetMapMode(hdc, MM_TEXT); + ok(ret == MM_LOMETRIC, "expected MM_LOMETRIC, got %d\n", ret); + + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_trasform(hdc, 20.0, 20.0); + expect_LPtoDP(hdc, 20000, 20000); + + DeleteDC(hdc); +} static void test_modify_world_transform(void) { @@ -38,6 +179,7 @@ static void test_modify_world_transform(void) if(!ret) /* running in win9x so quit */ { ReleaseDC(0, hdc); + skip("GM_ADVANCED is not supported on this platform\n"); return; } @@ -53,8 +195,6 @@ static void test_modify_world_transform(void) ReleaseDC(0, hdc); } -#define rough_match(got, expected) ((got >= expected - 2) && (got <= expected + 2)) - static void test_SetWindowExt(HDC hdc, LONG cx, LONG cy, LONG expected_vp_cx, LONG expected_vp_cy) { SIZE windowExt, viewportExt; @@ -158,5 +298,6 @@ static void test_isotropic_mapping(void) START_TEST(mapping) { test_modify_world_transform(); + test_world_transform(); test_isotropic_mapping(); }

1 0

Dmitry Timoshkov : winmm: Add the tests for mmioOpen and mmioSetBuffer, make them pass under Wine.
by Alexandre Julliard 18 Jun '08

18 Jun '08

Module: wine Branch: master Commit: 64cbea525bdca2a986774fe6d88adcb865654513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64cbea525bdca2a986774fe6d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jun 18 18:53:48 2008 +0900 winmm: Add the tests for mmioOpen and mmioSetBuffer, make them pass under Wine. --- dlls/winmm/mmio.c | 17 ++-- dlls/winmm/tests/mmio.c | 264 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 264 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64cbea525bdca2a986774…

1 0

Francois Gouget : A couple of spelling fixes.
by Alexandre Julliard 18 Jun '08

18 Jun '08

Module: wine Branch: master Commit: 7857cf3dc781faeb5925bf6e18821a74cf960572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7857cf3dc781faeb5925bf6e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 13 19:49:13 2008 +0200 A couple of spelling fixes. --- dlls/comctl32/tests/listview.c | 2 +- dlls/netapi32/tests/wksta.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index b4cad0c..6d66f22 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1176,7 +1176,7 @@ static void test_multiselect(void) selected_count = (int)SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); - ok(selected_count == 1, "There should be only one selected item at the begining (is %d)\n",selected_count); + ok(selected_count == 1, "There should be only one selected item at the beginning (is %d)\n",selected_count); /* Set SHIFT key pressed */ GetKeyboardState(kstate); diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index 01d0d6f..b4994f8 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -83,7 +83,7 @@ static void run_wkstausergetinfo_tests(void) "NetWkstaUserGetInfo is unsuccessful\n"); ok(ui0 != NULL, "ui0 is NULL\n"); - /* This failure occured when I ran sshd as service and didn't authenticate + /* This failure occurred when I ran sshd as service and didn't authenticate * Since the test dereferences ui0, the rest of this test is worthless */ if (!ui0)

1 0

Paul Vriens : advapi32/tests: Fix a test on NT4.
by Alexandre Julliard 18 Jun '08

18 Jun '08

Module: wine Branch: master Commit: 71c49aac584fbc2c8846530e76d19077ac2460fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=71c49aac584fbc2c8846530e7… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jun 13 13:22:54 2008 +0200 advapi32/tests: Fix a test on NT4. --- dlls/advapi32/tests/service.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 8ffe2e8..cd6d82c 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -145,7 +145,17 @@ static void test_open_svc(void) GetServiceDisplayNameA(scm_handle, spooler, NULL, &displaysize); /* Get the displayname */ GetServiceDisplayNameA(scm_handle, spooler, displayname, &displaysize); - /* Try to open the service with this displayname */ + /* Try to open the service with this displayname, unless the displayname equals + * the servicename as that would defeat the purpose of this test. + */ + if (!lstrcmpi(spooler, displayname)) + { + skip("displayname equals servicename\n"); + CloseServiceHandle(scm_handle); + return; + } + + SetLastError(0xdeadbeef); svc_handle = OpenServiceA(scm_handle, displayname, GENERIC_READ); ok(!svc_handle, "Expected failure\n"); ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError());

1 0

Jon Griffiths : winedbg: Add support for printing c++ bool values.
by Alexandre Julliard 18 Jun '08

18 Jun '08

Module: wine Branch: master Commit: 9e62412dc1a1262023e4e884967ef0af9b2202f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e62412dc1a1262023e4e8849… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Wed Jun 11 12:39:54 2008 -0700 winedbg: Add support for printing c++ bool values. --- programs/winedbg/memory.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 3d7a15b..9a400e5 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -359,6 +359,10 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) else dbg_printf("'%c'", (char)val_int); break; + case btBool: + if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return; + dbg_printf("%s", val_int ? "true" : "false"); + break; default: WINE_FIXME("Unsupported basetype %u\n", bt); break;

1 0