March 2007 - Wine-Commits - list.winehq.org

appdb/include maintainer.php
by WineHQ March 16, 2007

March 16, 2007

ChangeSet ID: 30976 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/16 19:51:20 Modified files: include : maintainer.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix maintainer::objectGetEntries(). Remove UNION SELECT and properly check for application queue status for un-queued maintainers Patch: http://cvs.winehq.org/patch.py?id=30976 Old revision New revision Changes Path 1.30 1.31 +22 -19 appdb/include/maintainer.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.30 appdb/include/maintainer.php:1.31 --- appdb/include/maintainer.php:1.30 17 Mar 2007 0:51:20 -0000 +++ appdb/include/maintainer.php 17 Mar 2007 0:51:20 -0000 @@ -197,29 +197,32 @@ class maintainer { /* Excluding requests for queued apps and versions, as these will be handled automatically */ - if($bQueued) - $sQuery = "SELECT appMaintainers.submitTime, maintainerId FROM - appMaintainers, user_list, appFamily - WHERE appMaintainers.userid = user_list.userid AND - appMaintainers.queued = '?' AND appMaintainers.appId = - appFamily.appId AND appMaintainers.versionId = '' AND - appFamily.queued = 'false' UNION SELECT - appMaintainers.submitTime, maintainerId FROM - appMaintainers, user_list, appVersion WHERE - user_list.userid = appMaintainers.userid AND - appMaintainers.versionId = appVersion.versionId AND - appVersion.queued = 'false' AND appMaintainers.queued = '?' - ORDER by submitTime"; - else - $sQuery = "SELECT maintainerId FROM appMaintainers, user_list - WHERE appMaintainers.userid = user_list.userid ". - "AND queued = '?' ORDER by realname"; + $sQuery = "SELECT DISTINCT maintainerId, appMaintainers.submitTime FROM + appMaintainers, appFamily, appVersion WHERE + appMaintainers.queued = '?' + AND + appFamily.appId = appVersion.appId + AND + ( + ( + appFamily.appId = appMaintainers.appId + AND + appFamily.queued = 'false' + AND + appMaintainers.versionId = '' + ) + OR + ( + appVersion.versionId = appMaintainers.versionId + AND + appVersion.queued = 'false' + ) + )"; if($bQueued) { if($_SESSION['current']->hasPriv("admin")) - return query_parameters($sQuery, $bQueued ? "true" : "false", - $bQueued ? "true" : "false"); + return query_parameters($sQuery, $bQueued ? "true" : "false"); else return NULL; } else

1 0

appdb/ include/maintainer.php unit_test/test_o ...
by WineHQ March 16, 2007

March 16, 2007

