July 2009 - Wine-Devel - list.winehq.org

Try #2: user32: Windows test request (cursors/icons)
by Daniel Santos July 6, 2009

July 6, 2009

Thanks again for testing this for me, Paul. I have modified the tests so that they should pass and I've skipped tests on win9x that I suspect are causing the blue screens (personally, I doubt it's due to VMware). I moved the new test functions to the top of the file, but I didn't remove the comments. I can shorten them if preferred, but I personally prefer to have functions well documented. So if you or anybody else could test this again for me, I would greatly appreciate it. Thanks! Daniel --- On Fri, 7/3/09, Paul Vriens <paul.vriens.wine(a)gmail.com> wrote: > From: Paul Vriens <paul.vriens.wine(a)gmail.com> > Subject: Re: user32: Windows test request (cursors/icons) > To: daniel.santos(a)pobox.com > Cc: wine-devel(a)winehq.org > Date: Friday, July 3, 2009, 3:44 PM > Daniel Santos wrote: > > I don't have access to a working windows machine right > now and would appreciate if somebody can run these tests > against XP, vista and/or 9x. > > > > Thanks! > > Daniel > > > Hi Daniel, > > Tested on XP Professional SP3: > > cursoricon.c:1367: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon.c:1369: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon.c:1371: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon.c:184: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon: 6 tests executed (0 marked as todo, 0 > failures), 0 skipped. > cursoricon: 553 tests executed (0 marked as todo, 4 > failures), 0 skipped. > > NT4 Server SP6a: > > cursoricon.c:1363: Test failed: DestroyCursor returned 1, > expected FALSE. > cursoricon.c:1363: Test failed: Last error is 3735928559 > (0xdeadbeef), expected 1402 (0x57a). > cursoricon.c:1367: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon.c:1369: Test failed: DestroyIcon returned 1, > expected FALSE. > cursoricon.c:1369: Test failed: Last error is 3735928559 > (0xdeadbeef), expected 1414 (0x586). > cursoricon.c:1371: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon.c:184: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon: 6 tests executed (0 marked as todo, 0 > failures), 0 skipped. > cursoricon: 553 tests executed (0 marked as todo, 7 > failures), 0 skipped. > > W2K Professional SP4: > > cursoricon.c:1367: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon.c:1369: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon.c:1371: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon.c:184: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon: 6 tests executed (0 marked as todo, 0 > failures), 0 skipped. > cursoricon: 553 tests executed (0 marked as todo, 4 > failures), 0 skipped. > > W2K3 SE SP2: > > cursoricon.c:1367: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon.c:1369: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon.c:1371: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon.c:184: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon: 6 tests executed (0 marked as todo, 0 > failures), 0 skipped. > cursoricon: 554 tests executed (0 marked as todo, 4 > failures), 0 skipped. > > Vista Ultimate - SP2: > > cursoricon.c:1367: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon.c:1369: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon.c:1371: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon.c:184: Test failed: Last error is 1402 (0x57a), > expected 1414 (0x586). > cursoricon: 11 tests executed (0 marked as todo, 0 > failures), 0 skipped. > cursoricon: 553 tests executed (0 marked as todo, 4 > failures), 0 skipped. > > I get a blue screen on Win95 and Win98 (VMware issue?) !! > > Some remarks on your patch: > > - Please move the new functions to the top so you don't > have to forward declare them. > - The level of comments for the 2 added functions is > something we usually expect for implementations, not for > tests ;) > > -- Cheers, > > Paul. >

2 1

"make test" redux
by Dan Kegel July 6, 2009

July 6, 2009