ChangeSet ID: 30975 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/16 19:50:12 Modified files: include : maintainer.php unit_test : test_om_objects.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Test objectGetEntries() in the objectManager tests Patch: http://cvs.winehq.org/patch.py?id=30975 Old revision New revision Changes Path 1.29 1.30 +18 -0 appdb/include/maintainer.php 1.2 1.3 +86 -9 appdb/unit_test/test_om_objects.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.29 appdb/include/maintainer.php:1.30 --- appdb/include/maintainer.php:1.29 17 Mar 2007 0:50:12 -0000 +++ appdb/include/maintainer.php 17 Mar 2007 0:50:12 -0000 @@ -605,6 +605,24 @@ class maintainer { return TRUE; } + + function display() + { + /* STUB: There is not much use for this, but it may be implemented later */ + return TRUE; + } + + function objectMakeUrl() + { + /* STUB: There is not much use for this, but it may be implemented later */ + return TRUE; + } + + function objectMakeLink() + { + /* STUB: There is not much use for this, but it may be implemented later */ + return TRUE; + } } ?> Index: appdb/unit_test/test_om_objects.php diff -u -p appdb/unit_test/test_om_objects.php:1.2 appdb/unit_test/test_om_objects.php:1.3 --- appdb/unit_test/test_om_objects.php:1.2 17 Mar 2007 0:50:12 -0000 +++ appdb/unit_test/test_om_objects.php 17 Mar 2007 0:50:12 -0000 @@ -16,15 +16,87 @@ function test_class($sClassName, $aTestM { $oObject = new ObjectManager(""); $oObject->sClass = $sClassName; + + /* Check whether the required methods are present */ if(!$oObject->checkMethods($aTestMethods, false)) { - echo $oObject->sClass." class does not have valid methods for use with". + echo "FAILED\t\t".$oObject->sClass." does not have valid methods for use with". " the object manager\n"; return false; - } else + } + + /* Set up test user */ + global $test_email, $test_password; + if(!$oUser = create_and_login_user()) + { + echo "Failed to create and log in user.\n"; + return FALSE; + } + /* Test the methods' functionality */ + foreach($aTestMethods as $sMethod) { - echo "PASSED:\t\t".$oObject->sClass."\n"; + switch($sMethod) + { + /* Should also test for queued entries, but vendor does not support + queueing yet */ + case "objectGetEntries": + $oUser->addPriv("admin"); + $oTestObject = new $sClassName(); + /* Set up one test entry, depending on class */ + switch($sClassName) + { + case "distribution": + $oTestObject->sName = "Silly test distribution"; + $oTestObject->sUrl = "http://appdb.winehq.org/"; + break; + case "maintainer": + $iAppId = 65555; + $oApp = new application(); + + if(!$oApp->create()) + { + echo "Failed to create application"; + return FALSE; + } + $oApp->iAppId = $iAppId; + $oApp->update(); + $oTestObject->iUserId = $oUser->iUserId; + $oTestObject->iAppId = $iAppId; + $oTestObject->sMaintainReason = "I need it"; + break; + } + /* Should return 1 */ + if(!$oTestObject->create()) + { + echo "FAILED\t\t$sClassName::create()\n"; + return FALSE; + } + $iExpected = 1; + $hResult = $oTestObject->objectGetEntries(false); + $iReceived = mysql_num_rows($hResult); + $oTestObject->delete(); + if($iExpected > $iReceived) + { + echo "Got $iReceived instead of >= $iExpected\n"; + echo "FAILED\t\t$sClassName::$sMethod\n"; + return FALSE; + } + /* Class specific clean-up */ + switch($sClassName) + { + case "maintainer": + $oApp->delete(); + break; + } + echo "PASSED\t\t$sClassName::$sMethod\n"; + break; + } } + + $oUser->delete(); + + echo "PASSED\t\t".$oObject->sClass."\n"; + return TRUE; } function test_object_methods() @@ -74,14 +146,19 @@ function test_object_methods() $aTestMethods = array("objectOutputHeader", "objectOutputTableRow", "objectGetEntries", "display", "objectGetInstanceFromRow", "outputEditor", "canEdit", - "getOutputEditorValues", "objectGetEntries", - "objectMakeUrl", "objectMakeLink"); + "getOutputEditorValues", "objectMakeUrl", "objectMakeLink"); + + if(!test_class("distribution", $aTestMethods)) + return FALSE; + + if(!test_class("vendor", $aTestMethods)) + return FALSE; - test_class("distribution", $aTestMethods); - test_class("vendor", $aTestMethods); -/* test_class("maintainer", $aTestMethods); - test_class("screenshot", $aTestMethods); */ + if(!test_class("maintainer", $aTestMethods)) + return FALSE; +/* if(!test_class("screenshot", $aTestMethods)) + return FALSE; */ return true; }

1 0

lostwages/ include/winehq.conf news/2007031601.xml
by Alexandre Julliard March 16, 2007

March 16, 2007

ChangeSet ID: 30974 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2007/03/16 12:02:44 Modified files: include : winehq.conf Added files: news : 2007031601.xml Log message: Release 0.9.33 Patch: http://cvs.winehq.org/patch.py?id=30974 Old revision New revision Changes Path 1.55 1.56 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2007031601.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.55 lostwages/include/winehq.conf:1.56 --- lostwages/include/winehq.conf:1.55 16 Mar 2007 17: 2:44 -0000 +++ lostwages/include/winehq.conf 16 Mar 2007 17: 2:44 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.32 +snapshot_date: 0.9.33 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2007031601.xml diff -u -p /dev/null lostwages/news/2007031601.xml:1.1 --- /dev/null 16 Mar 2007 17: 2:44 -0000 +++ lostwages/news/2007031601.xml 16 Mar 2007 17: 2:44 -0000 @@ -0,0 +1,26 @@ +<news> +<date>March 16, 2007</date> +<title>Wine 0.9.33 Released</title> +<body> +<p>Wine 0.9.33 was released today, with the following main changes:</p> + +<ul> +<li>Many Direct3D fixes and performance improvements.</li> +<li>More comctl32 tests and some bug fixes.</li> +<li>Compatibility improvements in cmd.exe.</li> +<li>Still more fixes to builtin OLE.</li> +<li>Support for process control on Solaris.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.33.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.33">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Alexandre Julliard : Release 0.9.33.
by Alexandre Julliard March 16, 2007

March 16, 2007

Module: wine Branch: master Commit: 2fc39aacf925a01502f6f8ed1d6d2e80c86acd4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc39aacf925a01502f6f8ed1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 16 17:40:46 2007 +0100 Release 0.9.33. --- ANNOUNCE | 988 +++++++++++++++++---------------- ChangeLog | 1889 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2414 insertions(+), 483 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fc39aacf925a01502f6f…

1 0

Tag wine-0.9.33 : Alexandre Julliard : Release 0.9.33
by Alexandre Julliard March 16, 2007

March 16, 2007

Module: wine Branch: refs/tags/wine-0.9.33 Tag: a1cf947e811b0208c41c6147184ba7f460130a74 URL: http://source.winehq.org/git/wine.git/?a=tag;h=a1cf947e811b0208c41c6147184b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 16 17:40:47 2007 +0100 Release 0.9.33

1 0

Michael Stefaniuc : winemine: Add Romanian translation.
by Alexandre Julliard March 16, 2007

March 16, 2007

Module: wine Branch: master Commit: 8cf9d7c9cbfcd945120d9ac86827dd212603a299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf9d7c9cbfcd945120d9ac86… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 16 10:11:38 2007 +0100 winemine: Add Romanian translation. --- programs/winemine/Ro.rc | 106 +++++++++++++++++++++++++++++++++++++++++++++ programs/winemine/rsrc.rc | 1 + 2 files changed, 107 insertions(+), 0 deletions(-) diff --git a/programs/winemine/Ro.rc b/programs/winemine/Ro.rc new file mode 100644 index 0000000..c949f6f --- /dev/null +++ b/programs/winemine/Ro.rc @@ -0,0 +1,106 @@ +/* + * WineMine + * Romanian Language Support + * + * Copyright 2007 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE { + IDS_APPNAME, "WineMine" + IDS_NOBODY, "Nimeni" +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "&Opţiuni" { + MENUITEM "&Nou\tF2", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Mark Question", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Începător", IDM_BEGINNER + MENUITEM "&Avansat", IDM_ADVANCED + MENUITEM "&Expert", IDM_EXPERT + MENUITEM "&Personalizat", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "&Ieşire\tAlt+X", IDM_EXIT + } + POPUP "&Informaţii" { + MENUITEM "&Scoruri maxime", IDM_TIMES + MENUITEM "&Despre", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Scoruri maxime" +{ + GROUPBOX "Scoruri maxime", IDIGNORE, 10, 10, 140, 45 + LTEXT "&Începător", IDIGNORE, 20, 20, 40, 8 + LTEXT "Avansat", IDIGNORE, 20, 30, 40, 8 + LTEXT "Expert", IDIGNORE, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Felicitări!" +{ + LTEXT "Scrieţi-vă numele", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Joc personalizat" +{ + LTEXT "Linii", IDIGNORE, 5, 5, 30, 10 + LTEXT "Coloane", IDIGNORE, 5, 35, 30, 10 + LTEXT "Mine", IDIGNORE, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Renunţă", IDCANCEL, 40, 50, 50, 15 +} + +DLG_ABOUT DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Despre" +{ + LTEXT "Winemine", IDIGNORE, 10, 10, 50, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDIGNORE, 35, 25, 115, 10 + LTEXT "Licenţiat sub termenii Licenţei LGPL", IDIGNORE, 35, 35, 115, 20 + ICON "WINEMINE", IDIGNORE, 10, 25, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 50, 60, 60, 15 +} + +#pragma code_page(default) diff --git a/programs/winemine/rsrc.rc b/programs/winemine/rsrc.rc index b8b3322..6a9ed32 100644 --- a/programs/winemine/rsrc.rc +++ b/programs/winemine/rsrc.rc @@ -34,6 +34,7 @@ #include "No.rc" #include "Pl.rc" #include "Pt.rc" +#include "Ro.rc" #include "Ru.rc" #include "Si.rc" #include "Tr.rc"

1 0

Alexandre Julliard : cmd: Fix a compiler warning.
by Alexandre Julliard March 16, 2007

March 16, 2007

Module: wine Branch: master Commit: 7c1418ae2cd780880bb8e249db83f280e15ff677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1418ae2cd780880bb8e249d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 16 13:02:06 2007 +0100 cmd: Fix a compiler warning. --- programs/cmd/wcmdmain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1bb9154..d49e25f 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1480,7 +1480,7 @@ static char *WCMD_expand_envvar(char *start) { /* ~ is substring manipulation */ if (savedchar == '~') { - int substrposition, substrlength; + int substrposition, substrlength = 0; char *commapos = strchr(colonpos+2, ','); char *startCopy;

1 0

Paul Vriens : netapi32/tests: Use GetModuleHandle and skip.
by Alexandre Julliard March 16, 2007

March 16, 2007

Module: wine Branch: master Commit: 5770f3e30d6015508abe07bd53dc08b3d73c449b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5770f3e30d6015508abe07bd5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 16 12:02:25 2007 +0100 netapi32/tests: Use GetModuleHandle and skip. --- dlls/netapi32/tests/ds.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/netapi32/tests/ds.c b/dlls/netapi32/tests/ds.c index 7d0413d..7ee8a73 100644 --- a/dlls/netapi32/tests/ds.c +++ b/dlls/netapi32/tests/ds.c @@ -78,15 +78,12 @@ START_TEST(ds) { HMODULE hnetapi32; - hnetapi32 = LoadLibraryA("netapi32.dll"); - if (!hnetapi32) - return; + hnetapi32 = GetModuleHandleA("netapi32.dll"); - SetLastError(0xdeadbeef); pDsRoleGetPrimaryDomainInformation=(void*)GetProcAddress(hnetapi32,"DsRoleGetPrimaryDomainInformation"); if (!pDsRoleGetPrimaryDomainInformation) { - trace("DsRoleGetPrimaryDomainInformation not implemented : (%d), stop testing\n", GetLastError()); + skip("DsRoleGetPrimaryDomainInformation is not available\n"); return; } pDsRoleFreeMemory=(void*)GetProcAddress(hnetapi32,"DsRoleFreeMemory");

1 0

Keith Stevens : comctl32: trackbar: Return the correct number of tics for TBM_GETNUMTICS.
by Alexandre Julliard March 16, 2007

March 16, 2007

Module: wine Branch: master Commit: 3a58b51aa380b0e87fbcf5843976d92a62988372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a58b51aa380b0e87fbcf5843… Author: Keith Stevens <fozziethebeat(a)gmail.com> Date: Thu Mar 15 22:11:14 2007 -0700 comctl32: trackbar: Return the correct number of tics for TBM_GETNUMTICS. --- dlls/comctl32/tests/trackbar.c | 10 ++++------ dlls/comctl32/trackbar.c | 5 ++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 3cecd88..db3910b 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -775,12 +775,10 @@ static void test_tic_settings(HWND hWndTrackbar){ SendMessage(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(0, 10)); SendMessage(hWndTrackbar, TBM_SETTICFREQ, 2, 0); r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0); - todo_wine{ - expect(6, r); - SendMessage(hWndTrackbar, TBM_SETTICFREQ, 5, 0); - r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0); - expect(3, r); - } + expect(6, r); + SendMessage(hWndTrackbar, TBM_SETTICFREQ, 5, 0); + r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0); + expect(3, r); SendMessage(hWndTrackbar, TBM_SETTICFREQ, 15, 0); r = SendMessage(hWndTrackbar, TBM_GETNUMTICS, 0,0); expect(2, r); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index d718e00..9858d58 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1042,7 +1042,10 @@ TRACKBAR_GetNumTics (TRACKBAR_INFO *infoPtr) if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_NOTICKS) return 0; - return infoPtr->uNumTics + 2; + if(infoPtr->uNumTics == 0) + return 2; + else + return infoPtr->uNumTics + 1; }