We've had a test suite for six or so years now, and we keep getting closer to having it pass reliably, but we're still not quite there. I see from http://test.winehq.org that fifteen tests fail on at least one machine. There are several bugs that only cause make test to fail if you run them with WINEDEBUG=warn+heap, but those seem just as important to me. On my own machine, here are the bugs related to make test failures: http://bugs.winehq.org/show_bug.cgi?id=12925 http://bugs.winehq.org/show_bug.cgi?id=14078 http://bugs.winehq.org/show_bug.cgi?id=17414 http://bugs.winehq.org/show_bug.cgi?id=17518 http://bugs.winehq.org/show_bug.cgi?id=19183 I submitted a patch to fix http://bugs.winehq.org/show_bug.cgi?id=17518 but it'd be nice to get some love on the others. - Dan

3 3

Using tracing for tests on Wine
by Paul Vriens July 6, 2009

July 6, 2009

Hi, I've always had a patch in my local repo that runs runtest with the '-v' flag instead if '-q' as I'm not always interested in just the failures. Having '-q' for runtest basically means that I didn't find a way to override things. WINETEST_DEBUG=<number> doesn't work when I do a 'make <test>.ok' as the debug flag will be overwritten by runtest. What would be the best approach here: - Make '-v' the real default like it is on Windows? I've sent a patch for this a long time ago but didn't receive any feedback nor was I too interested in getting that in. (See attached) - If WINETEST_DEBUG is set it will always override the '-q' or '-v' flag for runtest? - Get rid of the '-v' and '-q' altogether in runtest? Other suggestions? -- Cheers, Paul. diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index a7095a5..25ff681 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -15,7 +15,7 @@ DEFS = $(EXTRADEFS) MODULE = $(TESTDLL:%.dll=%)_test.exe TESTRESULTS = $(CTESTS:.c=.ok) TESTPROGRAM = $(MODULE)$(DLLEXT) -RUNTESTFLAGS = -q -P wine -M $(TESTDLL) -T $(TOPOBJDIR) -p $(TESTPROGRAM) +RUNTESTFLAGS = -v -P wine -M $(TESTDLL) -T $(TOPOBJDIR) -p $(TESTPROGRAM) C_SRCS = $(CTESTS) ALL_LIBS = $(IMPORTS:%=-l%) $(EXTRALIBS) $(LDFLAGS) $(LIBS)

1 0

Building problems on Intel Mac.
by Zheng Che July 6, 2009

July 6, 2009

Screenshot attached.

4 3

New winetricks 20090705: new verb shockwave; updated xvid and firefox
by Dan Kegel July 6, 2009

July 6, 2009

Another <insert time period here>, another winetricks. The only interesting change is the addition of shockwave, and maybe the update to firefox 3.5. Online as always at http://kegel.com/wine/winetricks or http://winezeug.googlecode.com (Bug reports to the issue tracker at the above URL.) Semi-interesting changes since 20090607: ------------------------------------------------------------------------ r546 | daniel.r.kegel | 2009-07-05 18:09:13 -0700 (Sun, 05 Jul 2009) | 3 lines Updated firefox, xvid; added shockwave; bumped version to 20090705 ------------------------------------------------------------------------ r521 | austinenglish | 2009-06-24 16:37:21 -0700 (Wed, 24 Jun 2009) | 2 lines winetricks: ignore 194 exit code from ie6 ------------------------------------------------------------------------ r520 | austinenglish | 2009-06-24 15:19:26 -0700 (Wed, 24 Jun 2009) | 2 lines winetricks: fix download function's renaming files when using wget ------------------------------------------------------------------------ r519 | austinenglish | 2009-06-24 15:17:34 -0700 (Wed, 24 Jun 2009) | 2 lines winetricks: fix DiVX download link

1 0

Re: cryptdlg: Translate "CPS" (Certification Practice Statement) to Lithuanian and add a comment to English resource
by Juan Lang July 6, 2009

July 6, 2009