1 0

Farshad Agah : comctl32: monthcal: Correct the return value in MCM_SETFIRSTDAYOFWEEK.
by Alexandre Julliard March 16, 2007

March 16, 2007

Module: wine Branch: master Commit: 86ea6b582088ea347c712be333b85f41aadb1026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ea6b582088ea347c712be33… Author: Farshad Agah <f_agah(a)yahoo.com> Date: Fri Mar 16 00:34:36 2007 -0700 comctl32: monthcal: Correct the return value in MCM_SETFIRSTDAYOFWEEK. --- dlls/comctl32/monthcal.c | 20 +++++---- dlls/comctl32/tests/monthcal.c | 89 +++++++++++++++++++++++++++------------ 2 files changed, 73 insertions(+), 36 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ded5c5c..9f25689 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -897,19 +897,23 @@ static LRESULT MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, LPARAM lParam) { int prev = infoPtr->firstDay; + int localFirstDay; WCHAR buf[40]; TRACE("day %ld\n", lParam); - if((lParam >= 0) && (lParam < 7)) { - infoPtr->firstDay = (int)lParam; - } + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK, buf, countof(buf)); + TRACE("%s %d\n", debugstr_w(buf), strlenW(buf)); + + localFirstDay = atoiW(buf); + + if(lParam == -1) + infoPtr->firstDay = MAKELONG(localFirstDay, FALSE); + else if(lParam >= 7) + infoPtr->firstDay = MAKELONG(localFirstDay, TRUE); else - { - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK, buf, countof(buf)); - TRACE("%s %d\n", debugstr_w(buf), strlenW(buf)); - infoPtr->firstDay = (atoiW(buf)+1)%7; - } + infoPtr->firstDay = MAKELONG(lParam, TRUE); + return prev; } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 5552ba9..47648a1 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -135,26 +135,56 @@ static const struct message monthcal_curr_date_seq[] = { static const struct message monthcal_first_day_seq[] = { { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, - { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, -5}, { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, - { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 1}, + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, -4}, { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, - { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 2}, + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, -3}, { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, - { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 3}, + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, -2}, { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, - { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 4}, + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, -1}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 1}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 2}, { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, - { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 5}, + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 3}, { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 4}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 5}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 6}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 7}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 8}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 9}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 10}, + { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, + + { MCM_SETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 11}, { MCM_GETFIRSTDAYOFWEEK, sent|wparam|lparam, 0, 0}, { 0 } }; @@ -583,40 +613,43 @@ static void test_monthcal_currDate(HWND hwnd) static void test_monthcal_firstDay(HWND hwnd) { - int res, fday, i, temp; + int res, fday, i, prev; TCHAR b[128]; LCID lcid = LOCALE_USER_DEFAULT; flush_sequences(sequences, NUM_MSG_SEQUENCES); /* Setter and Getters for first day of week */ - todo_wine { - /* check for locale first day */ - if(GetLocaleInfo(lcid, LOCALE_IFIRSTDAYOFWEEK, b, 128)){ - fday = atoi(b); - res = SendMessage(hwnd, MCM_GETFIRSTDAYOFWEEK, 0, 0); - expect(fday, res); - res = SendMessage(hwnd, MCM_SETFIRSTDAYOFWEEK, 0, (LPARAM) 0); - expect(fday, res); - }else{ - skip("Cannot retrieve first day of the week\n"); - SendMessage(hwnd, MCM_SETFIRSTDAYOFWEEK, 0, (LPARAM) 0); - } + /* check for locale first day */ + if(GetLocaleInfo(lcid, LOCALE_IFIRSTDAYOFWEEK, b, 128)){ + fday = atoi(b); + res = SendMessage(hwnd, MCM_GETFIRSTDAYOFWEEK, 0, 0); + expect(fday, res); + prev = fday; - /* check for days of the week*/ - for (i = 1, temp = 0x10000; i < 7; i++, temp++){ - res = SendMessage(hwnd, MCM_GETFIRSTDAYOFWEEK, 0, 0); - expect(temp, res); + /* checking for the values that actually will be stored as */ + /* current first day when we set a new value */ + for (i = -5; i < 12; i++){ res = SendMessage(hwnd, MCM_SETFIRSTDAYOFWEEK, 0, (LPARAM) i); - expect(temp, res); + expect(prev, res); + res = SendMessage(hwnd, MCM_GETFIRSTDAYOFWEEK, 0, 0); + prev = res; + + if (i == -1){ + expect(MAKELONG(fday, FALSE), res); + }else if (i >= 7){ + expect(MAKELONG(fday, TRUE), res); + }else{ + expect(MAKELONG(i, TRUE), res); + } } - /* check for returning to the original first day */ - res = SendMessage(hwnd, MCM_GETFIRSTDAYOFWEEK, 0, 0); - todo_wine {expect(temp, res);} + ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_first_day_seq, "monthcal firstDay", FALSE); + + }else{ + skip("Cannot retrieve first day of the week\n"); } - ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_first_day_seq, "monthcal firstDay", FALSE); } static void test_monthcal_unicode(HWND hwnd)

1 0