Hi Aurimas, - IDS_CPS "CPS" + IDS_CPS "SVN" /* Sertifikavimo Veiklos Nuostatos */ I'm not sure this is a good idea. In common usage, acronyms are not translated. In this case, the acronym CPS is part of a standard, RFC2527, so it doesn't seem like a good idea to abbreviate the translated name to a new acronym that isn't anywhere except this dialog. As another example, here's Frédéric Delanoy's recent update of the same string in French (with apologies for the mangled encoding): + IDS_CPS "Ã‰noncÃ© des pratiques de certification (CPS)" That is, the text is translated, but the acronym is not. This seems like a better approach to me. Regards, --Juan

1 0

Re: [1/3] gdiplus: Implement GdipBeginContainer2 and GdipEndContainer
by Vincent Povirk July 5, 2009

July 5, 2009

+ sts = GdipCloneMatrix(container->worldtrans, &newTrans); + if(sts != Ok) + return sts; + + sts = GdipCloneRegion(container->clip, &newClip); + if(sts != Ok) + return sts; This leaks a matrix if GdipCloneRegion fails. -- Vincent Povirk

1 0

Re: server/fd.c: Prevent using uninitialized pointers
by Henri Verbeet July 5, 2009

July 5, 2009

2009/6/30 Daniel Santos <javatroubadour(a)yahoo.com>: > Some pointers are getting used prior to initialization. It would appear that the current compilers are initializing them to zero or we've been lucky. > No, the C standard specifies that these are initialized to NULL, since they have static storage duration.

4 5

Testing modal property sheets
by Nikolay Sivov July 5, 2009

July 5, 2009

Hi. Some time ago I tried to fix bug http://bugs.winehq.org/show_bug.cgi?id=16876 . It's about wrong return codes of PropertySheet call. The question is about a proper way of testing this. I tried to exit just after creation in PSCB_INITIALIZED handler, it looks like it shows a problem, but I'm not sure is it a correct way or not. I'd like to see some advices about that Thanks. rom 56c14340af9ac298bde22cf207fca7c8ae95957c Mon Sep 17 00:00:00 2001 From: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat, 23 May 2009 19:21:08 +0400 Subject: Some propsheet tests --- dlls/comctl32/tests/propsheet.c | 128 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 128 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 4164f68..37b89fd 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -199,9 +199,137 @@ static void test_disableowner(void) DestroyWindow(parent); } +#define PSM_PRESSBUTTON_CALLBACK(id) \ +static int CALLBACK psm_pressbutton_callback_##id (HWND hwnd, UINT msg, LPARAM lparam) \ +{\ + switch(msg)\ + {\ + case PSCB_INITIALIZED:\ + {\ + PostMessage(NULL, PSM_PRESSBUTTON, PSBTN_##id, (LPARAM)0);\ + return FALSE;\ + }\ + }\ + return FALSE;\ +} + +PSM_PRESSBUTTON_CALLBACK(OK) +PSM_PRESSBUTTON_CALLBACK(CANCEL) +PSM_PRESSBUTTON_CALLBACK(APPLYNOW) +PSM_PRESSBUTTON_CALLBACK(BACK) +PSM_PRESSBUTTON_CALLBACK(FINISH) +PSM_PRESSBUTTON_CALLBACK(HELP) +PSM_PRESSBUTTON_CALLBACK(NEXT) + +static void test_singlepressbutton(INT id, INT expected, BOOL modal, BOOL todo, int line) +{ + HPROPSHEETPAGE hpsp[1]; + PROPSHEETPAGEA psp; + PROPSHEETHEADERA psh; + HWND hdlg; + INT ret; + DWORD r; + + memset(&psp, 0, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.dwFlags = 0; + psp.hInstance = GetModuleHandleW(NULL); + U(psp).pszTemplate = "prop_page1"; + U2(psp).pszIcon = NULL; + psp.pfnDlgProc = NULL; + psp.lParam = 0; + + hpsp[0] = CreatePropertySheetPageA(&psp); + + memset(&psh, 0, sizeof(psh)); + psh.dwSize = sizeof(psh); + psh.pszCaption = "test caption"; + psh.nPages = 1; + U3(psh).phpage = hpsp; + + if (modal) + { + /* modal sheet */ + psh.dwFlags = PSH_USECALLBACK; + psh.hwndParent = NULL; + switch(id) + { + case PSBTN_BACK: + psh.pfnCallback = psm_pressbutton_callback_BACK; + break; + case PSBTN_NEXT: + psh.pfnCallback = psm_pressbutton_callback_NEXT; + break; + case PSBTN_FINISH: + psh.pfnCallback = psm_pressbutton_callback_FINISH; + break; + case PSBTN_OK: + psh.pfnCallback = psm_pressbutton_callback_OK; + break; + case PSBTN_APPLYNOW: + psh.pfnCallback = psm_pressbutton_callback_APPLYNOW; + break; + case PSBTN_CANCEL: + psh.pfnCallback = psm_pressbutton_callback_CANCEL; + break; + case PSBTN_HELP: + psh.pfnCallback = psm_pressbutton_callback_HELP; + break; + } + + ret = PropertySheetA(&psh); + if (todo) + { + todo_wine ok_(__FILE__, line)(ret == expected, "Expected %d result, got %d\n", expected, ret); + } + else + ok_(__FILE__, line)(ret == expected, "Expected %d result, got %d\n", expected, ret); + } + else + { + /* modeless sheet */ + psh.dwFlags = PSH_MODELESS; + psh.hwndParent = GetDesktopWindow(); + + hdlg = (HWND)PropertySheetA(&psh); + ok(IsWindow(hdlg), "Expected dialog handle, got %p\n", hdlg); + + SendMessage(hdlg, PSM_PRESSBUTTON, PSBTN_FINISH, 0); + ok(IsWindow(hdlg), "Expected dialog handle, got %p\n", hdlg); + r = SendMessage(hdlg, PSM_GETRESULT, 0, 0); + if (todo) + { + todo_wine ok_(__FILE__, line)(r == expected, "Expected %d result, got %d\n", expected, r); + } + else + ok_(__FILE__, line)(r == expected, "Expected %d result, got %d\n", expected, r); + + DestroyWindow(hdlg); + } +} + +static void test_psmpressbutton(void) +{ + test_singlepressbutton(PSBTN_BACK, 0, TRUE, TRUE, __LINE__); + test_singlepressbutton(PSBTN_BACK, IDOK, FALSE, FALSE, __LINE__); + test_singlepressbutton(PSBTN_NEXT, 0, TRUE, TRUE, __LINE__); + test_singlepressbutton(PSBTN_NEXT, IDOK, FALSE, FALSE, __LINE__); + test_singlepressbutton(PSBTN_FINISH, 0, TRUE, TRUE, __LINE__); + test_singlepressbutton(PSBTN_FINISH, IDOK, FALSE, FALSE, __LINE__); + test_singlepressbutton(PSBTN_OK, 0, TRUE, TRUE, __LINE__); + test_singlepressbutton(PSBTN_OK, IDOK, FALSE, FALSE, __LINE__); + test_singlepressbutton(PSBTN_CANCEL, 0, TRUE, TRUE, __LINE__); + test_singlepressbutton(PSBTN_CANCEL, IDOK, FALSE, FALSE, __LINE__); + test_singlepressbutton(PSBTN_APPLYNOW, 0, TRUE, TRUE, __LINE__); + test_singlepressbutton(PSBTN_APPLYNOW, IDOK, FALSE, FALSE, __LINE__); + test_singlepressbutton(PSBTN_HELP, 0, TRUE, TRUE, __LINE__); + test_singlepressbutton(PSBTN_HELP, IDOK, FALSE, FALSE, __LINE__); +} + START_TEST(propsheet) { test_title(); test_nopage(); test_disableowner(); + test_psmpressbutton(); } -- 1.5.6.5 >From 370b1938ce218b8be93d463267ff23adf33097bd Mon Sep 17 00:00:00 2001 From: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat, 23 May 2009 19:34:54 +0400 Subject: Fix PropertySheet return value for modal sheets --- dlls/comctl32/propsheet.c | 5 +---- dlls/comctl32/tests/propsheet.c | 14 +++++++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 44151e4..7d337bd 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1703,7 +1703,7 @@ static BOOL PROPSHEET_Finish(HWND hwndDlg) if (msgResult != 0) return FALSE; - if (psInfo->result == 0) + if (psInfo->result == 0 && psInfo->isModeless) psInfo->result = IDOK; if (psInfo->isModeless) psInfo->activeValid = FALSE; @@ -2742,10 +2742,7 @@ static INT do_loop(const PropSheetInfo *psInfo) } if(ret == 0) - { PostQuitMessage(msg.wParam); - ret = -1; - } if(ret != -1) ret = psInfo->result; diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 37b89fd..b7a97cd 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -310,19 +310,19 @@ static void test_singlepressbutton(INT id, INT expected, BOOL modal, BOOL todo, static void test_psmpressbutton(void) { - test_singlepressbutton(PSBTN_BACK, 0, TRUE, TRUE, __LINE__); + test_singlepressbutton(PSBTN_BACK, 0, TRUE, FALSE, __LINE__); test_singlepressbutton(PSBTN_BACK, IDOK, FALSE, FALSE, __LINE__); - test_singlepressbutton(PSBTN_NEXT, 0, TRUE, TRUE, __LINE__); + test_singlepressbutton(PSBTN_NEXT, 0, TRUE, FALSE, __LINE__); test_singlepressbutton(PSBTN_NEXT, IDOK, FALSE, FALSE, __LINE__); - test_singlepressbutton(PSBTN_FINISH, 0, TRUE, TRUE, __LINE__); + test_singlepressbutton(PSBTN_FINISH, 0, TRUE, FALSE, __LINE__); test_singlepressbutton(PSBTN_FINISH, IDOK, FALSE, FALSE, __LINE__); - test_singlepressbutton(PSBTN_OK, 0, TRUE, TRUE, __LINE__); + test_singlepressbutton(PSBTN_OK, 0, TRUE, FALSE, __LINE__); test_singlepressbutton(PSBTN_OK, IDOK, FALSE, FALSE, __LINE__); - test_singlepressbutton(PSBTN_CANCEL, 0, TRUE, TRUE, __LINE__); + test_singlepressbutton(PSBTN_CANCEL, 0, TRUE, FALSE, __LINE__); test_singlepressbutton(PSBTN_CANCEL, IDOK, FALSE, FALSE, __LINE__); - test_singlepressbutton(PSBTN_APPLYNOW, 0, TRUE, TRUE, __LINE__); + test_singlepressbutton(PSBTN_APPLYNOW, 0, TRUE, FALSE, __LINE__); test_singlepressbutton(PSBTN_APPLYNOW, IDOK, FALSE, FALSE, __LINE__); - test_singlepressbutton(PSBTN_HELP, 0, TRUE, TRUE, __LINE__); + test_singlepressbutton(PSBTN_HELP, 0, TRUE, FALSE, __LINE__); test_singlepressbutton(PSBTN_HELP, IDOK, FALSE, FALSE, __LINE__); } -- 1.5.6.5

1 0

Re: [cryptui] Show the select store text when browsing stores
by Aurimas Fišeras July 5, 2009

July 5, 2009

On 07/05/2009 04:08 PM, Paul Vriens wrote: > Hi, > > We at least see the text now. Selecting is possible but doesn't work > (regression?). > > Changelog > Show the select store text when browsing stores > > > ------------------------------------------------------------------------ > > > + selectInfo.pwszText = LoadStringW(hInstance, IDC_STORE_TEXT, > + storeText, sizeof(storeText) / sizeof(storeText[0])); LoadStringW returns int, not string! LoadStringW(hInstance, IDC_STORE_TEXT, storeText, sizeof(storeText) / sizeof(storeText[0])); selectInfo.pwszText = storeText;

2 3