- wine-devel - winehq.org

Interesting Chromium hacks...er..patches
by Jeremy White 15 Sep '08

15 Sep '08

We've had a lot of fun hacking on Chromium these past few weeks. We did have a few things that we rushed along to include in the CrossOver Chromium builds that haven't properly baked here on wine-devel. I thought I'd share them in case anyone else wants to match what we did. First of all, we were working against dev build 21 of Chromium, not Chrome. Note that newer builds of Chromium now work (thanks to a patch by Alexandre), but they're pretty unstable. We got our dev build from here: http://build.chromium.org/buildbot/archives/chromium.tgz We find we have to have both Times and Arial (or replacements in the registry) in order for it to run stably. We have 3 winhttp patches we used that we're going to clean up and get into WineHQ properly, but here they are in raw form: winhttp_reset_content_length.diff fixes a glitch in winhttp on redirects. winhttp_flags.diff fixes a fairly obvious mistake (and turns out to be the gating factor for gmail support) winhttp_cookies.diff is the beginning of a cookie manager; Hans is still working on this one. Also, we used the following ...er...patches: focus.diff (hack by Alexandre, makes single tabs work okay) gdi hack by Huw, makes the map hand on maps.google.com not a blob Cheers, Jeremy

1 0

General Questions
by Scott Lindeneau 15 Sep '08

15 Sep '08

I haven't had time to work on the AcceptEx patch since the last time I submitted it to wine-patches. I still cannot reproduce the bug's patchwatcher indicated but I had a few questions regarding the whole process. When I finally get the patches to pass the patchwatcher regression test, is there anyway for me to know what is going on with the patch. Is Juilliard looking at them? Are they rejected? How long does the patch review process take? Is it just Julliard doing them? In regards to the AcceptEx patch in particular: I know that there is extra attention paid to patches that modify the wineserver. Should I spend extra time writing a discussion as to the reasons why I felt the modifications needed to take place within the wineserver? With the AcceptEx patch I kind of just plowed ahead and did what I thought needed to be done to make the functions work. Should I spend more time discussing what I intend to do in the patches with someone else before submitting them? Is someone willing to do this peer review with me? (Note: I don't have a lot of time to program). And lastly: Am I doing anything wrong (in general. not simply in coding)? I don't know how these internet based, user based systems work. I've never tried working with one before. Is there anything else someone wants me to work on? ~Scott

2 1

re: Patchwatcher should ignore AppDB patches
by Dan Kegel 15 Sep '08

15 Sep '08

Right, it should ignore those patches. I'm going to add a configurable regular expression to the patch detector to let it do that. (That is, when I get a chance. I'm cranking on native Chrome these days.)

1 0

Patchwatcher should ignore AppDB patches
by Alexander Nicolaysen Sørnes 15 Sep '08

15 Sep '08

I just sent a patch for the AppDB, and was told it didn't apply to Wine. That was never the intention, of course. Perhaps it can ignore mails with [AppDB] in the subject line, or patches containing .php files? Alexander N. Sørnes

5 5

Re: kernel32: Implemented GetSystemTimes
by Rob Shearman 15 Sep '08

15 Sep '08

2008/9/14 Martin Bailey <martin(a)pcalpha.com>: > +VOID WINAPI GetSystemTimes( > + LPFILETIME lpIdleTime, > + LPFILETIME lpKernelTime, > + LPFILETIME lpUserTime) > +{ > + struct tms tms; > + times(&tms); > + /* FIXME: Calculate based on Idle process time > + if (lpIdleTime) > + TIME_ClockTimeToFileTime(tms.tms_utime+tms.tms_stime,lpIdleTime); > + */ You still have to set lpIdleTime to something, even if it isn't implemented yet, as applications will expect the value to be initialised. -- Rob Shearman

1 0

Re: winemenubuilder: eliminate wineshelllink (try 4)
by Alexandre Julliard 15 Sep '08

15 Sep '08

"Damjan Jovanovic" <damjan.jov(a)gmail.com> writes: > + char dir_file_name[MAX_PATH]; > + struct stat st; > + name[i] = 0; > + fprintf(tempfile, " <Menu>\n"); > + fprintf(tempfile, " <Name>%s%s</Name>\n", count ? "" : "wine-", name); > + fprintf(tempfile, " <Directory>%s%s.directory</Directory>\n", count ? "" : "wine-", name); > + snprintf(dir_file_name, sizeof(dir_file_name), "%s/desktop-directories/%s%s.directory", > + xdg_data_dir, count ? "" : "wine-", name); You still have a MAX_PATH buffer here for a Unix file name. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: oleaut32[3/3]: VT_USERDEFINED records are passed by value (with testcase, fixes bug #14639)
by Alexandre Julliard 15 Sep '08

15 Sep '08

Mikołaj Zalewski <mikolaj(a)zalewski.pl> writes: > +const MYSTRUCT MYSTRUCT_BYVAL = {0x12345678, 0xdeadbeef98765432ULL}; > +const MYSTRUCT MYSTRUCT_BYPTR = {0x91827364, 0x8877665544332211ULL}; > +const MYSTRUCT MYSTRUCT_ARRAY[5] = { > + {0x1a1b1c1d, 0x1e1f101112131415ULL}, > + {0x2a2b2c2d, 0x2e2f202122232425ULL}, > + {0x3a3b3c3d, 0x3e3f303132333435ULL}, > + {0x4a4b4c4d, 0x4e4f404142434445ULL}, > + {0x5a5b5c5d, 0x5e5f505152535455ULL}, > +}; long long constants are not portable, please avoid them. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: shlwapi: Implement SHSendMessageBroadcastW
by Dmitry Timoshkov 15 Sep '08

15 Sep '08

"Detlef Riekenberg" <wine.dev(a)web.de> wrote: > inetcpl crash, when setting a new Homepage. > (need URLSubRegQueryA and ParseURLFromOutsideSourceW) > > MSDN documented SHSendMessageBroadcast to be the same as > SendMessage(HWND_BROADCAST,...) Why not implement SHSendMessageBroadcastA at the same time? -- Dmitry.

1 0

comctl32: Fix a failing test for some platforms
by Nicolas Le Cam 15 Sep '08

15 Sep '08

Hi James, This monthcal test fails on my win2k box (w2k-sp4-fr) before and after your patch. I did search other similar failure where WM_QUERYNEWPALETTE comes right after the WM_CREATE message but can't find one. So I assume your patch was to fix the failure on my box. But in my case the WM_QUERYNEWPALETTE comes between the two WM_WINDOWPOSCHANGING message. I was just about to send a patch to fix this just moving your new line a little bit down in the sequence but I prefer to be sure. If there is platforms where WM_QUERYNEWPALETTE comes just after the WM_CREATE message I can leave it here and add a new optional one between the two WM_WINDOWPOSCHANGING messages, it won't hurt. regards, Nicolas

2 4

Re: kernel32: fix PROFILE_Load to handle mac line endings (try 2)
by Paul Vriens 14 Sep '08

14 Sep '08

Erik Inge Bolsø wrote: > Fixes bug 15281. With testcase. > diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c > index 8a3e83b..1cc963c 100644 > --- a/dlls/kernel32/tests/profile.c > +++ b/dlls/kernel32/tests/profile.c > @@ -694,6 +694,273 @@ static void test_GetPrivateProfileString(void) > DeleteFileA(filename); > } > > +/* as above, but cr-only terminated lines */ > +static void test_cr(void) > +{ As you've stated this is exactly the same code (260 or so lines) with only the content struct being different. I think it's better to rewrite the current test_GetPrivateProfileString to take content as a parameter and call it with both types of content. -- Cheers, Paul.

1 0

Re: kernel32: fix PROFILE_Load to handle mac line endings
by Michael Karcher 14 Sep '08

14 Sep '08

Am Sonntag, den 14.09.2008, 14:48 +0200 schrieb Erik Inge Bolsø: > Fixes bug 15281. With testcase. > @@ -407,6 +407,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) > { > szLineStart = next_line; > next_line = memchrW(szLineStart, '\n', szEnd - szLineStart); > + if (!next_line) next_line = memchrW(szLineStart, '\r', szEnd - szLineStart); > if (!next_line) next_line = szEnd; > else next_line++; > szLineEnd = next_line; This fails on files with mixed line endings. Alas, there is no mempbrk or memcspn to help you scanning for both endings at the same time. > @@ -415,7 +416,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) > > /* get rid of white space */ > while (szLineStart < szLineEnd && PROFILE_isspaceW(*szLineStart)) szLineStart++; > - while ((szLineEnd > szLineStart) && ((szLineEnd[-1] == '\n') || PROFILE_isspaceW(szLineEnd[-1]))) szLineEnd--; > + while ((szLineEnd > szLineStart) && ((szLineEnd[-1] == '\n') || (szLineEnd[-1] == '\r') || PROFILE_isspaceW(szLineEnd[-1]))) szLineEnd--; > > if (szLineStart >= szLineEnd) continue; This hunk is unneded. PROFILE_isspaceW already checks for \n and \r. The already present check for '\n' could be removed, but that should be a separate patch. I will send it (together with a cleanup in PROFILE_isspaceW) after testing. > @@ -694,6 +694,273 @@ static void test_GetPrivateProfileString(void) > DeleteFileA(filename); > } > > +/* as above, but cr-only terminated lines */ > +static void test_cr(void) > +{ [...] Wouldn't it be sensible to factor out the common testing code, and just pass the string that gets written to the file as parameter? (I didn't check line-by-line that it matches, but the comment seems to implicate it.) If you refactor, you could also add a test that uses mixed endings (some \r, some \n, some \r\n). Regards, Michael Karcher

2 1

Fwd: Testcase - a windows run, please?
by Nicolas Le Cam 14 Sep '08

14 Sep '08

(resent as I didn't cc to wine-devel) Tested on win2k sp4 : X:\>kernel32_crosstest.exe profile profile: 202 tests executed (0 marked as todo, 0 failures), 0 skipped. 2008/9/14 Erik Inge Bolsø <knan-wine(a)anduin.net> > Could someone run this testcase on native windows for me, please? :) >

1 0

Praise of sorts for Wine re Softmaker Office 2008
by Dan Kegel 14 Sep '08

14 Sep '08

http://forum.ubuntuusers.de/topic/softmaker-office-2008--eine-alternative--… has a review of an office suite named Softmaker Office 2008, available for Windows and now also Linux. The review says in part "Irritiert hat uns, daß die Windows-Version von Office 2008, die von Stick gestartet werden kann, unter Wine besser, schneller und stabiler läuft, wie die native Office 2008 für Linux. Wer also die Windows-Version legal erworben hat, kann hier Geld sparen." ("It irritated us that the Windows version runs better on Wine than the native Linux version. If you have the Windows version already, save your money and run it on Wine.") That's praise of sorts... although I hope it doesn't dissuade other vendors from doing native ports. - Dan

14 20

Testcase - a windows run, please?
by Erik Inge Bolsø 14 Sep '08

14 Sep '08

Could someone run this testcase on native windows for me, please? :) kernel32: fix PROFILE_Load to handle mac line endings Fixes bug 15281. With testcase. --- dlls/kernel32/profile.c | 3 +- dlls/kernel32/tests/profile.c | 268 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 270 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 22d4cb5..850f3cc 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -407,6 +407,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) { szLineStart = next_line; next_line = memchrW(szLineStart, '\n', szEnd - szLineStart); + if (!next_line) next_line = memchrW(szLineStart, '\r', szEnd - szLineStart); if (!next_line) next_line = szEnd; else next_line++; szLineEnd = next_line; @@ -415,7 +416,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) /* get rid of white space */ while (szLineStart < szLineEnd && PROFILE_isspaceW(*szLineStart)) szLineStart++; - while ((szLineEnd > szLineStart) && ((szLineEnd[-1] == '\n') || PROFILE_isspaceW(szLineEnd[-1]))) szLineEnd--; + while ((szLineEnd > szLineStart) && ((szLineEnd[-1] == '\n') || (szLineEnd[-1] == '\r') || PROFILE_isspaceW(szLineEnd[-1]))) szLineEnd--; if (szLineStart >= szLineEnd) continue; diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 8a3e83b..1cc963c 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -694,6 +694,273 @@ static void test_GetPrivateProfileString(void) DeleteFileA(filename); } +/* as above, but cr-only terminated lines */ +static void test_cr(void) +{ + DWORD ret; + CHAR buf[MAX_PATH]; + CHAR def_val[MAX_PATH]; + CHAR path[MAX_PATH]; + CHAR windir[MAX_PATH]; + /* NT series crashes on r/o empty strings, so pass an r/w + empty string and check for modification */ + CHAR emptystr[MAX_PATH] = ""; + LPSTR tempfile; + + static const char filename[] = ".\\winetest.ini"; + static const char content[]= + "[section1]\r" + "name1=val1\r" + "name2=\"val2\"\r" + "name3\r" + "name4=a\r" + "[section2]\r"; + + create_test_file(filename, content, sizeof(content)); + + /* Run this test series with caching. Wine won't cache profile + files younger than 2.1 seconds. */ + Sleep(2500); + + /* lpAppName is NULL */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA(NULL, "name1", "default", + buf, MAX_PATH, filename); + ok(ret == 18, "Expected 18, got %d\n", ret); + ok(!memcmp(buf, "section1\0section2\0", ret + 1), + "Expected \"section1\\0section2\\0\", got \"%s\"\n", buf); + + /* lpAppName is empty */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA(emptystr, "name1", "default", + buf, MAX_PATH, filename); + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); + ok(emptystr_ok(emptystr), "AppName modified\n"); + + /* lpAppName is missing */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("notasection", "name1", "default", + buf, MAX_PATH, filename); + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); + + /* lpAppName is empty, lpDefault is NULL */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA(emptystr, "name1", NULL, + buf, MAX_PATH, filename); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(emptystr_ok(emptystr), "AppName modified\n"); + + /* lpAppName is empty, lpDefault is empty */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA(emptystr, "name1", "", + buf, MAX_PATH, filename); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(emptystr_ok(emptystr), "AppName modified\n"); + + /* lpAppName is empty, lpDefault has trailing blank characters */ + lstrcpyA(buf, "kumquat"); + /* lpDefault must be writable (trailing blanks are removed inplace in win9x) */ + lstrcpyA(def_val, "default "); + ret = GetPrivateProfileStringA(emptystr, "name1", def_val, + buf, MAX_PATH, filename); + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); + ok(emptystr_ok(emptystr), "AppName modified\n"); + + /* lpAppName is empty, many blank characters in lpDefault */ + lstrcpyA(buf, "kumquat"); + /* lpDefault must be writable (trailing blanks are removed inplace in win9x) */ + lstrcpyA(def_val, "one two "); + ret = GetPrivateProfileStringA(emptystr, "name1", def_val, + buf, MAX_PATH, filename); + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "one two"), "Expected \"one two\", got \"%s\"\n", buf); + ok(emptystr_ok(emptystr), "AppName modified\n"); + + /* lpAppName is empty, blank character but not trailing in lpDefault */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA(emptystr, "name1", "one two", + buf, MAX_PATH, filename); + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "one two"), "Expected \"one two\", got \"%s\"\n", buf); + ok(emptystr_ok(emptystr), "AppName modified\n"); + + /* lpKeyName is NULL */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", NULL, "default", + buf, MAX_PATH, filename); + ok(ret == 18, "Expected 18, got %d\n", ret); + ok(!memcmp(buf, "name1\0name2\0name4\0", ret + 1), + "Expected \"name1\\0name2\\0name4\\0\", got \"%s\"\n", buf); + + /* lpKeyName is empty */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", emptystr, "default", + buf, MAX_PATH, filename); + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); + ok(emptystr_ok(emptystr), "KeyName modified\n"); + + /* lpKeyName is missing */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", "notakey", "default", + buf, MAX_PATH, filename); + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); + + /* lpKeyName is empty, lpDefault is NULL */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", emptystr, NULL, + buf, MAX_PATH, filename); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(emptystr_ok(emptystr), "KeyName modified\n"); + + /* lpKeyName is empty, lpDefault is empty */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", emptystr, "", + buf, MAX_PATH, filename); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(emptystr_ok(emptystr), "KeyName modified\n"); + + /* lpKeyName is empty, lpDefault has trailing blank characters */ + lstrcpyA(buf, "kumquat"); + /* lpDefault must be writable (trailing blanks are removed inplace in win9x) */ + lstrcpyA(def_val, "default "); + ret = GetPrivateProfileStringA("section1", emptystr, def_val, + buf, MAX_PATH, filename); + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); + ok(emptystr_ok(emptystr), "KeyName modified\n"); + + if (0) /* crashes */ + { + /* lpReturnedString is NULL */ + ret = GetPrivateProfileStringA("section1", "name1", "default", + NULL, MAX_PATH, filename); + } + + /* lpFileName is NULL */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", "name1", "default", + buf, MAX_PATH, NULL); + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); + + /* lpFileName is empty */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", "name1", "default", + buf, MAX_PATH, ""); + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); + + /* lpFileName is nonexistent */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", "name1", "default", + buf, MAX_PATH, "nonexistent"); + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); + + /* nSize is 0 */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", "name1", "default", + buf, 0, filename); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(!lstrcmpA(buf, "kumquat"), "Expected buf to be unchanged, got \"%s\"\n", buf); + + /* nSize is exact size of output */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", "name1", "default", + buf, 4, filename); + ok(ret == 3, "Expected 3, got %d\n", ret); + ok(!lstrcmpA(buf, "val"), "Expected \"val\", got \"%s\"\n", buf); + + /* nSize has room for NULL terminator */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", "name1", "default", + buf, 5, filename); + ok(ret == 4, "Expected 4, got %d\n", ret); + ok(!lstrcmpA(buf, "val1"), "Expected \"val1\", got \"%s\"\n", buf); + + /* output is 1 character */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", "name4", "default", + buf, MAX_PATH, filename); + ok(ret == 1, "Expected 1, got %d\n", ret); + ok(!lstrcmpA(buf, "a"), "Expected \"a\", got \"%s\"\n", buf); + + /* output is 1 character, no room for NULL terminator */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", "name4", "default", + buf, 1, filename); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + + /* lpAppName is NULL, not enough room for final section name */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA(NULL, "name1", "default", + buf, 16, filename); + ok(ret == 14, "Expected 14, got %d\n", ret); + ok(!memcmp(buf, "section1\0secti\0", ret + 1), + "Expected \"section1\\0secti\\0\", got \"%s\"\n", buf); + + /* lpKeyName is NULL, not enough room for final key name */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", NULL, "default", + buf, 16, filename); + ok(ret == 14, "Expected 14, got %d\n", ret); + ok(!memcmp(buf, "name1\0name2\0na\0", ret + 1), + "Expected \"name1\\0name2\\0na\\0\", got \"%s\"\n", buf); + + /* key value has quotation marks which are stripped */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", "name2", "default", + buf, MAX_PATH, filename); + ok(ret == 4, "Expected 4, got %d\n", ret); + ok(!lstrcmpA(buf, "val2"), "Expected \"val2\", got \"%s\"\n", buf); + + /* case does not match */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", "NaMe1", "default", + buf, MAX_PATH, filename); + ok(ret == 4, "Expected 4, got %d\n", ret); + ok(!lstrcmpA(buf, "val1"), "Expected \"val1\", got \"%s\"\n", buf); + + /* only filename is used */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", "NaMe1", "default", + buf, MAX_PATH, "winetest.ini"); + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); + + GetWindowsDirectoryA(windir, MAX_PATH); + GetTempFileNameA(windir, "pre", 0, path); + tempfile = strrchr(path, '\\') + 1; + create_test_file(path, content, sizeof(content)); + + /* only filename is used, file exists in windows directory */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", "NaMe1", "default", + buf, MAX_PATH, tempfile); + ok(ret == 4, "Expected 4, got %d\n", ret); + ok(!lstrcmpA(buf, "val1"), "Expected \"val1\", got \"%s\"\n", buf); + + /* successful case */ + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("section1", "name1", "default", + buf, MAX_PATH, filename); + ok(ret == 4, "Expected 4, got %d\n", ret); + ok(!lstrcmpA(buf, "val1"), "Expected \"val1\", got \"%s\"\n", buf); + + DeleteFileA(path); + DeleteFileA(filename); +} + START_TEST(profile) { test_profile_int(); @@ -704,4 +971,5 @@ START_TEST(profile) test_profile_delete_on_close(); test_profile_refresh(); test_GetPrivateProfileString(); + test_cr(); } -- 1.5.4.3

1 0

RATS security analysis
by Austin English 14 Sep '08

14 Sep '08

Howdy, Since static analysis seems to have gotten more popular recently, I ran RATS (http://www.fortify.com/security-resources/rats.jsp) on Wine. I uploaded the results to: http://winezeug.googlecode.com/svn/trunk/rats_output.txt I'm working on trying Oink!, which is supposed to be pretty good, but I can't get it to compile correctly...I'm still fiddling with it. -Austin

1 0

Re: [oleaut32/tests] Don't crash on Win95
by Dmitry Timoshkov 13 Sep '08

13 Sep '08

"Paul Vriens" <paul.vriens.wine(a)gmail.com> wrote: > CP_UTF8 is not supported on Win95 (without the Unicode layer) and > continuing will lead to a crash (no filename that leads to typelib == NULL). UTF-8 is not needed in that test at all, it would be better to just replace CP_UTF8 by CP_ACP. -- Dmitry.

1 0

Re: oleacc: implemented GetRoleText[A/W]
by Dmitry Timoshkov 13 Sep '08

13 Sep '08

"Nikolay Sivov" <bunglehead(a)gmail.com> wrote: > +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, > + LPVOID lpvReserved) > +{ > + TRACE("%p, %d, %p\n", hinstDLL, fdwReason, lpvReserved); > + > + switch (fdwReason) > + { > + case DLL_PROCESS_ATTACH: > + oleacc_handle = hinstDLL; > + break; > + } > + return TRUE; > +} Why don't you call DisableThreadLibraryCalls() if you don't use the thread callouts? > +UINT WINAPI GetRoleTextW(DWORD role, LPWSTR lpRole, UINT rolemax) > +{ > + HGLOBAL hmem; > + HRSRC hrsrc; > + unsigned int id; > + const WCHAR *p; > + INT ret; > + > + TRACE("%u %p %u\n", role, lpRole, rolemax); > + > + hrsrc = FindResourceW(oleacc_handle, MAKEINTRESOURCEW((LOWORD(role) >> 4) + 1), > + (LPWSTR)RT_STRING); > + if (!hrsrc) return 0; > + hmem = LoadResource(oleacc_handle, hrsrc); > + if (!hmem) return 0; > + > + p = LockResource(hmem); > + id = role & 0x000f; > + while (id--) p += *p + 1; > + > + /* return role text length */ > + if(!lpRole) > + return *p; > + > + ret = LoadStringW(oleacc_handle, role, lpRole, rolemax); > + if(!(ret > 0)) > + return 0; > + > + return ret; > +} Why not just use LoadStringW directly? > +UINT WINAPI GetRoleTextA(DWORD role, LPSTR lpRole, UINT rolemax) > +{ > + INT ret; > + > + TRACE("%u %p %u\n", role, lpRole, rolemax); > + > + /* get length (without trailing NULL) */ > + ret = GetRoleTextW(role, NULL, rolemax); > + > + if(!lpRole) > + return ret; GetRoleTextW above should be called only for the !lpRole case. And better to actually call GetRoleTextA. > + return LoadStringA(oleacc_handle, role, lpRole, min(rolemax, ret + 1)); Why not just use rolemax in the LoadStringA call? Introducing the IDS_ROLE_SYSTEM_xxx identifiers is completely redundant, use the ROLE_SYSTEM_xxx values directly instead. -- Dmitry.

2 2

Re: kernel32/test: Test import entries of a core windows DLLs (Revision 4)
by Paul Vriens 12 Sep '08

12 Sep '08

> > This revision uses GetModuleHandle instead of LoadLibrary, and folds > the introduction of the new test patch and breaking tests into their > own bodies patch into a single patch. > > The prior version of this patch is available for reference at: > http://www.winehq.org/pipermail/wine-patches/2008-September/ > 061357.html > http://www.winehq.org/pipermail/wine-patches/2008-September/ > 061358.html > --- > dlls/kernel32/tests/loader.c | 81 +++++++++++++++++++++++++++++++++ > ++++++++- > 1 files changed, 80 insertions(+), 1 deletions(-) > <e74416df81e0e57b11bf7761808510ab4b7cb11c.diff> You are still using LoadLibrary. Cheers, Paul

1 0

Re: kernel32/test: Test import entries of a core windows DLLs (Revision 4)
by Paul Vriens 12 Sep '08

12 Sep '08

Sent from my iPod On Sep 12, 2008, at 21:07, Roy Shea <royshea(a)gmail.com> wrote: > > This revision uses GetModuleHandle instead of LoadLibrary, and folds > the introduction of the new test patch and breaking tests into their > own bodies patch into a single patch. > > The prior version of this patch is available for reference at: > http://www.winehq.org/pipermail/wine-patches/2008-September/ > 061357.html > http://www.winehq.org/pipermail/wine-patches/2008-September/ > 061358.html > --- > dlls/kernel32/tests/loader.c | 81 +++++++++++++++++++++++++++++++++ > ++++++++- > 1 files changed, 80 insertions(+), 1 deletions(-) > <e74416df81e0e57b11bf7761808510ab4b7cb11c.diff> >

1 0

Re: d3dx8 [patch 1/2, try 2]: Implement D3DXGetFVFVertexSize
by winepatches＠kegel.com 12 Sep '08

12 Sep '08

> This is a patch from Luis Busquets. were you also going to send 2/2?

1 0

Re: [PATCH] annotate more with buffer size
by Alexandre Julliard 12 Sep '08

12 Sep '08

Marcus Meissner <meissner(a)suse.de> writes: > @@ -91,11 +91,11 @@ typedef HRESULT (STDMETHODCALLTYPE MAPILOGONEX)(ULONG_PTR,LPSTR,LPSTR,ULONG,LPMA > typedef MAPILOGONEX *LPMAPILOGONEX; > MAPILOGONEX MAPILogonEx; > > -typedef SCODE (WINAPI MAPIALLOCATEBUFFER)(ULONG,LPVOID*); > +typedef SCODE (__WINE_ALLOC_SIZE(1) WINAPI MAPIALLOCATEBUFFER)(ULONG,LPVOID*); > typedef MAPIALLOCATEBUFFER *LPMAPIALLOCATEBUFFER; > MAPIALLOCATEBUFFER MAPIAllocateBuffer; > > -typedef SCODE (WINAPI MAPIALLOCATEMORE)(ULONG,LPVOID,LPVOID*); > +typedef SCODE (__WINE_ALLOC_SIZE(1) WINAPI MAPIALLOCATEMORE)(ULONG,LPVOID,LPVOID*); > typedef MAPIALLOCATEMORE *LPMAPIALLOCATEMORE; > MAPIALLOCATEMORE MAPIAllocateMore; I don't think it's useful to annotate functions that don't return a pointer. > @@ -1393,7 +1393,7 @@ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, PCWSTR cmdline > BOOL WINAPI IsUserAdmin(VOID); > PWSTR WINAPI MultiByteToUnicode(PCSTR lpMultiByteStr, UINT uCodePage); > VOID WINAPI MyFree(PVOID lpMem); > -PVOID WINAPI MyMalloc(DWORD dwSize); > +PVOID WINAPI MyMalloc(DWORD dwSize) __WINE_ALLOC_SIZE(1); > PVOID WINAPI MyRealloc(PVOID lpSrc, DWORD dwSize); > DWORD WINAPI OpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID *); > LONG WINAPI QueryRegistryValue(HKEY, PCWSTR, PBYTE *, PDWORD, PDWORD); Any reason you are not annotating the various realloc functions too? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [try 2][PATCH 2/2] user32: Fixed minimal size of child windows.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Florian Köberle <FloriansKarten(a)web.de> writes: > diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c > index 21e1554..79140a0 100644 > --- a/dlls/user32/winpos.c > +++ b/dlls/user32/winpos.c > @@ -708,14 +708,16 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, > > MinMax.ptMaxSize.x = rc.right - rc.left; > MinMax.ptMaxSize.y = rc.bottom - rc.top; > + MinMax.ptMinTrackSize.x = 6; > + MinMax.ptMinTrackSize.y = 6; You should figure out why the current computation doesn't yield the right values. It certainly shouldn't be hardcoded to 6. -- Alexandre Julliard julliard(a)winehq.org

1 0

Coverity and Wine (was: re: Adding Flawfinder to Patchwatcher)
by Dan Kegel 12 Sep '08

12 Sep '08

Jason wrote: > I'm pretty sure Coverity's tool, Prevent, costs money to buy. > IIRC if the maintainers of an OSS project ask them to, > they will set their http://scan.coverity.com server to > run a scan on that project's code and upload > the scan results to the web at no charge And they in fact do this for Wine. We've fixed a number of issues it found, see e.g. http://marc.info/?l=wine-patches&w=2&r=1&s=coverity&q=b There are lots more to fix. The last scan they did was in late May, though. They say they migrated to new servers and have been slowly bringing up all the OSS scans again. They haven't given a target date for having Wine's scan back online yet. - Dan

6 7

Re: xinput implementation
by Andrew Fenn 12 Sep '08

12 Sep '08

On Fri, Sep 12, 2008 at 1:04 AM, chourmovs vs <chourmovs(a)gmail.com> wrote: > No sorry > No time and no skill for that, but maybe i could help doing some tests > In that case I will have a try at implementing it. Can someone have a look at this patch I made and offer any advice on where I may be going wrong (incorrect syntax, etc). This patch lets me load Assassin's Creed without complaining about missing the native dll (it's a start I guess), problem is that Assassin's Creed is so slow it's impossible to use for testing with a joystick. Regards, Andrew

3 3

Re: Patchwatcher: patchwatcher bug: Try number 2 drawprim.c drawStridedSlow
by Henri Verbeet 12 Sep '08

12 Sep '08

2008/9/11 Chris Ahrendt <celticht32(a)aol.com>: > Ok what now.... I did a git to get the latest tree... I generated the > patch off the latest tree.. and submitted it again... what I am failing. > so I can fix it =).. the code compiles just fine and runs on my machine > so not sure... > > chris > The patch is not against current git, it's against an earlier version of your patch. More importantly though, the patch is completely unacceptable. You really need to try to get a better understanding of how D3D vertex declarations work, and what the different D3DDECLTYPE values mean.

3 4

Wine mouse input: Fwd: [RFC] Preliminary XI 2 feature list
by Roderick Colenbrander 12 Sep '08

12 Sep '08

Hi all, Today Peter Hutterer posted a preliminary feature list of Xinput 2. I have forwarded the email to here so that Vitaly and others can check it out and see if it offers what we need in Wine. If you have comments I would send them to the xorg list. Regards, Roderick Colenbrander --- Xorg mail --- Subject: [RFC] Preliminary XI 2 feature list Following XDS, various notes, the discussions and preliminary executive decisions by me, here's a first draft of XI2 features. If you have anything to add, please speak up. Time-line: I'd like to get it into server 1.6 but it doesn't look particularly likely. 7.5 is more likely. - Compatibility with XI 1.x, although some requests will be deactivated or of limited functionality. - 16 bit device IDs - All events available as XGE events. - Event selection through event masks (instead or in addition to the event classes). i.e. the common cases of "select from all devices" and "select from all master devices" will be simplified. - Devices may have relative + absolute axes simultaneously, and change the mode on any of these axes at runtime. - Relative coordinates as a separate event. - 32 bit keycodes (reliant on XKB2) - ListInputDevices will include the currently attached Slave - Axis and button labelling through device properties. - subpixel resolution (from relative devices) available to clients. i.e. you get the data in screen coordinates, but with subpixel resolution available as fixed floating point. - no window access protocol, this will be thrown out. - dynamic device classes - device may add/remove classes at runtime. - aspect-ratio scaling of valuators. Probable implementation details: - libXi: "namespacing": i.e. X<dosomething> will be XI<dosomething> - server-internal use of XGE events, XI 1.x events emulated when needed. - some standardisation on axis label Atom names. - Clients have to announce XI2 support, otherwise they will be treated as XI 1.x clients. Once the feature discussion is complete, I'll get a protocol spec out. Cheers, Peter _______________________________________________ xorg mailing list xorg(a)lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg -- Psssst! Schon das coole Video vom GMX MultiMessenger gesehen? Der Eine für Alle: http://www.gmx.net/de/go/messenger03

2 4

Re: d3dx8 [patch 1/2]: Implement D3DXGetFVFVertexSize
by Henri Verbeet 11 Sep '08

11 Sep '08

> + switch (FVF & 0xe) You should use D3DFVF_POSITION_MASK instead of 0xe here. > + texture = FVF >> 16; > + > + for (i = 0; i < ((FVF&D3DFVF_TEXCOUNT_MASK) >> D3DFVF_TEXCOUNT_SHIFT); i++) > + { > + switch (texture & 3) > + { > + case D3DFVF_TEXTUREFORMAT1: > + size = size + sizeof(FLOAT); > + break; > + case D3DFVF_TEXTUREFORMAT2: > + size = size + sizeof(FLOAT) * 2; > + break; > + case D3DFVF_TEXTUREFORMAT3: > + size = size + sizeof(FLOAT) * 3; > + break; > + case D3DFVF_TEXTUREFORMAT4: > + size = size + sizeof(FLOAT) * 4; > + break; > + default: > + break; > + } > + texture = texture >> 2; > + } It's not completely obvious where you get the different shifts and masks here, a comment wouldn't hurt.

1 0

Re: dplayx: Fix static overrun of pDP array in test. (Coverity)
by Kai Blin 11 Sep '08

11 Sep '08

On Thursday 11 September 2008 20:50:58 Ismael Barros wrote: > On 9/10/08, Kai Blin <kai.blin(a)gmail.com> wrote: > > --- > > dlls/dplayx/tests/dplayx.c | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > Sorry for the delay, I should have checked this before. I hadn't even > read the coverity thread. > > The patch is incorrect, because EnumSessions_cb_join always receives a > LPDIRECTPLAY4 as lpContext argument, even if most callbacks receive a > lpCallbackData. The initialization of callbackData before the call was > an error on my side. > > This patch fixes the double error. Just the reason why I cc'ed you on this patch. :) Thanks, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton.

1 0

Buffer overrun in dlls/riched20/editor.c
by Juan Lang 11 Sep '08

11 Sep '08

Hi Dylan, commit 11c80396995065701205f2facb3dba10a6f8170f[1] introduced a buffer overrun in riched20's editor.c. Here's the hunk that did it: @@ -666,35 +661,83 @@ static void ME_RTFParAttrHook(RTF_Info *info) static void ME_RTFTblAttrHook(RTF_Info *info) { - ME_DisplayItem *para; - switch (info->rtfMinor) { case rtfRowDef: - RTFFlushOutputBuffer(info); - para = ME_GetParagraph(info->editor->pCursors[0].pRun); - - /* Release possibly inherited cell definitions */ - ME_DestroyTableCellList(para); - - para->member.para.pCells = ALLOC_OBJ(ME_TableCell); - para->member.para.pCells->nRightBoundary = 0; - para->member.para.pCells->next = NULL; - para->member.para.pLastCell = para->member.para.pCells; + if (!info->tableDef) + info->tableDef = ALLOC_OBJ(RTFTable); + ZeroMemory(info->tableDef, sizeof(RTFTable)); break; case rtfCellPos: + if (!info->tableDef) + { + info->tableDef = ALLOC_OBJ(RTFTable); + ZeroMemory(info->tableDef, sizeof(RTFTable)); + } + if (info->tableDef->numCellsDefined >= MAX_TABLE_CELLS) + break; + info->tableDef->cells[info->tableDef->numCellsDefined].rightBoundary = info->rtfParam; + { + /* Tab stops store the cell positions. */ + ME_DisplayItem *para = ME_GetParagraph(info->editor->pCursors[0].pRun); + PARAFORMAT2 *pFmt = para->member.para.pFmt; + int cellNum = info->tableDef->numCellsDefined; + pFmt->rgxTabs[cellNum] &= ~0x00FFFFFF; + pFmt->rgxTabs[cellNum] = 0x00FFFFFF & info->rtfParam; The trouble is, numCellsDefined is only guaranteed to be less than MAX_TABLE_CELLS (defined as 63 in include/richedit.h), while rgxTabs is of size MAX_TAB_STOPS, or 32. I'm not sure what the correct fix is. Would you mind having a look? For what it's worth, this is Coverity id 727. Thanks, --Juan 1: http://source.winehq.org/git/wine.git/?a=commit;h=11c80396995065701205f2fac…

2 1

Buffer overrun in dlls/riched20/editor.c
by Juan Lang 11 Sep '08

11 Sep '08

Hi Dylan, commit 11c80396995065701205f2facb3dba10a6f8170f[1] introduced a buffer overrun in riched20's editor.c. Here's the hunk that did it: @@ -666,35 +661,83 @@ static void ME_RTFParAttrHook(RTF_Info *info) static void ME_RTFTblAttrHook(RTF_Info *info) { - ME_DisplayItem *para; - switch (info->rtfMinor) { case rtfRowDef: - RTFFlushOutputBuffer(info); - para = ME_GetParagraph(info->editor->pCursors[0].pRun); - - /* Release possibly inherited cell definitions */ - ME_DestroyTableCellList(para); - - para->member.para.pCells = ALLOC_OBJ(ME_TableCell); - para->member.para.pCells->nRightBoundary = 0; - para->member.para.pCells->next = NULL; - para->member.para.pLastCell = para->member.para.pCells; + if (!info->tableDef) + info->tableDef = ALLOC_OBJ(RTFTable); + ZeroMemory(info->tableDef, sizeof(RTFTable)); break; case rtfCellPos: + if (!info->tableDef) + { + info->tableDef = ALLOC_OBJ(RTFTable); + ZeroMemory(info->tableDef, sizeof(RTFTable)); + } + if (info->tableDef->numCellsDefined >= MAX_TABLE_CELLS) + break; + info->tableDef->cells[info->tableDef->numCellsDefined].rightBoundary = info->rtfParam; + { + /* Tab stops store the cell positions. */ + ME_DisplayItem *para = ME_GetParagraph(info->editor->pCursors[0].pRun); + PARAFORMAT2 *pFmt = para->member.para.pFmt; + int cellNum = info->tableDef->numCellsDefined; + pFmt->rgxTabs[cellNum] &= ~0x00FFFFFF; + pFmt->rgxTabs[cellNum] = 0x00FFFFFF & info->rtfParam; The trouble is, numCellsDefined is only guaranteed to be less than MAX_TABLE_CELLS (defined as 63 in include/richedit.h), while rgxTabs is of size MAX_TAB_STOPS, or 32. I'm not sure what the correct fix is. Would you mind having a look? For what it's worth, this is Coverity id 727. Thanks, --Juan 1: http://source.winehq.org/git/wine.git/?a=commit;h=11c80396995065701205f2fac…

1 0

Re: xinput implementation
by Andrew Fenn 11 Sep '08

11 Sep '08

Hi, I was wondering how you were coming with your implementation of xinput1_3.dll ? It sounds quite interesting although I would personally prefer the wine implementation to be able to use all joysticks and not just Xbox 360 controllers. Perhaps another configuration screen could be added to winecfg so that you can map your own joystick/joysticks controls to the key codes that are returned by XInputGetKeystroke? Regards, Andrew

1 0

Re: richedit: Avoid acting on control words in skipped RTF groups (Bug 15227) [try 2]
by Dylan Smith 11 Sep '08

11 Sep '08

It seems like I somehow missed the fact that patch was already accepted on the first try, however I still ended up rebasing the patch against the origin. I'll resend it anyways, since the commit message needs to be changed. On Thu, Sep 11, 2008 at 10:34 AM, Dylan Smith <dylan.ah.smith(a)gmail.com>wrote: > Previously the control words in skipped groups were being processed by > the read hook on the RTF parser. By moving this code into the class > callbacks for the parser, the skipped groups actually remain skipped. > > An example of a skipped group is a optional destination that isn't > recognized by the parser. The RTF specifications say to ignore these > groups, and native richedit controls act accordingly. > > This patch fixes bug 15227 which was caused by the \itap4 control word > in a destination which caused an unterminated table, since this control > word changes the nesting level by starting nested tables to reach that > nesting level. > > Changes for try 2: > Added in a destination callback for nesttableprops to avoid it being > ignored. Otherwise this patch would cause a regression where the > default table properties would be used for nested tables. > --- > dlls/riched20/editor.c | 3 +++ > dlls/riched20/reader.c | 10 ++++++++++ > dlls/riched20/rtf.h | 1 + > 3 files changed, 14 insertions(+), 0 deletions(-) >

1 0

Re: d3dx9_36: Fix the tests for native Windows.
by Tony 11 Sep '08

11 Sep '08

Hi, At least for all Windows versions below Vista, the d3dx9 importlib does exist (and d3dx9_36 does not), so either something is screwed up with your system or Vista is handling it otherwise (in that case we need another solution though). Best regards, Tony

4 8

OT: linux market share trend data
by Dan Kegel 11 Sep '08

11 Sep '08

I finally threw together a summary of four sources of linux market share data, see http://kegel.com/linux/marketshare.html

1 0

Re: richedit: Avoid acting on control words in skipped RTF groups (Bug 15227)
by Dylan Smith 11 Sep '08

11 Sep '08

I noticed that this introduced a glitch, because I didn't have a destination callback for the \nesttableprops control word. This led to it being ignored, so nested tables would take on default properties. I will update this patch to fix this glitch and then resend it. On Wed, Sep 10, 2008 at 10:54 PM, Dylan Smith <dylan.ah.smith(a)gmail.com>wrote: > Previously the control words in skipped groups were being processed by > the read hook on the RTF parser. By moving this code into the class > callbacks for the parser, the skipped groups actually remain skipped. > > An example of a skipped group is a optional destination that isn't > recognized by the parser. The RTF specifications say to ignore these > groups, and native richedit controls act accordingly. > > This patch fixes bug 15227 which was caused by the \itap4 control word > in a destination which caused an unterminated table, since this control > word changes the nesting level by starting nested tables to reach that > nesting level. > --- > dlls/riched20/editor.c | 28 ++++++---------------------- > dlls/riched20/editor.h | 6 ++++++ > dlls/riched20/reader.c | 8 ++++++++ > 3 files changed, 20 insertions(+), 22 deletions(-) >

1 0

Re: winex11.drv: Add support for _NET_WORKAREA
by Alexandre Julliard 11 Sep '08

11 Sep '08

Dmitry Timoshkov <dmitry(a)codeweavers.com> writes: > SetRect( &rect, 0, 0, width, height ); > + rc_work = rect; > > - if (root_window != DefaultRootWindow( gdi_display ) || !query_screens()) > + if (!XGetWindowProperty( gdi_display, DefaultRootWindow(gdi_display), x11drv_atom(_NET_WORKAREA), 0, > + ~0, False, XA_CARDINAL, &type, &format, &count, > + &remaining, (unsigned char **)&work_area )) > { > - default_monitor.rcWork = default_monitor.rcMonitor = rect; > + if (type == XA_CARDINAL && format == 32 && count >= 4) > + { > + SetRect( &rc_work, work_area[0], work_area[1], > + work_area[0] + work_area[2], work_area[1] + work_area[3] ); > + } > + XFree( work_area ); > + } > + > + if (root_window != DefaultRootWindow( gdi_display ) || !query_screens( &rc_work )) > + { > + default_monitor.rcMonitor = rect; > + default_monitor.rcWork = rc_work; That won't do the right thing in desktop mode. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winemenubuilder: eliminate wineshelllink (try 3)
by Alexandre Julliard 11 Sep '08

11 Sep '08

"Damjan Jovanovic" <damjan.jov(a)gmail.com> writes: > + /* winemenubuilder_semaphore ensures mutual exclusion for the temp file */ > + tempfilename = heap_printf("%s/next-wine-menu.temp", xdg_config_dir); That's not good enough, the config dir is global to all Wine instances. You really need safe temp file creation. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 02/14] inetcomm: Add a stub MimeInternational object.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Huw Davies <huw(a)codeweavers.com> writes: > @@ -8,6 +8,7 @@ IMPORTS = uuid ole32 ws2_32 user32 advapi32 kernel32 > > C_SRCS = \ > inetcomm_main.c \ > + internat.c \ > internettransport.c \ > mimeole.c \ > regsvr.c I find that abbreviating 'international' as 'internat' is a bit confusing, especially in a dll that also uses 'internet' in various places. Would you mind changing it to mimeintl.c or something like that? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: crypt32: Fix a failing test in win9x
by Paul Vriens 11 Sep '08

11 Sep '08

James Hawkins wrote: > Hi, > > Changelog: > * Fix a failing test in win9x. > > dlls/crypt32/tests/ctl.c | 15 +++++++++++---- > 1 files changed, 11 insertions(+), 4 deletions(-) > > > > ------------------------------------------------------------------------ > > The !ret in: + else + { + ok(!ret && GetLastError() == CRYPT_E_EXISTS, + "expected CRYPT_E_EXISTS, got %d %08x\n", ret, GetLastError()); + } is superfluous. -- Cheers, Paul.

2 2

Re: [setupapi/tests] Fix a failure on Windows 2000
by James Hawkins 11 Sep '08

11 Sep '08

On Wed, Sep 10, 2008 at 10:03 AM, Paul Vriens <paul.vriens.wine(a)gmail.com> wrote: > Hi, > > W2K doesn't fail with ERROR_INVALID_NAME but with ERROR_GENERAL_SYNTAX > (setupapi > error). > That error was added for a reason; it was seen on a win2k box. Please don't remove it. -- James Hawkins

2 2

Re: [PATCH 1/2] kernel32/test: Test import entries of a core windowsDLLs (Revision 2)
by Dmitry Timoshkov 11 Sep '08

11 Sep '08

"Roy Shea" <royshea(a)gmail.com> wrote: > This revision places the new test with the other loader tests in > loader.c, and for testing loads kernel32.dll rather than riched20.dll Please move an existing and new tests to their own bodies, and use GetModuleHandle instead of LoadLibrary. -- Dmitry.

1 0

Re: devenum: Fix order of operations bug (Coverity id 709)
by Chris Robinson 10 Sep '08

10 Sep '08

On Wednesday 10 September 2008 11:34:03 am Juan Lang wrote: > dwMediaTypeSize + (dwMediaTypeSize < 2 ? 1 : dwMediaTypeSize / 2) I'm pretty sure this would come out as: dwMediaTypeSize + (dwMediaTypeSize < (2 ? 1 : dwMediaTypeSize) / 2) But even if it doesn't, I don't think it'd hurt to be more explicit: dwMediaTypeSize + ((dwMediaTypeSize < 2) ? 1 : (dwMediaTypeSize/2))

3 3

Re: [PATCH] static buffer overflow checking
by Michael Karcher 10 Sep '08

10 Sep '08

Am Mittwoch, den 10.09.2008, 22:12 +0200 schrieb Marcus Meissner: > This approach will not work with -O0, which might be a problem. If I were to decide, that would kill the patch. I really like to recompile the dlls I am currently debugging with -O0, as that makes following the code flow much easier. Having MultiByteToWideChar calls fail in that case seems to make recompilation of most DLLs (that export A and W functions) with -O0 impossible. Regards, Michael Karcher

3 3

Re: [jscript/tests] Prevent a crash on win9x
by Jacek Caban 10 Sep '08

10 Sep '08

Paul Vriens wrote: > Hi, > > This at least prevents the crash on win9x. There are still numerous > failures on > win9x but they are visible now. (I'm not so sure about returning > S_FALSE in this case btw). IMO it would be better to return error code and break whole test on win9x or find a way to do so before running script. If we wanted to support win9x we'd probably need to add objects representing each function, which is not worth the trouble. Thanks, Jacek

1 0

Re: Fixed an infite loop in winedbg: review wanted
by Eric Pouech 10 Sep '08

10 Sep '08

Florian Köberle a écrit : > Hello > > This patch address the infinite loop found at bug 15209: > http://bugs.winehq.org/show_bug.cgi?id=15209 > > At least one of the lines I moved in the loop doesn't make sense outsite: > count -= min(count, 256); > because the value of count will be always 0 after the loop. > > I also moved the following line which might be at the wrong position > too. About that I am not sure: > + fcp->Start += 256; > > Best regards, > Florian Koeberle > > ------------------------------------------------------------------------ > > looks a correct fix to me (moving both lines) A+ -- Eric Pouech "The problem with designing something completely foolproof is to underestimate the ingenuity of a complete idiot." (Douglas Adams)

1 0

Re: [PATCH 1/2] kernel32/test: Test import entries of a core windows DLLs (Revision 2)
by Paul Vriens 10 Sep '08

10 Sep '08

Roy Shea wrote: > This revision places the new test with the other loader tests in > loader.c, and for testing loads kernel32.dll rather than riched20.dll > > The prior version of this patch is available for reference at: > http://www.winehq.org/pipermail/wine-patches/2008-September/061226.html > --- > dlls/kernel32/tests/loader.c | 72 ++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 72 insertions(+), 0 deletions(-) > > > ------------------------------------------------------------------------ > > Hi, Minor things : typo in "kerenl32_module" and shouldn't you free the library after the test? (Or maybe use GetModuleHandle, or does that defeat the test?) -- Cheers, Paul.

1 0

Patchwatcher security improvements
by Ambroz Bizjak 10 Sep '08

10 Sep '08

Hi, I've abandoned my chroot aproach to improving security in patchwatcher. Instead I've implemented the ability to run untrusted code as a user different than the one running patchwatcher. This is because creating a chroot where Wine could be compiled and tested proved to be too difficult and platform-dependent. I've also added external time limits for running untrusted code. This as a whole should help prevent individual patches from stalling the patch watching process. It very easy to set up. All you need is a low-privileged user (but enough to run the tests, e.g. audio, video groups) and an empty folder where you can write but this user can only read (not your home folder, it shouldn't have access there anyway). To use it, start with a clean patchwatcher and adjust the variables in the patchwatcher.sh, then run "patchwatcher.sh intialize". It will instruct you to run some commands as root (setuid the wrapper). Run initialize again and it should build wine and run baseline tests. Then you can test it by putting a patch in patches/ and issuing the try_one_patch command. To start watching use the continuous_build command. Patch is attached.

4 7

Re: gdi32: Don't crash when copying to an EMF from a NULL bitmap.
by Austin English 10 Sep '08

10 Sep '08

On Mon, Sep 8, 2008 at 3:03 PM, Austin English <austinenglish(a)gmail.com> wrote: > Based on an original patch by Mike McCormack. Rediffed against current > git. Testcase included, passes in WinXP. Fixes bug 4543. > Anything wrong with this one?

2 1

Re: Patchwatcher security improvements
by Ambroz Bizjak 10 Sep '08

10 Sep '08

Dan Kegel wrote: > So the slave can be in another real machine, another virtual machine, or running as another user; anything as long as it can get read/write access to its subdirectory of the shared directory. The problem with your design right now is that you want to run the slave in some isolated environment and expect it to be secure. The build slave itself is a mission-critical process and putting it in a quarantine to run together with untrusted code allows malicious patches to interfere with its operation. This means an attacker can just kill it from inside his patch, causing the whole patch building operation to fail, or corrupt the baseline tree, or send hundreds of fake emails through the slave interface. So I plan to run the build slave itself in a trusted environment, but make it quarantine individual build operations (similar to my previous design with user switching). This way the impact of an attack is highly limited - all it can theoretically do is fake his own patch results.

1 0

Re: Praise of sorts for Wine re Softmaker Office 2008
by Susan Cragin 10 Sep '08

10 Sep '08

>Dan Kegel wrote: >> http://forum.ubuntuusers.de/topic/softmaker-office-2008--eine-alternative--… >> has a review of an office suite named Softmaker Office 2008, >> available for Windows and now also Linux. The review says in part >> >> "Irritiert hat uns, daß die Windows-Version von Office 2008, die >> von Stick gestartet werden kann, unter Wine besser, schneller >> und stabiler läuft, wie die native Office 2008 für Linux. Wer also >> die Windows-Version legal erworben hat, kann hier Geld sparen." >> >> ("It irritated us that the Windows version runs better on Wine >> than the native Linux version. If you have the Windows version >> already, save your money and run it on Wine.") >> >> That's praise of sorts... although I hope it doesn't >> dissuade other vendors from doing native ports. >> - Dan >> > >I noticed the same type of thing when I was playing with DVD Shrink a couple >days ago. Ripping speed in DVD Shrink via Wine was significantly faster than on >Windows. What usually is a 2.5 hour process was about 1.5-1.75 hour process. > >I agree though, hopefully the software vendors will do native ports :). > >-Zac I just attended the convention for the National Verbatim Reporters Association in Savannah, where I demonstrated DNS 9.0 running on WINE with Ubuntu Studio (realtime kernel seems to make a slight difference). All the vendors were impressed, and one said he'd never seen DNS 9 run that fast, that accurately.

1 0

Re: [msi/tests] Create only one log file and delete it afterwards
by James Hawkins 10 Sep '08

10 Sep '08

On Wed, Sep 10, 2008 at 7:39 AM, Paul Vriens <paul.vriens.wine(a)gmail.com> wrote: > Hi, > > Instead of having 200 logfiles we now create one that we can delete > afterwards > as we know the name. This is not to speed up the tests but merely to get rid > of > the log files. > > We have to pass something for the log mode otherwise we would still have > multiple files. > > (It also looks like Wine is still appending to that one file which is not > the > same as on Windows). > > Changelog > Create only one log file and delete it afterwards > Why don't you just disable logging? MsiEnableLog(0, NULL, 0); -- James Hawkins

2 1

Re: Patchwatcher security improvements
by Ambroz Bizjak 10 Sep '08

10 Sep '08

Francois Gouget wrote: > This seems like an almost perfect task for a virtual machine: > * set up you virtual machine to taste > * take a snapshot > * to test a patch, fire up the virtual machine > * have it test the patch > * after the test or when it times out, revert it to the snapshot * rinse (done in the step above), repeat > > This could be done with VirtualBox, but maybe other alternatives based on Xen or KVM or some such would be better. The main issue I see with this is that the OpenGL / DirectSound tests will not run on the real hardware (as usual), but maybe a Xen-like approach could help there. > > It would also make it easy to test on FreeBSD / Solaris, at least if based on something like VirtualBox (not sure about the Xen-like > approaches). Seems like a good idea. I suggest only to use Linux as the host OS and run guests with KVM or VirtualBox, or even UML for Linux builds. Then we can run any OS that uses X as a guest and configure it to use the host's X display (through the virtual network). This should theoretically allow OpenGL through the XGL protocol, but VMGL can also be used if it doesn't work well. And sound hardware would be emulated by the VM software. I think I'll try getting a small Gentoo system to run in UML with a read-only root fs and make it boot as fast as possible. To try a patch, I would give it read access to the master Wine tree on the host, it would copy it to a writable temp folder and try it out. After it's finished or if the external timeout elapses, the UML process will be terminated and all of its writable storage will be reverted.

1 0

Re: explorer.exe: Implement SC_SCREENSAVE by starting xdg-screensaver
by Steven Edwards 10 Sep '08

10 Sep '08

On Wed, Sep 10, 2008 at 7:28 AM, Paul Chitescu <paulc(a)voip.null.ro> wrote: > Changelog: > explorer.exe: Implement SC_SCREENSAVE by starting xdg-screensaver with option > to lock the screen. > > The desktop window reacts to SC_SCREENSAVE by starting the screen saver, just > like it happens in Windows. No action is taken (and returns FALSE) if running > in a virtual desktop. > > Alternatively, a non-zero lparam is used to signal that the screen should be > locked. This cooperates with the user32.dll patch that implements > LockWorkStation(). This is an extension, there is no equivalent in Windows > but all the programs I've seen that trigger the system screen saver set > lparam=0. You forgot to attach the patch. Also you can send both patches together as one diff. There is no reason to split them up in this case. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

Re: [2/3] mshtml: Add tests for get_scrollLeft
by Dan Kegel 10 Sep '08

10 Sep '08

Did you forget a todo_wine? ../../../tools/runtest -q -P wine -M mshtml.dll -T ../../.. -p mshtml_test.exe.so dom.c ... fixme:mshtml:HTMLTextContainer_get_scrollLeft (0x15371b8)->(0x32fd34) dom.c:1077: Test failed: IHTMLTextContainer::get_scrollLeft failed: -1 dom.c:1078: Test failed: unexpected left -1, expected 0 ... make[2]: *** [dom.ok] Error 2 On Tue, Sep 9, 2008 at 8:48 PM, Patchwatcher <patchwatcher(a)kegel.com> wrote: > Hi! This is the experimental automated wine patchwatcher thingy. > The latest git sources were built and tested with your patch > "[2/3] mshtml: Add tests for get_scrollLeft" > Result: the patch failed regression tests. > > You can retrieve the full build results at > http://kegel.com/wine/patchwatcher/results/1347.log > and see the patch as parsed at > http://kegel.com/wine/patchwatcher/results/1347.txt > See > http://kegel.com/wine/patchwatcher/results > for more info. > >

1 0

Re: user32/test Added test about window sizes
by Florian Köberle 10 Sep '08

10 Sep '08

Hi Please don't apply this patch. I will commit an updated version with a fix soon. Thanks, Florian Koeberle

1 0

Re: include: Define sigset_t in pthread.h if HAVE_SIGSET_T isn't defined.
by Paul Vriens 10 Sep '08

10 Sep '08

Rob Shearman wrote: > --- > include/wine/pthread.h | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > > ------------------------------------------------------------------------ > > Hi Rob, MingW has it's own definition of sigset_t (include/sys/types.h) which conflicts with this. Do we need to guard the definition in pthread.h with a "!defined(__MINGW32__)" or is this something that needs to be fixed on the MingW side. (Maybe change our configure?) -- Cheers, Paul.

2 2

Re: typelib: Implement LoadTypeLib16
by Alexandre Julliard 10 Sep '08

10 Sep '08

Detlef Riekenberg <wine.dev(a)web.de> writes: > +HRESULT WINAPI LoadTypeLib16(LPSTR szFile, ITypeLib** pptLib) > { > - FIXME("(%s,%p): stub\n",debugstr_a(szFile),pptLib); > + LPWSTR nameW = NULL; > + HRESULT hr; > + DWORD len; > > - if (pptLib!=0) > - *pptLib=0; > + TRACE("(%s, %p)\n", debugstr_a(szFile), pptLib); > + > + if (szFile) { > + len = MultiByteToWideChar(CP_ACP, 0, szFile, -1, NULL, 0); > + nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); > + MultiByteToWideChar(CP_ACP, 0, szFile, -1, nameW, len); > + } > > - return E_FAIL; > + hr = LoadTypeLib(nameW, pptLib); > + HeapFree(GetProcessHeap(), 0, nameW); > + return hr; Most likely you need to return a 16-bit interface here. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] kernel32/test: Test import entries of a core windows DLL (riched20.dll) (Revision)
by Alexandre Julliard 10 Sep '08

10 Sep '08

Roy Shea <royshea(a)gmail.com> writes: > This revision adds copyright information, removes todo_wine statements > to reflect the current wine head, and fixes an implicit typecast > warning. > --- > dlls/kernel32/tests/Makefile.in | 1 + > dlls/kernel32/tests/loader_image.c | 98 ++++++++++++++++++++++++++++++++++++ > 2 files changed, 99 insertions(+), 0 deletions(-) > create mode 100644 dlls/kernel32/tests/loader_image.c Please merge that into the other loader tests, no need to create a new file. Also you should test this on kernel32.dll, there's no reason to create a dependency on richedit. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/3] mshtml: Implement HTMLElement2 get_scrollLeft (try 2)
by Alexandre Julliard 10 Sep '08

10 Sep '08

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); > + if(NS_SUCCEEDED(nsres)) > + { > + nsres = nsIDOMNSHTMLElement_GetScrollLeft(nselem, &left); > + nsIDOMNSHTMLElement_Release(nselem); > + if(NS_FAILED(nsres)) > + left = 0; > + } > + else > + { > + ERR("Could not get nsIDOMNSHTMLElement interface: %08x\n", nsres); > + } This ERR obviously needs the same treatment as the other one. Also please fix your tab size. -- Alexandre Julliard julliard(a)winehq.org

1 0

re: coverity ... new run finally
by Dan Kegel 10 Sep '08

10 Sep '08

Marcus wrote: > A new Coverity run (274) was done finally, so > we can restart looking at issues ;) > > Still a lot of NULL ptr migration issues which suck > to fix, but well. Yay! Here are the new errors introduced since the end of May, sorted by source file. There are only 23 not in test code: 725 NULL_RETURNS Context_CopyProperties crypt32/context.c 715 FORWARD_NULL CryptMsgGetAndVerifySigner crypt32/msg.c 709 DEADCODE DEVENUM_ReadPinTypes devenum/createdevenum.c 717 FORWARD_NULL DEVENUM_ReadPinTypes devenum/createdevenum.c 726 OVERRUN_STATIC test_EnumGroupsInGroup dplayx/tests/dplayx.c 718 FORWARD_NULL MSI_GetUserInfo msi/msi.c 747 REVERSE_INULL ILockBytes_RemoteReadAt_Stub ole32/ole32_objidl_p.c 748 REVERSE_INULL ILockBytes_RemoteReadAt_Stub ole32/ole32_objidl_p.c 749 REVERSE_INULL ISequentialStream_RemoteRead_Stub ole32/ole32_objidl_p.c 750 REVERSE_INULL ISequentialStream_RemoteRead_Stub ole32/ole32_objidl_p.c 751 REVERSE_INULL IEnumOLEVERB_RemoteNext_Stub ole32/ole32_oleidl_p.c 752 REVERSE_INULL IEnumOLEVERB_RemoteNext_Stub ole32/ole32_oleidl_p.c 373 REVERSE_INULL IDispatch_GetIDsOfNames_Stub oleaut32/oleaut32_oaidl_p.c 753 REVERSE_INULL ITypeLib_RemoteFindName_Stub oleaut32/oleaut32_oaidl_p.c 754 REVERSE_INULL IEnumConnectionPoints_RemoteNext_Stub oleaut32/oleaut32_ocidl_p.c 755 REVERSE_INULL IEnumConnections_RemoteNext_Stub oleaut32/oleaut32_ocidl_p.c 714 FORWARD_NULL MediaSeekingImpl_SetPositions quartz/control.c 713 FORWARD_NULL TestFilter_Create quartz/tests/filtergraph.c 719 FORWARD_NULL ME_FindPixelPos riched20/caret.c 708 DEADCODE array_compute_and_size_conformance rpcrt4/ndr_marshall.c 720 FORWARD_NULL CreateContext wined3d/context.c 721 FORWARD_NULL CreateContext wined3d/context.c 722 FORWARD_NULL test_OpenRequest winhttp/tests/winhttp.c 723 FORWARD_NULL test_SendRequest winhttp/tests/winhttp.c 724 FORWARD_NULL test_WinHttpAddHeaders winhttp/tests/winhttp.c 716 FORWARD_NULL InternetCrackUrlW wininet/internet.c 712 FORWARD_NULL test_mmioOpen winmm/tests/mmio.c 710 FORWARD_NULL ldap_parse_sort_controlW wldap32/parse.c 711 FORWARD_NULL ldap_parse_vlv_controlW wldap32/parse.c Sure would be nice if Coverity could identify the cl which introduced each problem :-) - Dan

6 8

Re: [2/3] mshtml: Add tests for get_scrollLeft
by Alistair Leslie-Hughes 10 Sep '08

10 Sep '08

"Alistair Leslie-Hughes" <leslie_alistair(a)hotmail.com> wrote in message news:48C65494.2010204@hotmail.com... > Hi, > > Changelog: > mshtml: Add tests for get_scrollLeft > > Best Regards > Alistair Leslie-Hughes Hi, Swap the order of patch 2 and 3 and everything all tests will pass ok. Best Regards Alistair Leslie-Hughes

1 0

re: Debugging applications running on wine
by Dan Kegel 09 Sep '08

09 Sep '08

Kevin K wrote: > Is winedbg the only method of debugging applications being > developed for Windows on Wine? > > For instance, assume a program developed with Visual Studio > in C or C++, and I needed to debug it on Linux? If winedbg doesn't work for you, we should fix it. Same goes for other debuggers. For instance, ollydbg seems to work http://appdb.winehq.org/objectManager.php?sClass=application&iId=2619 Visual C++ 6's debugger seems to work at least a little, too: http://appdb.winehq.org/objectManager.php?sClass=version&iId=31 Please file bugs for any problems you run into. - Dan

6 6

Re: msi: Uninitialized variable fix (Coverity)
by James Hawkins 09 Sep '08

09 Sep '08

On Tue, Sep 9, 2008 at 3:54 PM, Andrew Talbot <andrew.talbot(a)talbotville.com> wrote: > Fix for Coverity error CID: 762. > > --- > Changelog: > msi: Uninitialized variable fix (Coverity). > > diff --git a/dlls/msi/action.c b/dlls/msi/action.c > index 8a8efe7..48557f0 100644 > --- a/dlls/msi/action.c > +++ b/dlls/msi/action.c > @@ -3838,7 +3838,7 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) > MSIFEATURE *feature; > UINT rc; > HKEY hkey; > - HKEY userdata; > + HKEY userdata = NULL; > > if (!msi_check_publish(package)) > return ERROR_SUCCESS; > @@ -3952,7 +3952,7 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) > > end: > RegCloseKey(hkey); > - RegCloseKey(userdata); > + if (userdata) RegCloseKey(userdata); > return rc; Please don't add another NULL-before-free check. -- James Hawkins

3 4

Adding Flawfinder to Patchwatcher
by Austin English 09 Sep '08

09 Sep '08

I had a discussion with Dan about adding Flawfinder to the patchwatcher. Currently, it's got some pretty generic errors, but it seems able to test only patches, so we wouldn't be flooded with old nonbugs (or we could set up a blacklist of safe errors). For reference, I've run it on today's git. I'm attaching the full log, as well as a condensed version of the most common errors (1 per error type). Looks like a lot of chances for buffer overflows.. Thoughts? -Austin

15 19

Patchwatcher online
by Dan Kegel 09 Sep '08

09 Sep '08

OK, I've checked in the updated Patchwatcher source http://code.google.com/p/winezeug/source/detail?r=177 and have turned email notifications back on. I also told it to rerun the most recent 11 patches, just to test that it's sending the good patches to http://groups.google.com/group/wine-patches-filtered again. The results page http://kegel.com/wine/patchwatcher/results/ looks nice and green; the blacklist at http://winezeug.googlecode.com/svn/trunk/patchwatcher/blacklist.txt filters out all the tests that tend to fail on my test machine infrequently enough that they show up in the five baseline test runs, but frequently enough that they caused bogus failure reports in the few hundered patches I've processed. It would be *very good* to whittle that blacklist down to zero. I should update http://bugs.winehq.org/show_bug.cgi?id=9916 with a script that runs just the problematic tests over and over again. (Or maybe I should start a new bug, that one is pretty long.)

3 3

Re: ws2_32: ioctlsocket should try to check if argp is valid (try 2)
by Juan Lang 09 Sep '08

09 Sep '08

Hi Jeff, + if(sock == INVALID_SOCKET) + skip("Creating the socket failed: %d, skipping test.\n", WSAGetLastError()); skip needs a return too. + ret = ioctlsocket(sock, cmds[i], (u_long *)1); + if(ok(ret == SOCKET_ERROR, "ioctlsocket succeeded unexpectedly\n")) + { I think you mean: ok(ret == SOCKET_ERROR...) if (ret == SOCKET_ERROR) { } although really the if is unnecessary, as you won't cause a crash if the first test fails. --Juan

2 1

Re: ws2_32: ioctlsocket should try to check if argp is valid
by Juan Lang 09 Sep '08

09 Sep '08

Hi Jeff, I have a stylistic complaint about your tests in this patch: + if(sock == INVALID_SOCKET) + { + ok(0, "Creating the socket failed: %d, skipping test\n", WSAGetLastError()); + return; + } If you intend to skip a test, shouldn't you use skip instead? + ret = ioctlsocket(sock, cmds[i], (u_long *)1); + if(ret != SOCKET_ERROR) + ok(0, "ioctlsocket succeeded unexpectedly\n"); + else + { I'm not a fan of the ok(0) approach here. Why not use ok(ret == SOCKET_ERROR) instead? --Juan

2 1

Launching a Linux Executable from a Windows app Running under Wine
by Mike Engelhardt 09 Sep '08

09 Sep '08

I write a Windows application that I want to be useful under Linux & WINE. I want to use xchm to view the help documentation .chm file since WINE doesn't yet properly display this .chm file which was generated with third party tools and includes advanced features. xchm does render the file acceptably and I'll e-mail the .chm file to anyone interested in that. But for the time being, I want to simply launch xchm from my app whenever my app finds itself being run under WINE. What I have is done so far is system() a command with path names of xchm and my .chm file that seem to basically be trying to outsmart WINE outsmarting Windows. Clearly this is an ugly hack and is not a long term solution. Is there a supported/recommended manner of launching an X Window System executable with Linux absolute path arguments from a MS Windows application running under Linux & WINE? --Mike

3 3

[PATCH] Open file in binary mode to work around a windows bug
by Steven Edwards 09 Sep '08

09 Sep '08

-- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

3 5

Re: James Hawkins : netapi32: Fix two failing tests in NT4.
by Kai Blin 09 Sep '08

09 Sep '08

On Wednesday 03 September 2008 14:43:55 Alexandre Julliard wrote: > - ok(ret == NERR_BadUsername, "Adding user with too long username > returned 0x%08x\n", ret); + ok(ret == NERR_BadUsername || > + broken(ret == NERR_PasswordTooShort), /* NT4 */ > + "Adding user with too long username returned 0x%08x\n", ret); > I'd argue that this is not broken, but the only error NT4 returns for bad username/password combinations. At least the comments in the surrounding code should be updated. Sorry for not catching this one earlier, I didn't have that much time for Wine recently. Cheers, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton.

1 0

Re: user32.dll: Implementation for LockWorkStation() based on xdg-screensaver
by Steven Edwards 09 Sep '08

09 Sep '08

On Tue, Sep 9, 2008 at 11:25 AM, Paul Chitescu <paulc(a)voip.null.ro> wrote: > Changelog: > user32.dll: Implementation for LockWorkStation() based on > xdg-screensaver > > Thanks to Steven Edwards (winehacker(a)gmail.com) for the idea of > using "xdg-screensaver lock". When I submitted the patch before, Alexandre and I discussed this both on and off list, I think there is another thread somewhere regarding it and I think he wanted it in explorer because of applications running in Desktop mode. I think the right behavior is to send a message to Explorer and if a wine application is not running in desktop mode then to invoke the xdg-screensaver, otherwise we should stub out or load a windows style screensaver in the emulated desktop. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

Re: user32.dll: Implementation for LockWorkStation() based on xdg-screensaver
by Michael Karcher 09 Sep '08

09 Sep '08

Am Dienstag, den 09.09.2008, 18:25 +0300 schrieb Paul Chitescu: > Known problems: > 1. Although trying to check with access() if /usr/bin/xdg-screensaver is > executable there is no error returned from spawnvp() if exec() eventually > fails after fork() succeeds. Unlikely but possible. I see that as a bug in spawnvp(). You can not do anything about that. But I dislike checking using access, because a) it is a well-known race condition (in this case, it does not seem to matter, as /usr/bin should be writable by root only). b) you sacrifice the possibility to find /usr/local/bin/xdg-screensaver if the utility has been locally added. (more important point). Would removing the access call and just trying to call xdg-screensaver have any negative implication except for not letting the windows application know that locking failed? If not, I would remove the call, as MSDN says that locking can also fail on Windows for various reasons even if LockWorkStation returned TRUE. > 2. No way to disable it - maybe users don't want their screen locked. So what? If a windows process calls LockWorkStation when the user does not want the workstation to be locked, it's a bug in the windows process, except... > 3. Doesn't take into account virtual desktops, and I have no idea what it > should do in that case, just deny access? ... if running in virtual desktop mode. (I suppose you mean "explorer /desktop" and not virtual desktop provided by X Window managers or virtual desktops provided by the linux kernel) As the real right way to implement this call is to SendMessage to explorer.exe, and explorer knows whether it runs in virtual desktop mode, I would suggest that the patch be extended to handle the screensaver start in Wine's explorer process, and just do nothing in the virtual desktop case. Regards, Michael Karcher

1 0

I just found out that when the input content is already GB2312, “wine” automatically mistakes it for unicode
by hawaii.wine wong 09 Sep '08

09 Sep '08

*Hi there, I am a Chinese programmer. I have a problem here with "wine" As we know "wine" is able to convert unicode to GB2312-- but weirdly, I just found out that when the input content is already GB2312, "wine" automatically mistakes it for unicode and therefore attempts to convert it again—and of course it gets a wrong output. **I thought "wine" could recognize GB2312 input and knows this input needs no conversion. Thanks in advance!!*

2 6

Patchwatcher status: added urlmon:protocol.c and urlmon:url.c to blacklist
by Dan Kegel 09 Sep '08

09 Sep '08

These tests failed randomly for a few people: urlmon:url.c:2125: Test succeeded inside todo block: unexpected OnProgress_CONNECTING urlmon:url.c:2129: Test failed: expected OnProgress_SENDINGREQUEST urlmon:url.c:2131: Test failed: expected OnResponse urlmon:protocol.c:1597: Test failed: Read failed: 00000001 (0 bytes) urlmon:protocol.c:365: Test failed: expected ReportData urlmon:protocol.c:1598: Test failed: Read failed: 8000000a (0 bytes) so I've added urlmon:url.c and urlmon:protocol.c to the patchwatcher blacklist, All of the tests that currently touch the real internet probably need to be changed to touch a mock internet if we want to have reliable tests.

1 0

Re: user32.dll: Add stub for LockWorkStation
by Steven Edwards 09 Sep '08

09 Sep '08

On Mon, Sep 8, 2008 at 2:32 PM, Paul Chitescu <paulc(a)voip.null.ro> wrote: > Changelog: > user32.dll: Stub for LockWorkStation() > > Not sure if user_main.c is the right place but I put it together with > ExitWindowsEx. Would you mind taking a shot at implementing this properly? It was on my TODO but I most likely will never get back to it. Here is my patch from before which was wrong. http://www.winehq.org/pipermail/wine-patches/2007-May/039240.html What we need to do is use SendMessage to talk to the existing explorer.exe process and have it do the locking. Feel free to use what i have to make a patch if your interested. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

2 1

re: Patchwatcher security improvements
by Dan Kegel 09 Sep '08

09 Sep '08

Interesting. One of my goals is to support Solaris and BSD; have you tried your stuff there? I'm currently refactoring patchwatcher.sh; I've pulled the generic stuff out into libpatchwatcher.sh and the wine-specific stuff into wine-slave.sh. Your changes will fit nicely into wine-slave.sh, I hope. I'm surprised you had to give up on the chroot... I was planning on trying to run just wine-slave.sh in a chroot jail, since it's the only part that would actually try to run any part of the wine build system. - Dan

2 2

Re: user32/test Added test about window sizes
by Michael Karcher 09 Sep '08

09 Sep '08

Am Dienstag, den 09.09.2008, 14:13 +0200 schrieb Florian Köberle: > + ok( width == 500 && height == 6, "rect is not 6x6 but %dx%d: %d,%d-%d,%d\n", > + width, height, rect.left, rect.top, rect.right, rect.bottom); [...] > + ok( width == 6 && height == 500, "rect is not 6x6 but %dx%d: %d,%d-%d,%d\n", > + width, height, rect.left, rect.top, rect.right, rect.bottom); These messages contain a copy & paste mistake. Please fix the 6x6. Regards, Michael Karcher

1 0

coverity ... new run finally
by Marcus Meissner 09 Sep '08

09 Sep '08

Hi folks, A new Coverity run (274) was done finally, so we can restart looking at issues ;) Still a lot of NULL ptr migration issues which suck to fix, but well. Ciao, Marcus

1 0

Re: notepad: Only append .txt to missing files without a dot in them (try2)
by Rob Shearman 09 Sep '08

09 Sep '08

2008/9/8 Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com>: > - if (!lstrcmp(txtW, cmdline + lstrlen(cmdline) - lstrlen(txtW))) > + if (strchrW(PathFindFileNameW(cmdline), '.')) You're using one shell helper function already so why not use PathFindExtensionW instead? -- Rob Shearman

1 0

Re: [1/5] secur32: Require gnutls for schannel
by Alexandre Julliard 09 Sep '08

09 Sep '08

"Henri Verbeet" <hverbeet(a)gmail.com> writes: > diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in > index df9695a..9805d92 100644 > --- a/dlls/secur32/Makefile.in > +++ b/dlls/secur32/Makefile.in > @@ -6,6 +6,8 @@ MODULE = secur32.dll > IMPORTLIB = secur32 > IMPORTS = netapi32 advapi32 kernel32 ntdll > DELAYIMPORTS = crypt32 > +EXTRALIBS = @GNUTLSLIBS@ > +EXTRAINCL = @GNUTLSINCL@ You need to load the library dynamically, we don't want the whole dll to fail to load if gnutls is missing at run-time. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: mshtml: Implement HTMLElement2 get_scrollLeft
by Alexandre Julliard 09 Sep '08

09 Sep '08

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > @@ -831,8 +831,31 @@ static HRESULT WINAPI HTMLElement2_put_scrollLeft(IHTMLElement2 *iface, long v) > static HRESULT WINAPI HTMLElement2_get_scrollLeft(IHTMLElement2 *iface, long *p) > { > HTMLElement *This = HTMLELEM2_THIS(iface); > - FIXME("(%p)->(%p)\n", This, p); > - return E_NOTIMPL; > + nsIDOMNSHTMLElement *nselem; > + PRInt32 left = 0; > + nsresult nsres; > + > + TRACE("(%p)->(%p)\n", This, p); > + > + if(!This->nselem) { > + FIXME("NULL nselem\n"); > + return E_NOTIMPL; > + } > + > + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); > + if(NS_SUCCEEDED(nsres)) { > + nsres = nsIDOMNSHTMLElement_GetScrollLeft(nselem, &left); > + nsIDOMNSHTMLElement_Release(nselem); > + if(NS_FAILED(nsres)) > + ERR("GetScrollLeft failed: %08x\n", nsres); > + }else { > + ERR("Could not get nsIDOMNSHTMLElement interface: %08x\n", nsres); > + } Printing an ERR is not a substitute for handling errors, you can't just continue as if nothing happened. Or if the error really can be legitimately ignored then you shouldn't have an ERR. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Simplify tools/wrc a bit (RESEND)
by Alexandre Julliard 09 Sep '08

09 Sep '08

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > Any thoughts on this patch? It breaks the WANT_NEAR_INDICATION case. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: add minimal ctxtcall.h
by Rob Shearman 09 Sep '08

09 Sep '08

2008/9/8 Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk>: > +typedef HRESULT (*PFNCONTEXTCALL)(ComCallData *pparam); You don't explicitly tell widl that this function is a __stdcall function. Please check if that is automatically added in the generated header file. If not, you'll have to specify it here. > + > +/***************************************************************************** > + * IContextcallback interface > + */ Please change "IContextcallback" to "IContextCallback". -- Rob Shearman

1 0

Debugging applications running on wine
by Kevin K 09 Sep '08

09 Sep '08

Is winedbg the only method of debugging applications being developed for Windows on Wine? For instance, assume a program developed with Visual Studio in C or C++, and I needed to debug it on Linux? Thanks, Kevin

1 0

Re: Patchwatcher security improvements
by Ambroz Bizjak 09 Sep '08

09 Sep '08

> Also, it's possible some of your changes won't be needed > after the refactoring... I plan to run wine-slave as a different > user anyway... That doesn't solve much; although in may look clean, it is not secure. The user should have a limited amount of resources to work with. Your way, for example, it can write the whole master Wine tree. With my patches, the master tree is read-only for the user, and it only has its own copy to work with which is never used again. I plan to further improve things. In particular, killing stall processes is not implemented securely now. As I have already mentioned, additional access control is needed to produce a fully solid system. For example, disk access should be limited (think about world-writable folders and stuff like ~/.bashrc), and memory usage should be limited as well (could patchwatcher get killed when the patch starts consuming memory?). Considering the refactoring, I see you are just some moving stuff into its own file; I can easily adjust my code.

1 0

re: Patchwatcher security improvements
by Ambroz Bizjak 08 Sep '08

08 Sep '08

> Interesting. One of my goals is to support Solaris and BSD; > have you tried your stuff there? Not yet, but that stuff is pretty generic, so it shouldn't be hard to get it to work. > I'm surprised you had to give up on the chroot... > I was planning on trying to run just wine-slave.sh in > a chroot jail, since it's the only part that would > actually try to run any part of the wine build system. Creating the chroot itself is really hard and has to be done for each platform separately. The basic system and also all development tools and Wine dependencies have to be copied properly. And there are the tests with their own bunch of requirements. In the end you would end up with a chroot that is not much different from the base system itself. And it doesn't really bring many security benefits. Many potentially insecure interfaces have to be exposed anyway (/proc, X server with OpenGL, sound hardware). If a clean and dedicated system is used and permissions are properly configured, running stuff on the base system shouldn't really be a problem. Furthermore, using some advanced access control system (like SELinux) would probably be easier to configure and more efficient.

1 0

re: [1/5] secur32: Require gnutls for schannel
by Dan Kegel 08 Sep '08

08 Sep '08

> If its easier with gnutls, please use it. +1 I also agree that nss is likely to replace openssl as the toolkit of choice. But if depending on gnutls is the easiest path to a working schannel, that's the right thing to do. We can always change later if a compelling reason arises. - Dan

1 0

Re: user32.dll: Add stub for LockWorkStation
by Rob Shearman 08 Sep '08

08 Sep '08

2008/9/8 Paul Chitescu <paulc(a)voip.null.ro>: > /*********************************************************************** >+ * LockWorkStation (USER32.@) >+ */ >+BOOL WINAPI LockWorkStation() This is the right place to put it be the above should be "LockWorkStation(void)" not "LockWorkStation()". -- Rob Shearman

1 0

Re: wininet: InternetQueryOption return size when buffer too small
by James Hawkins 08 Sep '08

08 Sep '08

On Mon, Sep 8, 2008 at 5:01 PM, Rotem Zach <rotemz(a)gmail.com> wrote: > > + > + internetQWCheckOption(NULL,INTERNET_OPTION_MAX_CONNS_PER_SERVER,(WCHAR*)"Open: INTERNET_OPTION_MAX_CONNS_PER_SERVER Got wrong length %d instead of %d\n",sizeof(ULONG)); > + internetQWCheckErr(ERROR_INSUFFICIENT_BUFFER,(WCHAR*)"Open: INTERNET_OPTION_MAX_CONNS_PER_SERVER Wrong Error %d Expecting %d\n"); > + > + internetQWCheckOption(NULL,INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER,(WCHAR*)"Open: INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER Got wrong length %d instead of %d\n",sizeof(ULONG)); > + internetQWCheckErr(ERROR_INSUFFICIENT_BUFFER,(WCHAR*)"Open: INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER Wrong Error %d Expecting %d\n"); > + All of these lines are way too long. Please stick close to an 80-col line limit. -- James Hawkins

1 0

winhttp test failures
by James Hawkins 08 Sep '08

08 Sep '08

Hi Hans, Tests you added to the file dlls/winhttp/tests/notification.c are causing several test failures across all platforms. Can you please have a look at this? Thanks, James Hawkins

1 0

Re: [1/5] secur32: Require gnutls for schannel
by Marcus Meissner 08 Sep '08

08 Sep '08

On Mon, Sep 08, 2008 at 11:10:11PM +0200, Henri Verbeet wrote: > > From cb10664e7d7526951d97f6d9ba2f7429d20b69d4 Mon Sep 17 00:00:00 2001 > From: Henri Verbeet <hverbeet(a)gmail.com> > Date: Mon, 8 Sep 2008 22:39:11 +0200 > Subject: secur32: Require gnutls for schannel > +AC_ARG_WITH(gnutls, AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (schannel support)])) Hmm, I really do not think gnutls will have a long feature, NSS seems to be the future choice of crypto frameworks :/ Ciao, Marcus

3 4

Re: wined3d: Add support for updating part of a compressed surface.
by Henri Verbeet 08 Sep '08

08 Sep '08

2008/9/5 Christof Sigel <christof.sigel(a)intenode.on.net>: > + /* since DXT compressed formats are specified in 4x4 pixel blocks devide pitch by 4 */ > + int srcPitch=srcLockedRect.Pitch>>2; > + int destPitch=destLockedRect.Pitch>>2; That will break with DXT1 surfaces. All the DXT formats are specified in 4x4 blocks, but for DXT1 a 4x4 block is 8 bytes, while for the other DXT formats a block is 16 bytes. This also has implications for how you should handle copying row by row, since each row is 4 pixels high. Strictly speaking you should also verify that the pitch exactly corresponds to the surface width before using the "single memcpy" path, since theory the surface layout in memory could look like this: |<----width--->| |<-----------pitch------------>| xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx |--------------|xxxxxxxxxxxxxxxx | |xxxxxxxxxxxxxxxx | |xxxxxxxxxxxxxxxx | surface |xxxxxxxxxxxxxxxx | |xxxxxxxxxxxxxxxx | |xxxxxxxxxxxxxxxx | |xxxxxxxxxxxxxxxx |--------------|xxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx In other words, for a DXT1 surface with height h, width w and pitch p, you should copy h/4 rows of w*2 bytes, where each row starts at pBits+p*row. For DXT2/3/4/5 you'd copy w*4 bytes for each row. A test for this code would be appreciated.

2 2

Peb->BeingDebugged and a debugger messing up
by Markus Hitter 08 Sep '08

08 Sep '08

Hello all, after wrestling severals days with Wine's debugging capabilities I think I need some advice. First, regardless wether my app (Catia) is launched with wine or winedbg, Peb->BeingDebugged is always False. To the best of my efforts I can't find the code snippet which sets this variable or does some sort of probing for the correct value. Oddly enough, the app breaks into the debugger after creation of a new process, anyways. As the app uses a launcher, I have the chance to set BeingDebugged explicitely to True. Some time later, after the app created a few threads, it's back to False. Are there applications out there setting this flag to what they think is best? Any other possible reasons for going BeingDebugged back to False while running in winedbg? None of the functions Wine provides and handles this variable appears to be called by the application. Third thing is, Wine's attempt to auto-launch the debugger messes up. Not only if BeingDebugged is reported wrongly, it obviously runs in conflicts if launched due to a exception stack overflow. Is it really wise to launch it by triggering an interrupt in DbgBreakPoint()? Short of better suggestions, I'd try to make debugger launching independent from Peb->BeingDebugged (server/kernel should know better), try to get rid of the interrupt in DbgBreakPoint() and/or make debugger autolaunching optional (at compile time). What do you think? Thanks, MarKus - - - - - - - - - - - - - - - - - - - Dipl. Ing. Markus Hitter http://www.jump-ing.de/

1 0

Re: imm32: Improve ImmGetCompositionString.
by Paul Vriens 08 Sep '08

08 Sep '08

Aric Stewart wrote: > > It should return number of copied bytes. But it always returns required > buffer size to receive all information. > (originally by Kusanagi Kouichi (slash(a)ma.neweb.ne.jp) ) > --- > dlls/imm32/imm.c | 207 > ++++++++++++++++++++++++++++++++++-------------------- > 1 files changed, 130 insertions(+), 77 deletions(-) > > > > ------------------------------------------------------------------------ > > Shouldn't patches like these be accompanied by tests? It changes the behavior after all. -- Cheers, Paul.

2 1

Re: dsound: fix a few failing tests and a crash on 2008
by Paul Vriens 08 Sep '08

08 Sep '08

Jeff Zaroyko wrote: > > ------------------------------------------------------------------------ > > I found more or less the same thing for Vista a few days ago. Doing a IDirectSoundBuffer_Release sets the reference counter to zero but doesn't clear secondary. Is this something worthwhile to add a comment for (or a test)? It does seem important as it's a change of behavior starting with Vista? -- Cheers, Paul.

2 1

Re: winemenubuilder: eliminate wineshelllink
by Francois Gouget 08 Sep '08

08 Sep '08

On Thu, 4 Sep 2008, Damjan Jovanovic wrote: > Changelog: > * moved the functionality of wineshelllink into winemenubuilder, and > eliminated wineshelllink What is the rational for eliminating wineshelllink? It seems to me that by eliminating it we are losing a lot of flexibility for handling special setups (and there are a lot of these in menuing systems). -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Research is the transformation of money to knowledge. Innovation is the transformation of knowledge to money. -- Dr. Hans Meixner

4 4

Re: crypt32: fixed the testGetCertChain tests on Vista.
by James Hawkins 08 Sep '08

08 Sep '08

On Sun, Sep 7, 2008 at 5:59 AM, Reece Dunn <msclrhd(a)googlemail.com> wrote: > This fixes these crypt32:chain testGetCertChain tests on Vista and Windows 2008. > - ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %d\n", GetLastError()); + ok(!ret, "Expected CertGetCertificateChain to fail\n"); + ok(GetLastError() == ERROR_INVALID_DATA || + GetLastError() == CRYPT_E_ASN1_BADTAG /* Vista/win2k8 */, I'm not NACK'ing this patch, but for future reference, please put comments *after* the comma or logical OR marker, and each system condition should be on its own line. I've seen this in several patches recently. While it's syntactically OK, it looks wrong and there's no need for everyone to have to play Find The Comma. Yes there are other places in the code where this happens, but that doesn't make it correct or preferable. For example, the following is significantly easier to read: ok(result == ERROR_BUFFER_TOO_SMALL || result == ERROR_INVALID_USER_BUFFER || /* win98 */ result == ERROR_INVALID_DATA, /* Vista */ "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); than ok(result == ERROR_BUFFER_TOO_SMALL || result == ERROR_INVALID_USER_BUFFER /* win98 */ || result == ERROR_INVALID_DATA /* Vista */, "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); -- James Hawkins

2 3

Re: user32: Resend Check for NULL pData in DdeClientTransAction expectingto be passed a handle
by Dmitry Timoshkov 08 Sep '08

08 Sep '08

"Jeff Latimer" <lats(a)yless4u.com.au> wrote: > diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c > index 99e2d1c..cbbf99a 100644 > --- a/dlls/user32/dde_client.c > +++ b/dlls/user32/dde_client.c > @@ -632,6 +632,15 @@ static WDML_XACT* WDML_ClientQueueExecute(WDML_CONV* pConv, LPVOID pData, DWORD > > TRACE("XTYP_EXECUTE transaction\n"); > > + if (pData == NULL) > + { > + if (cbData == (DWORD)-1) > + pConv->instance->lastError = DMLERR_INVALIDPARAMETER; > + else > + pConv->instance->lastError = DMLERR_MEMORY_ERROR; > + return NULL; > + } Alexandre suggested to use the existing 'if (cbData == (DWORD)-1)' block, not introduce a new one. > @@ -1154,13 +1163,10 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS > switch (wType) > { > case XTYP_EXECUTE: > - /* Windows simply ignores hszItem and wFmt in this case */ > - if (pData == NULL) > - { > - pConv->instance->lastError = DMLERR_INVALIDPARAMETER; > - return 0; > - } > + /* Windows simply ignores hszItem and wFmt in this case */ > pXAct = WDML_ClientQueueExecute(pConv, pData, cbData); > + if (pXAct == NULL) > + return 0; > break; The formatting of the above block is strange. Set the tab size in your editor to 8 and you will see the mess. -- Dmitry.

2 2

Fixing the conformance tests
by Paul Vriens 08 Sep '08

08 Sep '08

Hi, As we are slowly progressing towards a more green test.winehq.org there are still some conformance tests that fail either on all platforms or with a specific configuration (like IE7). This email is merely to list those and see if the SME's can have a look in these tests. (I didn't put to much effort in stuff below XP and left out user32) Tests with timeouts =================== - dplayx:dplayx fails with a timeout on all windows servers - msi:install fails with a timeout on a lot of windows servers Tests that fail with IE7 installed ================================== - hlink:hlink has a consistent 8 failures on servers with IE7 - mshtml:htmldoc has 8 failures on servers with IE7 (and more, but also on others) - shdocvw:webbrowser has 3 failures on servers with IE7. Tests that fail starting with a specific OS (or level) ====================================================== - msi:package has 16 failures on XP-SP3+ and 16 extra on W2K3-SP2+ - ole32:storage32 has 24 failures on XP-SP3+ and 24 extra on W2K3-SP2+ (both the above have to do with access rights on files) Tests that fail on Windows and succeed on Wine ============================================== - ws2_32:sock has 1 consistent failure on all Windows boxes but not on Wine Tests with failures on all Windows boxes ======================================== - riched20:editor has failures on all boxes - urlmon:protocol either has timeouts or failures on all boxes - urlmon:url fails with 6 consistent failures on all boxes The above is a subset of all the failures and are not the easy ones. There are still loads of tests that fail on only 1 OS or even on 1 server. -- Cheers, Paul.

4 4

Re: itircl: add a stub for DllUnregisterServer
by Austin English 07 Sep '08

07 Sep '08

Please ignore this patch. It's not ready, and not sure why it was sent yet... -Austin On Sun, Sep 7, 2008 at 2:08 PM, Austin English <austinenglish(a)gmail.com> wrote: > >

1 0

Re: [PATCH] buffer overflow checking for string functions
by Francois Gouget 07 Sep '08

07 Sep '08

On Thu, 4 Sep 2008, Marcus Meissner wrote: [...] > +#if defined(__GNUC__) && (__GNUC__ < 4) > +# define __builtin_object_size(x,y) -1 > +#endif Shouldn't this be: #if !defined(__GNUC__) || (__GNUC__ < 4) To preserve compatibility with non-GNU compilers. > +static inline INT > +WINAPI MultiByteToWideChar_ichk( > + UINT cp,DWORD flags, > + LPCSTR src,INT srclen,INT srcbuflen, > + LPWSTR dst,INT dstlen,INT dstbuflen > +) { > + if ((srclen != -1) && (srcbuflen != -1) && (srcbuflen < srclen)) > + RaiseException(0xC0000409,0x01,0,NULL); It would be nice to issue a trace clarifying the cause of the exception before raising it. Maybe something like this: TRACE("used %d as the size when >= %d is needed for the builtin object\n", ...); Sending it to the seh channel would be best. [...] > +#define MultiByteToWideChar(cp,flags,src,srclen,dst,dstlen) \ > + MultiByteToWideChar_ichk(cp,flags, \ > + src,srclen,__builtin_object_size(src,0), \ > + dst,dstlen,__builtin_object_size(dst,0) \ > + ) I have a few other concerns here: * Why do we need a macro here? I thought it was so that __builtin_object_size() could do its work, but the strcpy() functions above in the patch have no associated macro and they call __builtin_object_size() on their parameter which would seem to be poinless. So I must be misunderstanding something here. * It's customary to add some extra parenthesing in such macros: (src),(srclen),__builtin_object_size((src),0), * The macro itself can cause trouble in some cases. In Winelib code it can cause naming collisions with user functions (especially with class methods, though it may not be very likely here), which would especially be an issue with strcpy*(). Maybe it should be protected by something like a WINE_NO_OVERFLOW_CHECK macro? * The macro can also cause trouble in case its parameters have side-effects, like x++ or similar (though the __builtin_object_size() mentions returning -1 in case or side-effects). This could impact Wine too. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Computers are like airconditioners They stop working properly if you open WINDOWS

3 2

Changing configure.ac script
by Nikolay Sivov 07 Sep '08

07 Sep '08

Is there any way not to include a regenerated 'configure' script into a patch but be able to 'git fetch' it when it's changed remotely in repo? As I see there is no need to patch a 'configure' file in repository since it's always regenerated when 'configure.ac' changed. Thanks in advance.

2 4

1st resend: Can we import MSConfig from ReactOS? (was: autorun perhaps dangerous)
by Jason Spiro 07 Sep '08

07 Sep '08

(Hi Alexandre. I sent the below email 2 weeks ago and didn't get a response yet. I know you are busy, but please do try to find the time to reply, even if it's to say "I'm not sure". Cheers, --Jason) cc: wine-devel(a)winehq.org Hi Alexandre, In January 2008, Steven Edwards wondered[1] if you would let Wine import "msconfig" (the System Configuration Utility) from ROS. Would you allow it? Thanks, --Jason Spiro (not a Wine developer) ^ [1]. http://news.gmane.org/find-root.php?message_id=%3c19e31a080801122302u52d513… -- Jason Spiro: software/web developer, trainer, IT consultant. I support Linux, UNIX, Windows, and more. Contact me to discuss your needs and get a free estimate. +1 (613) 668-6096 / info(a)jspiro.com

4 5

re: Fixing the conformance tests
by Dan Kegel 07 Sep '08

07 Sep '08

Paul V. wrote: > As we are slowly progressing towards a more green > test.winehq.org there are still some conformance tests > that fail either on all platforms or with a specific configuration (like IE7). Here's some data. On my new box (CPU: Core 2 Duo e8400, graphics: nVidia Corporation GeForce 8500 GT (rev a1) window manager: metacity 2.25.0 built from source) distro: 32 bit Hardy), out of 212 full runs of 'make -k test', here's a count of failures by test name: 6 d3d9 device 6 comdlg32 printdlg 8 wininet http 14 kernel32 thread 19 comctl32 tooltips 24 ddraw visual 32 riched20 editor 46 user32 win 137 user32 input 215 user32 msg 216 dsound ds3d 216 winmm wave 216 urlmon protocol 216 dsound ds3d8 In my perfect world, those tests would all pass, every time, even if you ran them 100 times. That would make patchwatcher a lot more useful, since then it wouldn't have to blacklist these tests. Here's a little script to tickle just the flaky tests I found: #!/bin/sh try() { cd dlls/$1/tests rm $2.ok make $2.ok cd ../../.. } set -e set -x while true do try comctl32 tooltips try comdlg32 printdlg try d3d9 device try ddraw visual try dsound ds3d8 try kernel32 thread try riched20 editor try user32 input try user32 win try wininet http done This aborts for me in just five seconds. Can *anyone* run it for an hour without failure? If so, how can I duplicate your setup? - Dan

4 5

Re: wineboot: Basic RunOnceEx support v2 (with patch)
by Dmitry Timoshkov 07 Sep '08

07 Sep '08

"Johan Dahlin" <jdahlin(a)gmail.com> wrote: > +typedef HRESULT WINAPI (*DLLREGISTER) (void); > +typedef HRESULT WINAPI (*DLLINSTALL) (BOOL,LPCWSTR); This is still not right, have a look at other places that use pointers to the exported win32 APIs. > +typedef enum { > + ROEF_DISABLED = 0x00000000, > + ROEF_SHELLSTATUS = 0x00000004, > + ROEF_NOERRORDIALOGS = 0x00000008, > + ROEF_ERRORLOG = 0x00000010, > + ROEF_EXECUTELOG = 0x00000020, > + ROEF_NOEXCTRAP = 0x00000040, > + ROEF_NOSTATUSDIALOG = 0x00000080 > +} RunOnceExFlags; Please use 4 spaces as an indentation like existing code does, here and everywhere else. > +static VOID *LoadProc(WCHAR* strDllW, const char* procName, HMODULE* DllHandle) > +{ > + VOID* (*proc)(void); Why not use just 'void *' as a type for proc, since that's what you are casting it to and returning to the caller anyway? Also using 'VOID' instead of 'void' is not justified. -- Dmitry.

1 0

Re: Patchwatcher: failed regression tests: [6/10 AcceptEx] Implements sock_close_handle
by Scott Lindeneau 07 Sep '08

07 Sep '08

I don't understand, this patch doesn't cause any regressions on my machine using the latest git (none of them do). The patch[6/10] is (nearly) identical to the patch I submitted earlier (which did not cause regressions). The only difference is in the hash. The next patch[7/10] changes zero functionality because the function that is implemented in [7/10] is unused at this point in time and patch [7/10] passes the conformance tests. scott@SocialSycotic:~/programming/wine/wine/patch$ diff 9.7.2/0006-Implements-sock_close_handle.txt 9-4.7/0006-Implements-sock_close_handle.txt 1c1 < From 40ae4098b66df1cb30dc77368ccfc1c495bb0b68 Mon Sep 17 00:00:00 2001 --- > From d1e0353beb8490bbd9b8818523c6d79daae510ff Mon Sep 17 00:00:00 2001 scott@SocialSycotic:~/programming/wine/wine/patch$ Using only patches [1/10 - 6/10] (The patches applied by patchwatcher when it displays the failure): ../../../tools/runtest -q -P wine -M urlmon.dll -T ../../.. -p urlmon_test.exe.so protocol.c && touch protocol.ok fixme:wininet:InternetLockRequestFile STUB fixme:wininet:InternetLockRequestFile STUB fixme:wininet:InternetLockRequestFile STUB fixme:wininet:InternetLockRequestFile STUB ../../../tools/runtest -q -P wine -M urlmon.dll -T ../../.. -p urlmon_test.exe.so stream.c && touch stream.ok As for the conformance test. I will look into how I have to change the sock.c test loop. ~Scott On Sun, Sep 7, 2008 at 9:14 AM, Dan Kegel <dank(a)kegel.com> wrote: > This is interesting. It does seem like that patch changed > an error code and added a new failure to urlmon:protocol.c. > Was this just a case of "I should have combined two of the > patches in the series"? > > BTW, if you end up resending the patch series again, > you might send the test case first (with todo_wine's), > and then after the errors are fixed, remove the todo_wine's. > > > On Sat, Sep 6, 2008 at 4:42 PM, Patchwatcher <patchwatcher(a)kegel.com> wrote: >> Hi! This is the experimental automated wine patchwatcher thingy. >> The latest git sources were built and tested with your patch >> "[6/10 AcceptEx] Implements sock_close_handle" >> Result: the patch failed regression tests. >> >> You can retrieve the full build results at >> http://kegel.com/wine/patchwatcher/results/1162.log >> and see the patch as parsed at >> http://kegel.com/wine/patchwatcher/results/1162.txt >> See >> http://kegel.com/wine/patchwatcher/results >> for more info. >> >> >

2 2

Re: [1/2] hlink/tests: display the expected data, as well as the actual data.
by James Hawkins 07 Sep '08

07 Sep '08

On Sun, Sep 7, 2008 at 4:56 AM, Reece Dunn <msclrhd(a)googlemail.com> wrote: > This improves the error reporting for the hlink tests. > I think you need to think this one over. Why would we care to display the expected data, when the expected data is in the tests? For simple tests, e.g. last errors or simple integer results, displaying the expected data makes it easier to understand the returned value. On the other hand, for the hlink tests, the expected binary data adds no value to the output. -- James Hawkins

2 1

re: [3/10 AcceptEx] Modifies accept_socket, allows it to take sock structures instead of handles
by Dan Kegel 06 Sep '08

06 Sep '08

This patch seemed to cause wineserver to crash. See http://kegel.com/wine/patchwatcher/results http://kegel.com/wine/patchwatcher/results/1033.log http://kegel.com/wine/patchwatcher/results/1034.log

2 2

Re: modified: dlls/wininet/http.c
by Hans Leidekker 06 Sep '08

06 Sep '08

On Wednesday 03 September 2008 20:33:25 Nerv wrote: > -It seems Windows XP only increments lpdwIndex if the Function returns > true, so it is fixed if you just look on bSuccess This patch is likely correct but please do add a test case to prove your finding. -Hans

1 0

Re: wined3d: Be more careful when deleting FBOs
by Henri Verbeet 06 Sep '08

06 Sep '08

Ignore these, I sent them a few days ago without being subscribed to the list.

1 0

Re: oleaut32: Add support for loading typelibs from NE files.
by Rob Shearman 05 Sep '08

05 Sep '08

2008/9/2 Huw Davies <huw(a)codeweavers.com>: > --- a/dlls/oleaut32/typelib.c > +++ b/dlls/oleaut32/typelib.c > @@ -64,6 +64,7 @@ > #include "winnls.h" > #include "winreg.h" > #include "winuser.h" > +#include "wine/winbase16.h" > > #include "wine/unicode.h" > #include "objbase.h" I don't think we should be including a 16-bit header file and using 16-bit functions in a 32-bit source file if we can avoid it. In this case, we can avoid it. -- Rob Shearman

2 2

Re: msi: Reduce destination file name used in the MoveFiles action to the long file name.
by James Hawkins 05 Sep '08

05 Sep '08

On Fri, Sep 5, 2008 at 4:18 PM, Rob Shearman <robertshearman(a)gmail.com> wrote: > --- > dlls/msi/action.c | 22 ++++++++++++++++------ > 1 files changed, 16 insertions(+), 6 deletions(-) > > There doesn't appear to be any documentation on MSDN suggesting this > behaviour but it fixes the following snippet of a log from a > customised Office 2003 installer: > > 0065:trace:msi:msi_move_file copying > L"C:\\windows\\temp\\~OCW0023.TMP" -> L"C:\\Program Files\\Microsoft > Office\\sfn|custom11.prf" > 0065:Call KERNEL32.CopyFileW(0105f4d0 > L"C:\\windows\\temp\\~OCW0023.TMP",0105f1f8 L"C:\\Program > Files\\Microsoft Office\\sfn|custom11.prf",00000000) ret=7eded205 > 0065:Ret KERNEL32.CopyFileW() retval=00000000 ret=7eded205 > 0065:warn:msi:msi_move_file CopyFile failed: 123 > Can you please add a test case? The test_movefiles already exists, and adding this case shouldn't take more than 5 minutes. -- James Hawkins

2 1

re: Can we import MSConfig from ReactOS?
by Dan Kegel 05 Sep '08

05 Sep '08

Jason Spiro wrote: > Could the Wine team make up a whitelist of trusted ReactOS > developers who won't reverse engineer any Windows code? There is already a whitelist of sorts; look at whom Alexandre accepts patches from. > Or a whitelist of trusted portions of ReactOS...? IMHO it's not worth the effort. - Dan

1 0

RE: wined3d: add missing HeapFree
by Stefan Dösinger 05 Sep '08

05 Sep '08

This looks ok to me > -----Original Message----- > From: wine-patches-bounces(a)winehq.org [mailto:wine-patches- > bounces(a)winehq.org] On Behalf Of Jeff Zaroyko > Sent: Friday, September 05, 2008 11:19 AM > To: wine-patches(a)winehq.org > Subject: wined3d: add missing HeapFree >

1 0

Re: user32: Resend Check for NULL pData in DdeClientTransaction expecting to be passed a handle
by Alexandre Julliard 05 Sep '08

05 Sep '08

Jeff Latimer <lats(a)yless4u.com.au> writes: > @@ -1157,7 +1157,10 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS > /* Windows simply ignores hszItem and wFmt in this case */ > if (pData == NULL) > { > - pConv->instance->lastError = DMLERR_INVALIDPARAMETER; > + if (cbData == -1) > + pConv->instance->lastError = DMLERR_INVALIDPARAMETER; > + else > + pConv->instance->lastError = DMLERR_MEMORY_ERROR; > return 0; > } > pXAct = WDML_ClientQueueExecute(pConv, pData, cbData); It would be cleaner to do the checks inside WDML_ClientQueueExecute since it already handles the cbData==-1 case differently. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: notepad: Only append .txt to missing files without a dot in them
by Alexandre Julliard 05 Sep '08

05 Sep '08

Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> writes: > @@ -590,7 +591,8 @@ static void HandleCommandLine(LPWSTR cmdline) > static const WCHAR txtW[] = { '.','t','x','t',0 }; > > /* try to find file with ".txt" extension */ > - if (!lstrcmp(txtW, cmdline + lstrlen(cmdline) - lstrlen(txtW))) > + if (!lstrcmp(txtW, cmdline + lstrlen(cmdline) - lstrlen(txtW)) || > + strchrW(cmdline, '.')) There's no point in checking for .txt if any extension will match anyway. Also you should most likely check for a dot only in the filename, not in the whole path. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [5/5] user32: Move character conversion logic to dde_server.d & remove todo's
by Alexandre Julliard 05 Sep '08

05 Sep '08

Jeff Latimer <lats(a)yless4u.com.au> writes: > @@ -772,12 +774,51 @@ static WDML_QUEUE_STATE WDML_ServerHandleExecute(WDML_CONV* pConv, WDML_XACT* pX > > if (ptr) > { > - hDdeData = DdeCreateDataHandle(0, ptr, GlobalSize(pXAct->hMem), > + DWORD memSize, ptrSize = GlobalSize(pXAct->hMem); > + > + TRACE("Client is %s, Server is %s, Text is %s\n", > + IsWindowUnicode(pConv->hwndClient) ? "Unicode" : "ANSI", > + IsWindowUnicode(pConv->hwndServer) ? "Unicode" : "ANSI", > + IsTextUnicode(ptr, ptrSize, NULL) ? "Unicode" : "ANSI"); > + > + if (!(IsWindowUnicode(pConv->hwndClient)) && !(IsWindowUnicode(pConv->hwndServer)) && IsTextUnicode(ptr, ptrSize, NULL)) > + memSize = WideCharToMultiByte( CP_ACP, 0, ptr, ptrSize / sizeof(WCHAR), NULL, 0, NULL, NULL); > + > + else if (IsWindowUnicode(pConv->hwndServer) && !IsTextUnicode(ptr, ptrSize, NULL)) > + memSize = MultiByteToWideChar( CP_ACP, 0, ptr, ptrSize, NULL, 0) * sizeof(WCHAR); Using IsTextUnicode doesn't look right, you shouldn't need to guess. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: sane.ds: Workaround for wsprintf does not support floats.
by Alexandre Julliard 05 Sep '08

05 Sep '08

"Lei Zhang" <thestig(a)google.com> writes: > Float values in sane dialogs show up as "f". This is because wsprintf > does not support %f. This started occurring in commit > 4fd668d01088e82b4639ee2f4f088e0b718e6a88. sprintfW should work. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winemenubuilder: eliminate wineshelllink
by Alexandre Julliard 05 Sep '08

05 Sep '08

"Damjan Jovanovic" <damjan.jov(a)gmail.com> writes: > @@ -169,6 +170,10 @@ MAKE_FUNCPTR(png_write_info); > MAKE_FUNCPTR(png_write_row); > #undef MAKE_FUNCPTR > > +static char xdg_config_dir[MAX_PATH]; > +static char xdg_data_dir[MAX_PATH]; > +static char xdg_desktop_dir[MAX_PATH]; MAX_PATH is not appropriate for unix paths, please allocate them dynamically. > + if (filename[i] == '/' && i > 0) > + { > + struct stat st; > + filename[i] = 0; > + if (stat(filename, &st) != 0) > + { > + if (errno == ENOENT) > + { > + if (mkdir(filename, 0777)) > + ret = FALSE; > + } mkdir fails on existing paths, there's no need to stat first. > + snprintf(xpmPath, xpmPathLen, "%s/icons/%s", xdg_data_dir, name); > + dot = strrchr(xpmPath, '.'); > + if (dot != NULL) > + *dot = 0; You should only match a dot in the filename, not in the directory. > + dst = fopen(xpmPath, "w"); > + if (dst) > + { > + char buffer[8096]; What's with the strange size? > + if (getenv("WINEPREFIX")) > + snprintf(winePrefix, sizeof(winePrefix), "%s", getenv("WINEPREFIX")); > + else > + snprintf(winePrefix, sizeof(winePrefix), "%s/.wine", getenv("HOME")); You want wine_get_config_dir(). -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: kernel32: Test import entries of a core windows DLL (riched20.dll)
by Paul Vriens 05 Sep '08

05 Sep '08

Roy Shea wrote: > --- > dlls/kernel32/tests/Makefile.in | 1 + > dlls/kernel32/tests/loader_image.c | 80 ++++++++++++++++++++++++++++++++++++ > 2 files changed, 81 insertions(+), 0 deletions(-) > create mode 100644 dlls/kernel32/tests/loader_image.c > > > ------------------------------------------------------------------------ > > No license and copyright information? -- Cheers, Paul.

1 0

Patch for vertex > 4 shaders
by Chris Ahrendt 04 Sep '08

04 Sep '08

>Hmm. Does the application use a fixed function texture coordinate specified >with D3DECLUSAGE_FLOAT4? I don't know I can look in my logs and see if I see it... but don't remember off the top of my head at the moment. >It should be simple to support this. Essentially the "int coordsToUse = >sd->u.s.texCoords[coordIdx].dwType + 1" is wrong, this needs a better mapping: >decltype: coordsToUse: >D3DDECLTYPE_FLOAT1 1 >D3DDECLTYPE_FLOAT2 2 >D3DDECLTYPE_FLOAT3 3 >D3DDECLTYPE_FLOAT4 4 >D3DDECLTYPE_D3DCOLOR 4 >D3DDECLTYPE_UBYTE4 4 >D3DDECLTYPE_SHORT2 2 >D3DDECLTYPE_SHORT4 4 >D3DDECLTYPE_UBYTE4N 4 >D3DDECLTYPE_SHORT2N 2 >D3DDECLTYPE_SHORT4N 4 >D3DDECLTYPE_USHORT2N 2 >D3DDECLTYPE_USHORT4N 4 >D3DDECLTYPE_UDEC3 3 >D3DDECLTYPE_DEC3N 3 >D3DDECLTYPE_FLOAT16_2 2 >D3DDECLTYPE_FLOAT16_4 4 The app. should pass these in to us already in the correct format >Also the function calls below shouldn't be selected based on a >switch-case statement, but rather on the declaration itself. q, r, t >and s should be read in a different way too. The system used for >providing other parameters like diffuse_funcs sounds sane here, >although some extra care is needed to >keep working without >GL_ARB_multitexture support. ok explain... I am lost here.. like I said earlier I divided it into the gl calls (float, int, short) and the screen went a little bonkers... so any suggestions here would be great =) Was thinking about it on the trip to the airport and came up with the following pseudo code: switch( vertex shader type) { case D3DDECLTYPE_FLOAT1: g = value 1; totalParms = 1; break; case D3DDECLTYPE_FLOAT2: case D3DDECLTYPE_SHORT2: case D3DDECLTYPE_USHORT2N: case D3DDECLTYPE_SHORT2N: case D3DDECLTYPE_FLOAT16_2: g = value1; r = value2; totalParms=2; break; case D3DDECLTYPE_FLOAT3: case D3DDECLTYPE_UDEC3: case D3DDECLTYPE_DEC3N: g = value1; r = value2; t= value3; totalParms=3; break; case D3DDECLTYPE_FLOAT4: case D3DDECLTYPE_D3DCOLOR: case D3DDECLTYPE_UBYTE4: case D3DDECLTYPE_SHORT4: case D3DDECLTYPE_UBYTE4N: case D3DDECLTYPE_SHORT4N: case D3DDECLTYPE_USHORT4N: case D3DDECLTYPE_FLOAT16_4: g = value1; r = value2; t= value3; s = value4; totalParms=4; break; default: TRACE("Error\n"); return; break; } switch(totalParms) { case 1: gl call with 1 parm break; case 2: gl call with 2 parms break; case 3: gl call with 3 parms break; case 4: gl call with 4 parms break; default: TRACE("ERROR\n"); break; } >Also I strongly recommend writing a test here. Generally, fixed >function attributes with non-standard data types are spooky on Windows, >so the real problem may be somewhere else. Is there currently a test case for this written? I think on windows it just ignores the parms to be honest.. Chris

1 1

Re: Recent msi/package tests failures
by James Mckenzie 04 Sep '08

04 Sep '08

James: >From: James Hawkins <truiken(a)gmail.com> >Sent: Sep 1, 2008 10:49 AM >To: James Mckenzie <jjmckenzie51(a)earthlink.net> >Cc: Paul Vriens <paul.vriens.wine(a)gmail.com>, "wine-devel(a)winehq.org" <wine-devel(a)winehq.org> >Subject: Re: Recent msi/package tests failures > >On Mon, Sep 1, 2008 at 10:18 AM, James Mckenzie ><jjmckenzie51(a)earthlink.net> wrote: >> Paul/James: >> Paul Vriens wrote: >>>James Hawkins wrote: >>>> On Sat, Aug 30, 2008 at 3:17 PM, Paul Vriens <paul.vriens.wine(a)gmail.com> wrote: >>>>> Hi, >>>>> >>>>> I just sent a few patches that fix the problem with the timeout on my >>>>> machines. >>>>> >>>>> Do you think it's still worthwhile to disable logging by using >>>>> MsiEnableLogA? When I now look in my temp folder I have a few hundred MSI >>>>> log files. We could either disable logging or create 1 file ourselves and >>>>> append everything to there (removing it afterwards maybe). >>>>> >>>> >>>> Logging to one file takes just as long as any other type of logging. >>>> No logging should be happening. No I don't think it's worth using >>>> MsiEnableLog to disable loggin. Logging is not enabled by default, >>>> and to enable it you have to change some registry entries, which I >>>> doubt anyone is doing. >>>> >>>The reason for the 1 file was not to speed up things but to limit the number of >>>logfiles in the temp directory (and maybe the ability to remove this file as we >>>know the one we created ourselves). >>> >>>On all of my boxes (95/98/NT/W2K/ 2 times XP/W2K3/Vista) I end up with 200 or so >>>logfiles in the temp directory after running the install tests. On none of these >>>boxes did I do anything to tinker with the msi logging settings. >>> >>>It would be nice if other could tell if they have a huge number of these >>>logfiles in their temp directory after running the tests. >>> >> >> +1 to one log file. I hate having to look through piles of log files to find errors. Yes, I know that I could grep them, but that is an added step that should not be needed. >> > >Why would you be grep'ing windows msi log files? > grep is the tool of choice when working with Linux/UNIX text files and searching through thousands of them. If this process is run on Wine in the state that I understand it is, and I may be incorrect, thousands of logging files may be created. Also it is less resource intensive to search one text file under Windows, unless the file is very, very large (> 1 MB). Searching a directory of thousands of files can take a long time (I have experience with this.) One file per run is all that should be created, IMHO. James McKenzie

4 9

re: [PATCH] buffer overflow checking for string functions
by Dan Kegel 04 Sep '08

04 Sep '08

Hi Marcus, http://kegel.com/wine/patchwatcher/results/ shows your patch seems to have caused a test to fail. The full log is at http://kegel.com/wine/patchwatcher/results/1045.log Can you check it and see if it's spurious, or if this is something you need to fix up, or if it was a lurking bug? Thanks, Dan p.s. the interesting bit is: ../../../tools/runtest -q -P wine -M msxml3.dll -T ../../.. -p msxml3_test.exe.so saxreader.c && touch saxreader.ok wine: Unhandled exception 0xc0000409 at address 0x60415fa0 (thread 0062), starting debugger... Unhandled exception: 0xc0000409 in 32-bit code (0x60416016). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b EIP:60416016 ESP:0032f174 EBP:0032f1d8 EFLAGS:00000246( - 00 - IZP1) EAX:603ffc99 EBX:60485d88 ECX:001230a8 EDX:00000000 ESI:6053eda0 EDI:00000000 Stack dump: 0x0032f174: 610602b0 0032f3d8 6053d1c4 00000001 0x0032f184: c0000409 00000001 00000000 60415fa0 0x0032f194: 00000000 6051f145 6053766a 6053d1c4 0x0032f1a4: 00000000 0032f1d8 605378ce 00000001 0x0032f1b4: 6053ae6f 0032f1e8 6053753c 6053add6 0x0032f1c4: 0000005c 0032f83c 6053d1c4 0032f1e8 Backtrace: =>1 0x60416016 RaiseException+0x76(code=3221226505, flags=1, nbargs=0, args=(nil)) [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/kernel32/except.c:85] in kernel32 (0x0032f1d8) 2 0x60531cca test_saxstr+0xca(line=281, szStr=(nil), nStr=<register EDI not in topmost frame>, szTest="") [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/msxml3/tests/../../../include/winnls.h:813] in msxml3_test (0x0032fa28) 3 0x605320e1 contentHandler_startElement+0x41(iface=0x6053da20, pNamespaceUri=(nil), nNamespaceUri=0, pLocalName=0x1296f4, nLocalName=11, pQName=0x12971c, nQName=11, pAttr=0x129744) [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/msxml3/tests/saxreader.c:282] in msxml3_test (0x0032fa38) 4 0x60d46d31 libxmlStartElementNS+0x781(ctx=0x124820, localname="BankAccount", prefix=0x0, URI=0x0, nb_namespaces=0, namespaces=(nil), nb_attributes=0, nb_defaulted=0, attributes=(nil)) [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/msxml3/saxreader.c:1065] in msxml3 (0x0032fad8) 5 0x60da11b1 in libxml2.so.2 (+0x321b1) (0x0032fba8) 6 0x60dab6e0 xmlParseElement+0xa0() in libxml2.so.2 (0x0032fc08) 7 0x60dabd1b xmlParseDocument+0x2ab() in libxml2.so.2 (0x0032fc48) 8 0x60d42181 internal_parseBuffer+0x131(This=<register EDI not in topmost frame>, buffer="<", size=212, vbInterface=0) [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/msxml3/saxreader.c:1672] in msxml3 (0x0032fc88) 9 0x60d4261d internal_parse+0x2fd(This=0x124778, varInput={n1={n2={vt=8, wReserved1=50, wReserved2=39728, wReserved3=24626, n3={cVal=-20, uiVal=38380, ulVal=1218028, intVal=1218028, uintVal=1218028, bVal=-20, iVal=-27156, lVal=1218028, fltVal=0.000000, dblVal=653372038842717154926174532926646266288408872873133910620420354698643182695076070838141136872900174886019390565640505833484670903847518474844878350132969472.000000, boolVal=-27156, scode=1218028, date=653372038842717154926174532926646266288408872873133910620420354698643182695076070838141136872900174886019390565640505833484670903847518474844878350132969472.000000, bstrVal=0x1295ec, cyVal={={Lo=1218028, Hi=1615355272}, int64=6937898064662402540}, punkVal=0x1295ec, pdispVal=0x1295ec, parray=0x1295ec, llVal=6937898064662402540, ullVal=6937898064662402540, pcVal="<", puiVal=0x1295ec, pulVal=0x1295ec, pintVal=0x1295ec, puintVal=0x1295ec, pbVal="<", piVal=0x1295ec, plVal=0x1295ec, pfltVal=0x1295ec, pdblVal=0x1295ec, pboolVal=0x1295ec, pscode=0x1295ec, pdate=0x1295ec, pbstrVal=0x1295ec, pvarVal=0x1295ec, byref=0x1295ec, pcyVal=0x1295ec, pdecVal=0x1295ec, ppunkVal=0x1295ec, ppdispVal=0x1295ec, pparray=0x1295ec, pllVal=0x1295ec, pullVal=0x1295ec, brecVal={pvRecord=0x1295ec, pRecInfo=0x60485d88}}}, decVal={wReserved=8, ={={scale='2', sign=0}, signscale=50}, Hi32=1613929264, ={={Lo32=1218028, Mid32=1615355272}, Lo64=6937898064662402540}}}}, vbInterface=0) [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/msxml3/saxreader.c:1835] in msxml3 (0x0032fd48) 10 0x605316f3 func_saxreader+0x3d3() [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/msxml3/tests/saxreader.c:523] in msxml3_test (0x0032fdd8) 11 0x605371ca run_test+0x14a(name="saxreader.c") [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/msxml3/tests/../../../include/wine/test.h:454] in msxml3_test (0x0032fe18) 12 0x60537a29 main+0x149(argc=<register ECX not in topmost frame>, argv=0x1103d8) [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/msxml3/tests/../../../include/wine/test.h:503] in msxml3_test (0x0032fed8) 13 0x60537b9b __wine_spec_exe_entry+0x5b(peb=0x7ffdf000) [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/winecrt0/exe_entry.c:36] in msxml3_test (0x0032ff08) 14 0x60447577 start_process+0xc7(arg=(nil)) [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/kernel32/process.c:904] in kernel32 (0x0032ffe8) 0x60416016 RaiseException+0x76 [/home/patchwatcher/winezeug/patchwatcher/wine-continuous-workdir/active/dlls/kernel32/except.c:85] in kernel32: movl 0xfffffffc(%ebp),%ebx 85 }

2 1

Re: [PATCH] buffer overflow checking for string functions
by Rob Shearman 04 Sep '08

04 Sep '08

2008/9/4 Marcus Meissner <marcus(a)jet.franken.de>: > +#ifndef STATUS_STACK_BUFFER_OVERRUN > +# define STATUS_STACK_BUFFER_OVERRUN 0xC0000409 > +#endif > +#ifndef EH_NONCONTINUABLE > +# define EH_NONCONTINUABLE 0x01 > +#endif These defines are not used. Either use them or remove them, but I would recommend removing them to keep the namespace clean. -- Rob Shearman

2 1

RE: Fix for patchwatcher error in my 16 vertex shader type
by Stefan Dösinger 04 Sep '08

04 Sep '08

Well, the patch is still wrong conceptually. See my description in the bug report how to fix it properly > -----Original Message----- > From: wine-patches-bounces(a)winehq.org [mailto:wine-patches- > bounces(a)winehq.org] On Behalf Of Chris Ahrendt > Sent: Thursday, September 04, 2008 7:58 AM > To: wine-patches(a)winehq.org > Subject: Fix for patchwatcher error in my 16 vertex shader type > > This fixes the patchwatcher failure in my last submission of this fix. > This is not a total implementation of the 16 vertex shaders. > It is an assumption that no type checking for the 2 other vertex shader > calls are needed (short and int) and can be called with the current > implementation of 4 parms. This seems to work without adding the two > opengl calls.

1 0

Re: [PATCH 3/6] shell32: add tests for SHAppBarMessage
by Alexandre Julliard 04 Sep '08

04 Sep '08

Vincent Povirk <vincent(a)codeweavers.com> writes: > +/* process messages for 1 second */ > +static void do_events(void) > +{ > + MSG msg; > + UINT_PTR timerid; > + > + timerid = SetTimer(NULL, 0, 1000, NULL); > + while (GetMessageW(&msg, NULL, 0, 0) && > + !(msg.message == WM_TIMER && msg.hwnd == NULL && msg.wParam == timerid)) > + { > + TranslateMessage(&msg); > + DispatchMessageW(&msg); > + } > + > + KillTimer(NULL, timerid); You shouldn't do it that way, it makes the test much slower than necessary. If you really have to wait for async events you should use something like flush_events() in the message tests, though in this case it doesn't seem necessary at all since you don't check the resulting messages. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ntdll/file: Add sub-second resolution to NtQueryInformationFile
by Detlef Riekenberg 04 Sep '08

04 Sep '08

On So, 2008-08-17 at 19:03 +0200, Michael Karcher wrote: > --- > configure | 303 > +++++++++++++++++++++++++++++++++++++++++++++++++++ You should never include autogenerated code in a Patch. This will reduce the risk, that your Patch does not apply after a different Patch was commited. -- By by ... Detlef

6 5

wineboot: Basic RunOnceEx support
by Johan Dahlin 04 Sep '08

04 Sep '08

Just enough to make ie6 setup work. I'm not receiving list mail, please CC me when replying. Johan diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index cdbab2e..3be7e22 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wineboot.exe APPMODE = -mconsole -IMPORTS = uuid advapi32 kernel32 ntdll +IMPORTS = uuid advapi32 ole32 kernel32 ntdll DELAYIMPORTS = setupapi shell32 shlwapi version user32 C_SRCS = \ diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 717a175..4a91c37 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -86,6 +86,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineboot); #define MAX_LINE_LENGTH (2*MAX_PATH+2) +typedef HRESULT (*DLLREGISTER) (void); +typedef HRESULT (*DLLINSTALL) (BOOL,LPCWSTR); + extern BOOL shutdown_close_windows( BOOL force ); extern void kill_processes( BOOL kill_desktop ); @@ -157,6 +160,65 @@ done: return ret; } +static VOID *LoadProc(WCHAR* strDllW, const char* procName, HMODULE* DllHandle) +{ + VOID* (*proc)(void); + + *DllHandle = LoadLibraryExW(strDllW, 0, LOAD_WITH_ALTERED_SEARCH_PATH); + if(!*DllHandle) + { + WINE_TRACE("LoadLibraryEx failed %s\n", + wine_dbgstr_w(strDllW)); + return NULL; + } + proc = (VOID *) GetProcAddress(*DllHandle, procName); + if (!proc) + { + WINE_TRACE("GetProcAddress failed (%s -> %s)\n", + wine_dbgstr_w(strDllW), procName); + FreeLibrary(*DllHandle); + return NULL; + } + return proc; +} + +static int RunDllRegisterServer(WCHAR* strDll) +{ + DLLREGISTER pfRegister = NULL; + HRESULT hr; + HMODULE DllHandle = NULL; + + pfRegister = LoadProc(strDll, "DllRegisterServer", &DllHandle); + + if (!pfRegister) + return -1; + + hr = pfRegister(); + + if(DllHandle) + FreeLibrary(DllHandle); + + return hr; +} + +static HRESULT RunDllInstall(WCHAR *strDll, BOOL install, WCHAR *command_line) +{ + DLLINSTALL pfInstall = NULL; + HRESULT hr; + HMODULE DllHandle = NULL; + + pfInstall = LoadProc(strDll, "DllInstall", &DllHandle); + + if (!pfInstall) + return -1; + + hr = pfInstall(install, command_line); + + if(DllHandle) + FreeLibrary(DllHandle); + return hr; +} + /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini. * Returns FALSE if there was an error, or otherwise if all is ok. */ @@ -526,6 +588,197 @@ end: return res==ERROR_SUCCESS; } +static BOOL ProcessRunOnceExKey(HKEY hkRunEntry) +{ + DWORD i; + DWORD res; + DWORD nMaxCmdLine=0, nMaxValue=0; + WCHAR *szCmdLine=NULL; + WCHAR *szValue=NULL; + static const WCHAR KEY_DLLREGISTERSERVER[]={ + 'D','l','l','R','e','g','i','s','t','e','r','S','e','r','v','e','r',0}; + static const WCHAR KEY_DLLINSTALL[]={ + 'D','l','l','I','n','s','t','a','l','l',0}; + + if( (res=RegQueryInfoKeyW( hkRunEntry, NULL, NULL, NULL, NULL, NULL, NULL, &i, &nMaxValue, + &nMaxCmdLine, NULL, NULL ))!=ERROR_SUCCESS ) + goto end; + + + if( (szCmdLine=HeapAlloc(GetProcessHeap(),0,nMaxCmdLine))==NULL ) + { + WINE_ERR("Couldn't allocate memory for the commands to be executed\n"); + + res=ERROR_NOT_ENOUGH_MEMORY; + goto end; + } + + if( (szValue=HeapAlloc(GetProcessHeap(),0,(++nMaxValue)*sizeof(*szValue)))==NULL ) + { + WINE_ERR("Couldn't allocate memory for the value names\n"); + + res=ERROR_NOT_ENOUGH_MEMORY; + goto end; + } + + while( i>0 ) + { + DWORD nValLength=nMaxValue, nDataLength=nMaxCmdLine; + DWORD type; + WCHAR *first, *second, *third; /* | separated parts of the entry */ + WCHAR pipe[] = {'|',0}; + i--; + + if( (res=RegEnumValueW( hkRunEntry, i, szValue, &nValLength, 0, &type, + (LPBYTE)szCmdLine, &nDataLength ))!=ERROR_SUCCESS ) + { + WINE_ERR("Couldn't read in value %d - %d\n", i, res ); + break; + } + + if (strlenW(szValue) == 0) + { + WINE_TRACE("Processing %s entries\n", wine_dbgstr_w( szCmdLine )); + continue; + } + + if( type!=REG_SZ ) + { + WINE_ERR("Incorrect type of value #%d (%d)\n", i, type ); + continue; + } + + if( (res=RegDeleteValueW( hkRunEntry, szValue ))!=ERROR_SUCCESS ) + { + WINE_ERR("Couldn't delete value - %d, %d. Running command anyways.\n", i, res ); + } + + if ((first = strstrW(szCmdLine, pipe)) != NULL) + { + WCHAR *value = first + strlenW(pipe); + HRESULT retval; + if (strncmpW(value, KEY_DLLREGISTERSERVER, + strlenW(KEY_DLLREGISTERSERVER)) == 0) + { + DWORD len; + WCHAR *cmd; + len = strlenW(szCmdLine) - strlenW(first) + strlenW(pipe); + cmd = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * len); + if (cmd == NULL) + goto end; + + if (lstrcpynW(cmd, szCmdLine, len)) + { + WINE_TRACE("DllRegisterServer %s\n", wine_dbgstr_w(cmd)); + retval = RunDllRegisterServer(cmd); + WINE_TRACE("DllRegisterServer returned %d\n", retval); + } + HeapFree(GetProcessHeap(), 0, cmd); + } + else if (strncmpW(value, KEY_DLLINSTALL, + strlenW(KEY_DLLINSTALL)) == 0) + { + WCHAR *filename, *arg = NULL; + WCHAR install = FALSE; + HRESULT retval; + DWORD filenameLength, argLength; + + /* filename|DllInstall + * filename|DllInstall|i,arg + * filename|DllInstall|I,arg + * FIXME: is i=FALSE,I=TRUE or the reverse? + */ + second = strstrW(first + strlenW(pipe), pipe); + if (second == NULL) + filenameLength = strlenW(szCmdLine) - strlenW(first) + strlenW(pipe); + else if ((third = strstrW(second, pipe)) != NULL) + { + filenameLength = strlenW(szCmdLine) - strlenW(first) + strlenW(pipe); + install = *(second + strlenW(pipe)); + + argLength = strlenW(third) - strlenW(pipe) - 1; + filename = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * argLength); + lstrcpynW(arg, third + strlenW(pipe) + 2, argLength); + } + + filename = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * filenameLength); + lstrcpynW(filename, szCmdLine, filenameLength); + + WINE_TRACE("DllInstall (%s, %d, %s)\n", + wine_dbgstr_w(filename), + install == 'i', + wine_dbgstr_w(arg)); + retval = RunDllInstall(filename, install == 'i', arg); + WINE_TRACE("DllInstall returned %d\n", retval); + HeapFree( GetProcessHeap(), 0, filename ); + if (arg) + HeapFree( GetProcessHeap(), 0, arg ); + } + } else { + if( (res=runCmd(szCmdLine, NULL, TRUE, FALSE ))==INVALID_RUNCMD_RETURN ) + { + WINE_ERR("Error running cmd #%d (%d)\n", i, GetLastError() ); + } + } + } + end: + HeapFree( GetProcessHeap(), 0, szValue ); + HeapFree( GetProcessHeap(), 0, szCmdLine ); + + return res; +} + +static BOOL ProcessRunOnceEx( HKEY hkRoot ) +{ + static const WCHAR WINKEY_NAME[]={'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n', '\\', + 'R','u','n','O','n','c','e','E','x',0}; + HKEY hkRunOnceEx, hkRunEntry; + DWORD res; + DWORD i; + + WINE_TRACE("processing RunOnceEx entries under %s\n", hkRoot==HKEY_LOCAL_MACHINE ? "HKLM" : "HKCU"); + + if (RegOpenKeyExW( hkRoot, WINKEY_NAME, 0, KEY_ALL_ACCESS, &hkRunOnceEx ) != ERROR_SUCCESS) + return TRUE; + + i = 0; + while( 1 ) + { + WCHAR szKeyName[2048]; + + res = RegEnumKeyW( hkRunOnceEx, i, szKeyName, 2048); + if ( res==ERROR_NO_MORE_ITEMS ) + break; + else if( res!=ERROR_SUCCESS ) + { + WINE_ERR("Couldn't read in value %d - %d\n", i, res ); + break; + } + i++; + + if (RegOpenKeyExW( hkRunOnceEx, szKeyName, 0, KEY_ALL_ACCESS, &hkRunEntry ) != ERROR_SUCCESS) + return TRUE; + + ProcessRunOnceExKey( hkRunEntry ); + + RegCloseKey( hkRunEntry ); + + if( (res=RegDeleteKeyW( hkRunOnceEx, szKeyName ))!=ERROR_SUCCESS ) + { + WINE_ERR("Couldn't delete key - %s, %d. Running command anyways.\n", + wine_dbgstr_w( szKeyName ), res ); + } + } + if( hkRunOnceEx!=NULL ) + RegCloseKey( hkRunOnceEx ); + + WINE_TRACE("done\n"); + + return res==ERROR_SUCCESS; +} + /* * WFP is Windows File Protection, in NT5 and Windows 2000 it maintains a cache * of known good dlls and scans through and replaces corrupted DLLs with these @@ -824,6 +1077,8 @@ int main( int argc, char *argv[] ) HANDLE event; SECURITY_ATTRIBUTES sa; + OleInitialize(NULL); + GetWindowsDirectoryW( windowsdir, MAX_PATH ); if( !SetCurrentDirectoryW( windowsdir ) ) WINE_ERR("Cannot set the dir to %s (%d)\n", wine_dbgstr_w(windowsdir), GetLastError() ); @@ -875,6 +1130,8 @@ int main( int argc, char *argv[] ) ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], TRUE, TRUE ); + ProcessRunOnceEx( HKEY_LOCAL_MACHINE ); + if (!init && !restart) { ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUN], FALSE, FALSE );

2 2

Re: [PATCH] annotate with allocation size attribute
by Alexandre Julliard 04 Sep '08

04 Sep '08

Marcus Meissner <marcus(a)jet.franken.de> writes: > --- a/include/windef.h > +++ b/include/windef.h > @@ -49,6 +49,12 @@ extern "C" { > #define _WIN64 > #endif > > +#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 4) > +#define ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) > +#else > +#define ALLOC_SIZE(x) > +#endif Since this is an exported header you should use a name that is less likely to conflict with user macros, something like __WINE_ALLOC_SIZE. -- Alexandre Julliard julliard(a)winehq.org

1 0

intermittent ddraw/visual crash
by Dan Kegel 04 Sep '08

04 Sep '08

I'm seeing a crash occasionally in ddraw/tests/visual.c on hardy, with a cheap PNY 8500 GT 512MB PCIe nvidia card. (Hrm. http://www.overclockersclub.com/reviews/8500gt/11.htm has a review that says "stay away from this one", maybe I shouldn't have gone for the cheapest card.) Out of 200 runs, I saw two instances of the crash. Anyone seen this before? http://kegel.com/wine/patchwatcher/results/869.log ../../../tools/runtest -q -P wine -M ddraw.dll -T ../../.. -p ddraw_test.exe.so visual.c && touch visual.ok fixme:d3d:IWineD3DImpl_FillGLCaps OpenGL implementation supports 32 vertex samplers and 32 total samplers fixme:d3d:IWineD3DImpl_FillGLCaps Expected vertex samplers + MAX_TEXTURES(=8) > combined_samplers fixme:win:EnumDisplayDevicesW ((null),0,0x32ed78,0x00000000), stub! fixme:d3d:WineD3D_ChoosePixelFormat Add OpenGL context recreation support to SetDepthStencilSurface fixme:d3d_draw:drawPrimitive Using software emulation because manual fog coordinates are provided fixme:d3d:WineD3D_ChoosePixelFormat Add OpenGL context recreation support to SetDepthStencilSurface fixme:d3d:WineD3D_ChoosePixelFormat Add OpenGL context recreation support to SetDepthStencilSurface wine: Unhandled page fault on read access to 0x0000015c at address 0x611048ce (thread 0013), starting debugger... Unhandled exception: page fault on read access to 0x0000015c in 32-bit code (0x611048ce). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b EIP:611048ce ESP:0032e3e0 EBP:ffffffff EFLAGS:00010246( - 00 -RIZP1) EAX:00000000 EBX:61ab2000 ECX:7c0a7ca0 EDX:00000000 ESI:7c0a7ca0 EDI:7c0a7ca0 Stack dump: 0x0032e3e0: 61ab2000 61b57008 61ac7840 0001ffff 0x0032e3f0: 0032e428 601ea4f0 012c7160 7c07dcb8 0x0032e400: 00000001 00000024 00000002 7c07dcb0 0x0032e410: 601e2e24 beef0003 bfef1f69 602c5ff4 0x0032e420: 0032e5db 0032e448 601e409d 0032e46c 0x0032e430: 0032e59c 0032e5db 0032e58c 602c5ff4 Backtrace: 0x611048ce: movl 0x15c(%eax),%eax http://kegel.com/wine/patchwatcher/results/857.log ../../../tools/runtest -q -P wine -M ddraw.dll -T ../../.. -p ddraw_test.exe.so visual.c && touch visual.ok fixme:d3d:IWineD3DImpl_FillGLCaps OpenGL implementation supports 32 vertex samplers and 32 total samplers fixme:d3d:IWineD3DImpl_FillGLCaps Expected vertex samplers + MAX_TEXTURES(=8) > combined_samplers fixme:win:EnumDisplayDevicesW ((null),0,0x32ed78,0x00000000), stub! fixme:d3d:WineD3D_ChoosePixelFormat Add OpenGL context recreation support to SetDepthStencilSurface wine: Unhandled page fault on read access to 0x0000015c at address 0x611048ce (thread 0013), starting debugger... Unhandled exception: page fault on read access to 0x0000015c in 32-bit code (0x611048ce). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b EIP:611048ce ESP:0032e500 EBP:ffffffff EFLAGS:00010246( - 00 -RIZP1) EAX:00000000 EBX:61ab2000 ECX:7c0a6370 EDX:00000000 ESI:7c0a6370 EDI:7c0a6370 Stack dump: 0x0032e500: 61ab2000 61b57008 61ac7840 0001ffff 0x0032e510: 0032e548 601ea4f0 012c7160 7c072010 0x0032e520: 00000001 00000024 7c097560 602a82f5 0x0032e530: 601e2e24 602c7190 bfef1ac2 602c5ff4 0x0032e540: 0032e6fb 0032e568 601e409d 0032e58c 0x0032e550: 0032e6bc 0032e6fb 0032e6ac 602c5ff4 Backtrace: 0x611048ce: movl 0x15c(%eax),%eax

2 1

Re: [2/2] WineD3D: Make the srgb write flag bigger
by Vitaliy Margolen 04 Sep '08

04 Sep '08

Stefan Dösinger wrote: > > ------------------------------------------------------------------------ > > Apparently gcc pads the structure size to DWORD alignment, which > leaves 3 padding bytes which trigger differences in the memset. > This fixes memory "leaks" in the fragment pipeline replacement > without needing a memset You should add a note to the source about this. Or someone might change the size of this structure and the old bug will return. However the best way to fix this problem would be to pack this structure: #include <pshpack1.h> struct ffp_settings { ... }; #include <poppack.h> Vitaliy.

2 2

Re: AcceptEx Patch set Sep.4
by Scott Lindeneau 03 Sep '08

03 Sep '08

I have tried to make this new patch set as clean as possible. The previous set made numerous changes to many parts of the wineserver. This set attempts to only make modifications to the sock.c functions. Most of it is simply added functionality which is, in my opinion, required to have a correct implementation of AcceptEx. As far as I know, if wine is going to handle simultaneous connections the accept functionality of AcceptEx must be built into the wineserver and not into the dll's. If the dll's only use existing wineserver functions and async commands then connections will be missed due to a race condition between the wineserver threads and the dll user threads. If necessary I can provide proof of concept code for this. I placed the conformance tests at the end of the patch series because I do not know how to correctly use the todo_wine{} brackets in this particular case, and I don't particularly feel like breaking down and rewriting the conformance tests at this point in time.

1 0

Re: wined3d: fix a memory leak and a performance regression in gen_arbfp_ffp_shader
by Henri Verbeet 03 Sep '08

03 Sep '08

2008/9/3 Jeff Zaroyko <jeffzaroyko(a)gmail.com>: > Please ignore the previous patch sent two days ago, this one fixes a > performance regression as well as removing the memory leak. > > -Jeff > Do you have some kind of benchmark data for this change? I don't think allocating relatively large buffers like that on the stack is a good idea. If it does make a lot of difference in terms of performance, it probably makes sense to allocate the buffer in arbfp_alloc() instead and just reuse it. In that case it probably also makes sense to do that for the ARB and GLSL shader backends as well.

4 3

Re: winhttp: Implement some more options.
by Jacek Caban 03 Sep '08

03 Sep '08

Hi Hans, Hans Leidekker wrote: > > +static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffer, DWORD buflen ) > +{ > + if (hdr->type != WINHTTP_HANDLE_TYPE_SESSION) > + { > + release_object( hdr ); > + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); > + return FALSE; > + release_object call looks wrong here. Also, if you use vtbls properly, you shouldn't need to check the type here. Jacek

2 1

Re: [PATCH 4/5] wined3d: Remove glDrawBuffer calls in BltOverride.
by Henri Verbeet 03 Sep '08

03 Sep '08

2008/8/31 Alexander Dorofeyev <alexd4(a)inbox.lv>: > > Handled in ActivateContext, must be remains of pre-context management code. > --- > dlls/wined3d/surface.c | 10 ---------- > 1 files changed, 0 insertions(+), 10 deletions(-) > If you're going to remove those glDrawBuffer calls, you should remove the buffer variable completely.

2 3

Re: [9/9] gdiplus: initial GdipFlattenPath implementation
by Alexandre Julliard 03 Sep '08

03 Sep '08

Nikolay Sivov <bunglehead(a)gmail.com> writes: > +/* free all nodes including argument */ > +void free_path_list(path_list_node_t *node) > +{ > + path_list_node_t *n = node; > + > + while(!n){ > + GdipFree(node); > + node = n = n->next; > + } This won't do what you want. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: ntdll: Fix a few failing tests in Vista
by Alexandre Julliard 03 Sep '08

03 Sep '08

"James Hawkins" <jhawkins(a)codeweavers.com> writes: > @@ -325,13 +327,21 @@ static void read_file_test(void) > iosb.Information = 0xdeadbeef; > offset.QuadPart = strlen(text) + 2; > status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, 2, &offset, NULL ); > - ok( status == STATUS_END_OF_FILE, "wrong status %x\n", status ); > - ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); > - ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); > - ok( !is_signaled( event ), "event is signaled\n" ); > + ok( status == STATUS_END_OF_FILE || > + status == STATUS_PENDING, /* Vista */ > + "wrong status %x\n", status ); > + ok( U(iosb).Status == 0xdeadbabe || > + U(iosb).Status == STATUS_END_OF_FILE, /* Vista */ > + "wrong status %x\n", U(iosb).Status ); > + ok( iosb.Information == 0xdeadbeef || > + iosb.Information == 0, /* Vista */ > + "wrong info %lu\n", iosb.Information ); > ok( !apc_count, "apc was called\n" ); > SleepEx( 1, TRUE ); /* alertable sleep */ > - ok( !apc_count, "apc was called\n" ); > + if ( is_signaled( event ) ) > + ok( apc_count == 1, "apc was not called\n" ); > + else > + ok( !apc_count, "apc was called\n" ); The results are not independent, they should all depend on whether we got STATUS_PENDING or not. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [msxml3/tests 1/2] Use CreateFileA to please win98
by James Hawkins 03 Sep '08

03 Sep '08

On Wed, Sep 3, 2008 at 2:54 AM, Paul Vriens <paul.vriens.wine(a)gmail.com> wrote: > Hi, > > CreateFileW is not implemented on win98. This fixes the 2 remaining test > failures for win98. > > (This is a replacement for the patch James sent). > > Changelog > Use CreateFileA to please win98 > Just a nitpick: + static const CHAR testXmlA[] = "test.xml"; You don't really need this variable. Same thing for the next patch. -- James Hawkins

2 1

Re: msxml3: Fix a failing test in win98
by Paul Vriens 03 Sep '08

03 Sep '08

James Hawkins wrote: > Hi, > > Changelog: > * Fix a failing test in win98. > > dlls/msxml3/tests/xmlelem.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > > > ------------------------------------------------------------------------ > > Two things: The comment says "Win98 returns ERROR_URL_NOT_FOUND" but the ok now has a different comment. I don't think this fix is correct as the failure comes most likely from the GetFullPathNameW just above that. (This probably means the first change, commit 558ae52cc464269457833cfb08879550a63a5d13, was wrong as well). -- Cheers, Paul.

2 1

Re: msxml3: Fix two failing tests in win98
by Paul Vriens 03 Sep '08

03 Sep '08

James Hawkins wrote: > Hi, > > Changelog: > * Fix two failing tests in win98. > > dlls/msxml3/tests/saxreader.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > > > ------------------------------------------------------------------------ > > I don't think this is the correct fix. It all fails because of the CreateFileW slightly above that. -- Cheers, Paul.

1 0

Common conformance test errors
by Dan Kegel 03 Sep '08

03 Sep '08

The file http://kegel.com/wine/common-errors.txt is a list of the most common errors in patchwatcher log files, computed by running egrep ": Test failed: |: Test succeeded inside todo block: |^make\[.*\]: \*\*\* \["| sort | uniq -c | sort -rn on about 500 "make test" runs on a dual core box with a new nvidia card. Here are the top ten: 2597 urlmon:protocol.c:1597: Test failed: Read failed: 8000000a (0 bytes) 927 wininet:http.c:115: Test failed: unexpected status 51 (INTERNET_STATUS_CONNECTION_CLOSED) 927 wininet:http.c:115: Test failed: unexpected status 50 (INTERNET_STATUS_CLOSING_CONNECTION) 927 wininet:http.c:115: Test failed: unexpected status 11 (INTERNET_STATUS_NAME_RESOLVED) 927 wininet:http.c:115: Test failed: unexpected status 10 (INTERNET_STATUS_RESOLVING_NAME) 824 d3d9:device.c:829: Test failed: Screen height is 1024 824 d3d9:device.c:828: Test failed: Screen width is 1280 824 d3d9:device.c:782: Test failed: Screen height is 1024 824 d3d9:device.c:781: Test failed: Screen width is 1280 519 make[1]: *** [user32/tests/__test__] Error 2 So many of the tests fail always that I will probably have to start running the baseline tests fifty times after each git change, to catch all the ones that only happen a small percentage of the time. - Dan

1 0

Re: rpcrt4: Fix a failing test in Vista
by Rob Shearman 02 Sep '08

02 Sep '08

2008/9/2 James Hawkins <jhawkins(a)codeweavers.com>: > Hi, > > Changelog: > * Fix a failing test in Vista. > > dlls/rpcrt4/tests/rpc.c | 4 +++- > dlls/schannel/tests/main.c | 4 +++- > 2 files changed, 6 insertions(+), 2 deletions(-) It looks like another fix got mixed in with this commit. Please resend without the schannel change. -- Rob Shearman

1 0

Re: [PATCH 3/5] wined3d: Make the condition to enter p8 conversion shader path more strict.
by Henri Verbeet 02 Sep '08

02 Sep '08

2008/8/31 Alexander Dorofeyev <alexd4(a)inbox.lv>: > > This prevents shader path from being entered for an offscreen surface when > there is p8 render target and fixes failures in ddraw visual test (with > opengl rendering and RTL_READDRAW mode) and visual glitches in Red Alert. > --- > dlls/wined3d/surface.c | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > This is probably ok for this specific case, but in general I think primary_render_target_is_p8() is somewhat broken. It seems that in most places where it's used it is assumed that "This" is the primary render target. In some cases that's actually always true, but in those cases primary_render_target_is_p8() wouldn't need to check if there's a primary render target, it could just use a surface passed in as parameter. In the other cases, you don't actually know the surface is the primary render target, and you'd need to verify that first, after which you've essentially got the first case again.

2 2

mailman problems?
by Nikolay Sivov 02 Sep '08

02 Sep '08

What seems to be the problems with mailing lists? As for me I get emails with a huge lag, still able to see them on web as they come (without any lag)

2 1

git still down...
by Dan Kegel 02 Sep '08

02 Sep '08

$ git pull source.winehq.org[0: 209.46.25.134]: errno=Connection refused :-(

4 3

Re: Repeated messages (was Re: Adding Flawfinder to Patchwatcher)
by James Mckenzie 02 Sep '08

02 Sep '08

Erik: I am and at four MB a pop this is getting very expensive. Fortunately, I have caught every one of them. Maybe gmail is choking on the message or the 'finished' command comes too late to prevent the message from being sent again and again. James McKenzie -----Original Message----- >From: Erik de Castro Lopo <mle+win(a)mega-nerd.com> >Sent: Aug 31, 2008 4:38 PM >To: wine-devel(a)winehq.org >Subject: Repeated messages (was Re: Adding Flawfinder to Patchwatcher) > >Austin English wrote: > >> I had a discussion with Dan about adding Flawfinder to the >> patchwatcher. > >Is anyone else getting multiple copies of this message? I seem >to be getting one every 10-20 minutes. > >A quick scan of the email headers suggests that this is getting >resent from within the Gmail system. Each duplicate has a received >line like: > > Received: by ey-out-1920.google.com with SMTP id 4so195432eyg.30 > for <wine-devel(a)winehq.org>; Thu, 28 Aug 2008 20:50:50 -0700 (PDT) > >with a unique SMTP id. > >Erik >-- >----------------------------------------------------------------- >Erik de Castro Lopo >----------------------------------------------------------------- >Beware the Lollipop of Mediocrity. >Lick it once, and you suck forever. > >

2 1

Re: wine-devel Digest, Vol 37, Issue 111
by Tim Schwartz 02 Sep '08

02 Sep '08

So Austin, have you had a chance to have a discussion with Dan about adding flawfinder to patchwatcher? On Aug 31, 2008, at 4:12 AM, wine-devel-request(a)winehq.org wrote: > Send wine-devel mailing list submissions to > wine-devel(a)winehq.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://www.winehq.org/mailman/listinfo/wine-devel > or, via email, send a message with subject or body 'help' to > wine-devel-request(a)winehq.org > > You can reach the person managing the list at > wine-devel-owner(a)winehq.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of wine-devel digest..." > > > Today's Topics: > > 1. Adding Flawfinder to Patchwatcher (Austin English) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Thu, 28 Aug 2008 15:59:20 -0500 > From: "Austin English" <austinenglish(a)gmail.com> > Subject: Adding Flawfinder to Patchwatcher > To: "wine-devel(a)winehq.org" <wine-devel(a)winehq.org> > Message-ID: > <b6bb06270808281359o1d1258f9m1af82eddbb763f32(a)mail.gmail.com> > Content-Type: text/plain; charset="utf-8" > > I had a discussion with Dan about adding Flawfinder to the > patchwatcher. Currently, it's got some pretty generic errors, but it > seems able to test only patches, so we wouldn't be flooded with old > nonbugs (or we could set up a blacklist of safe errors). For > reference, I've run it on today's git. I'm attaching the full log, as > well as a condensed version of the most common errors (1 per error > type). Looks like a lot of chances for buffer overflows.. > > Thoughts? > > -Austin >

2 1

Re: Repeated messages (was Re: Adding Flawfinder to Patchwatcher)
by F Capela 02 Sep '08

02 Sep '08

----- Original Message ---- From: L. Rahyen <research(a)science.su> > Yes, I can confirm this. Some time ago copies of this message > stopped coming. However, this was annoying because the message > contains "heavy" attachment. I hope this will not happen again... I'm receiving multiple copies of other messages also, from at least 4 different authors. Seems like all of them use GMail. Fábio Oliveira Schmidt Capela darkwalker_(a)yahoo.com

1 0

Re: mlang: Remove a test that fails on all systems
by Paul Vriens 02 Sep '08

02 Sep '08

Hi, (Grabbed this mail from http://www.winehq.org/pipermail/wine-patches) This test however fails on Windows and succeeds on Wine so there must be something wrong (not 100% correct) in Wine? Maybe Aric should check this one out? -- Cheers, Paul.

2 3

Re: gdiplus: Add some documentation stubs to make winapicheck happy.
by Nikolay Sivov 02 Sep '08

02 Sep '08

Francois Gouget wrote: > +/***************************************************************************** > + * GdipSetEmptye [GDIPLUS.@] > + */ > Typo here.

1 0

Implementing textures functions of d3dx using an extern library.
by Jérôme Gardou 02 Sep '08

02 Sep '08

It appears this mail did not get in, so I resend it... ---------- Forwarded message ---------- From: Jérôme Gardou <jerome.gardou(a)gmail.com> Date: 2008/8/26 Subject: Implementing textures functions of d3dx using an extern library. To: wine-devel(a)winehq.org D3DX supports a wide range of file types for textures. Instead of rewriting everything from scratch, the best would certainly be to use some image processing library to handle them. As a bonus, this would allow lighter code. Some of those library are : SDL_Image : easy to use, but loading an image using a SDL_Surface is quite heavy. Moreover, the files supported are not enough for d3dx. MagickWand/MagickCore, the libraries on which imagemagick is based : Hard to use, and very heavy. Supports every format thet d3dx supports. FreeImage : Quite easy to use, the only files not supported are DIB and PFM... Not so widely represented. I had to recompile it, as packages for it are not available for 32 bits. (I use a 64 bits ubuntu system). Here is an implementation of D3DXGetImageInfoFromFileInMemory using FreeImage. Suggestions and comments are welcomed. PS : Please CC me your potential answers, as I'm not a subscriber of this list.

2 1

ntoskrnl.exe tests
by Alexander Morozov 02 Sep '08

02 Sep '08

Hello, What should modify in these patches that they can be accepted: [try 5] [1/4] dlls/Maketest.rules.in: Add support of building various resources for cross and usual tests http://www.winehq.org/pipermail/wine-patches/2008-August/060204.html [try 5] [2/4] Add tests for ntoskrnl.exe http://www.winehq.org/pipermail/wine-patches/2008-August/060205.html [try 5] [3/4] include/ddk/wdm.h: Add IO_TYPE_* defines http://www.winehq.org/pipermail/wine-patches/2008-August/060203.html [try 5] [4/4] ntoskrnl.exe/tests: Add tests for IoInitializeIrp and IoAllocateIrp http://www.winehq.org/pipermail/wine-patches/2008-August/060206.html

1 0

Re: Patch for font size = 0x7fff in dialog templates
by Koro 02 Sep '08

02 Sep '08

> This is a patch that fixes a discrepancy between WINE's dialog manager > and the real Windows one. If, in a dialog template, (assuming DS_SETFONT > is set) the font size is 0x7fff, it means that the dialog manager must > use the message box font and not read the rest of the font data > (facename and others) off the template. > > This quirk is "documented" in a comment there, and I have myself > confirmed this behavior with some of my code a few months ago: > http://blogs.msdn.com/oldnewthing/archive/2005/04/29/412577.aspx#413552 > > Sending patch as attachment because putting it inline would probably > word-wrap it all over the place. What was wrong with my patch? I never heard of it again, and last time I checked http://source.winehq.org/source/dlls/user32/dialog.c it still wasn't there.

2 1

Re: Recent msi/package tests failures
by James Mckenzie 01 Sep '08

01 Sep '08

Paul/James: Paul Vriens wrote: >James Hawkins wrote: >> On Sat, Aug 30, 2008 at 3:17 PM, Paul Vriens <paul.vriens.wine(a)gmail.com> wrote: >>> Hi, >>> >>> I just sent a few patches that fix the problem with the timeout on my >>> machines. >>> >>> Do you think it's still worthwhile to disable logging by using >>> MsiEnableLogA? When I now look in my temp folder I have a few hundred MSI >>> log files. We could either disable logging or create 1 file ourselves and >>> append everything to there (removing it afterwards maybe). >>> >> >> Logging to one file takes just as long as any other type of logging. >> No logging should be happening. No I don't think it's worth using >> MsiEnableLog to disable loggin. Logging is not enabled by default, >> and to enable it you have to change some registry entries, which I >> doubt anyone is doing. >> >The reason for the 1 file was not to speed up things but to limit the number of >logfiles in the temp directory (and maybe the ability to remove this file as we >know the one we created ourselves). > >On all of my boxes (95/98/NT/W2K/ 2 times XP/W2K3/Vista) I end up with 200 or so >logfiles in the temp directory after running the install tests. On none of these >boxes did I do anything to tinker with the msi logging settings. > >It would be nice if other could tell if they have a huge number of these >logfiles in their temp directory after running the tests. > +1 to one log file. I hate having to look through piles of log files to find errors. Yes, I know that I could grep them, but that is an added step that should not be needed. -- James McKenzie

2 1

Recent msi/package tests failures
by Paul Vriens 01 Sep '08

01 Sep '08

Hi, I was looking into the recent test failures for the msi/package tests on my WinXP box. The reason for most of them was a stray MSITEST package that couldn't be removed via the 'Add/Remove Programs' (had to remove stuff from the registry). Any one else seeing this? (Adam Petaccia's XP box has the same issue I guess). -- Cheers, Paul.

5 12

RE: Fix for rendering issues when calling GetDepthStencilSurface
by Stefan Dösinger 01 Sep '08

01 Sep '08

> When IWineD3DDevice_GetDepthStencilSurface returns WINED3DERR_NOTFOUND > it was setting ppZStencilSurface to null. This was the cause of > rendering issues with the 3d models in spore. Can you write a test for this? I think we have some depth stencil tests in dlls/d3d9/tests/device.c which you could use to test this. I think you are right with this patch - I vaguely remember writing a test for a different getter function, but it is better to be sure

3 4

Problems Running Windows app
by Chris Vermeulen 01 Sep '08

01 Sep '08

Hi Please help me I'm currently running ubuntu 8.04, with wine 1.0 I've got a program that I use to program Telephone systems. It uses a SQL database with a web interface. but I can't get this to work on wine, if I want to install it gives me the following and just closes. Usage: Install a product: msiexec {package|productcode} [property] msiexec /i {package|productcode} [property] msiexec /a package [property] Repair an installation: msiexec /f[p|o|e|d|c|a|u|m|s|v] {package|productcode} Uninstall a product: msiexec /x {package|productcode} [property] Advertise a product: msiexec /j[u|m] package [/t transform] [/g languageid] msiexec {u|m} package [/t transform] [/g languageid] Apply a patch: msiexec /p patchpackage [property] msiexec /p patchpackage /a package [property] Modifiers for above operations: msiexec /l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile msiexec /q{|n|b|r|f|n+|b+|b-} Register a module: msiexec /y module Unregister a module: msiexec /z module Display usage and copyright: msiexec {/h|/?} NOTE: Product code on commandline unimplemented as of yet Copyright 2004 Vincent B�ron Please help I'm hate this dual booting into windows. If I can get this working It'll be like a huge Christmas gift. If you need the program let me know and I'll get it to you Thanks Chris Vermeulen ##################################################################################### Notice This e-mail message and/or attachments may contain information that is confidential to ITEC and/or any of its affiliated companies. If you are not the intended recipient you cannot use, distribute or copy the message and/or attachments. In such a case, please notify the sender by return e-mail immediately and erase all copies of the message and/or attachments. Opinions, conclusions and other information in this message and/or attachments that do not relate to the official business of ITEC or any of its affiliated companies are neither given nor endorsed by it. ITEC and its affiliated companies accept no liability or responsibility of whatever nature for any failure or loss arising from the use of email as a form of communication. #####################################################################################

2 1

Re: kernel32/winerror [try 3]: Add Russian translation
by Dmitry Timoshkov 31 Aug '08

31 Aug '08

"Vladimir Pankratov" <scriptkid(a)mail.ru> wrote: > Added Russian translation for winerrors. > > Added dlls/kernel32/nls/winerror_rus.mc file. > Changed files: > dlls/kernel32/kernel.rc > dlls/kernel32/Makefile.in What's the point in resending the patch without changing anything in it, or at least answering the questions? -- Dmitry.

1 0

Re: [msi/tests 3/3] Create a system restore point when needed
by James Hawkins 31 Aug '08

31 Aug '08

On Sat, Aug 30, 2008 at 3:14 PM, Paul Vriens <paul.vriens.wine(a)gmail.com> wrote: > Hi, > > The slowness on some machines for the install tests comes from the system > restore facility. When 'System Restore' is active you will find a great > number > of system restore points after these tests have run. Adding our own system > restore point circumvents this as Windows will now wait till we tell it that > the > system change has ended. Only 1 system restore point will be created now > and > this one is nicely removed afterwards. > > On my testboxes (XP and Vista) this makes sure that the tests run within the > limits of the timeout (2 minutes). Before this patch the tests would take > about > 8 minutes on my Vista box (now 1.something). > > Changelog > Create a system restore point when needed > Please factor all of this out into functions. + /* Create a system restore point. We need to do this on a system where 'System + * Restore' is active as we would otherwise timeout on these tests. + * By doing so we circumvent the multitude of restore points that would have been + * created by all the installation and removal tests. + * + * The restore point is removed afterwards. + * + * On systems where 'System Restore' is not active, this won't have any effect + * as the first call to SRSetRestorePointA will fail with a status of + * ERROR_SERVICE_DISABLED. + */ Does the comment really need to be that long? -- James Hawkins

2 1

Re: ntdll: add some tests for NtDeleteFile
by Vitaliy Margolen 31 Aug '08

31 Aug '08

Jeff Zaroyko wrote: > > > + static const WCHAR testdirW[] = {'n','t','d','e','l','e','t','e','f','i','l','e',0}; > + static const WCHAR subdirW[] = {'\\','s','u','b',0}; > + > + ret = CreateDirectoryW(testdirW, NULL); You need to create test files and directories in windows temp dir. > + pRtlDosPathNameToNtPathName_U(testdirW, &nameW, NULL, NULL); You are leaking unicode string nameW. You need to call this to free it: RtlFreeUnicodeString( &nameW ); > + ret = pNtDeleteFile(&attr); > + ok(ret == STATUS_SUCCESS, "expected NtDeleteFile to ret STATUS_SUCCESS on failure\n"); How do you know it's a failure? You should check if dir is still there. Vitaliy

2 1

Solution to msi/install test timeouts
by Paul Vriens 31 Aug '08

31 Aug '08

Hi, I've been experimenting on my XP and Vista boxes and the only way to make the tests run fast is by stopping 'System Restore'. It makes sense that this has a huge impact on performance, especially with the big number of installations we are doing in these tests. Could people that are currently seeing timeouts for their boxes on test.winehq.org check if 'System Restore' is indeed activated? -- Cheers, Paul.

2 1

Help for my first patch
by Michael Bonfils 30 Aug '08

30 Aug '08

Hi, I'm using Wine with xUbuntu and you may be know, the menu and toolbar of xfce are often visible. So I've looked at xfce forum and saw that wine doesn't inform xfce that window is fullscreen... At http://standards.freedesktop.org/wm-spec/wm-spec-latest.html, I've found a _NET_WM_STATE_FULLSCREEN flag. After digging in wine source, I've found in dlls/winex11.drv/window.c the function create_whole_window (I think that this function is called when a game want a resolution which isn't supported by X, wine used this function to fake fullscreen ?, correct me I'm wrong) If in set_wm_hints, I force the window_type to _NET_WM_STATE_FULLSCREEN, toolbar and menu of xfce disappears. (tested with Wizardry 8) My problem is how detect in this function that I came from create_whole_window and not from others functions ? Do I have to test size of window to current resolution and use this flag ? Or call XChangeProperty in create_whole_window ? Thanks in advance, Michael

2 1

Re: [try4] d3d9: Set the initial scissorrect ...
by Rico Schüller 30 Aug '08

30 Aug '08

Rico Schüller schrieb: > Hi, > > this patch adds the initial scissorrect for d3d9. The improvement from > the last patch is, that it doesn't try to set it for d3d8 and ddraw > because both don't support scissorrects. > > Cheers > Rico > ------------------------------------------------------------------------ > > This patch is wrong!

1 0

What does patchwatcher do?
by Rico Schüller 30 Aug '08

30 Aug '08

Hi, some days ago I've send a patch which broke some other tests, see http://www.kegel.com/wine/patchwatcher/results/274.txt . But this test got a "conformance test ok". I think patchwatcher should also mark patches as bad when they let crash other tests. Cheers Rico

2 3

Re: [try4] d3d9: Set the initial scissorrect ...
by Henri Verbeet 30 Aug '08

30 Aug '08

2008/8/30 Rico Schüller <kgbricola(a)web.de>: > Hi, > > this patch adds the initial scissorrect for d3d9. The improvement from the > last patch is, that it doesn't try to set it for d3d8 and ddraw because both > don't support scissorrects. > > Cheers > Rico > I'd rather keep that in wined3d for now.

2 1

Re: [Patch] 0001-Support-for-winscard.dll.patch
by Mounir IDRASSI 30 Aug '08

30 Aug '08

Hi All, I have just been informed by one of my contacts that this discussion about Winscard has started. As the original author of Winscard for Wine, I'd like to inform you that I have already posted a fully functional Winscard patch for Wine on April 2007. Here is the link to it : http://www.winehq.org/pipermail/wine-devel/2007-April/056432.html Afterwards, my complete patch was not accepted because I was relying on the fact that alignment of the Winscard structures coming from the WIN32 world is the same as the alignment expected by pcsclite on the system on which Wine is running. My assumption is true for Linux 32Bit but I clearly can't guarantee that on other platforms. Anyway, my implementation is running production systems on two of my customers under Linux 32bit (Ubuntu, CCID readers) and it has been tested by many users who contacted me directly to provide them with the full featured winscard version. For that, I distribute the winscard binary for 32-bit Linux systems under the following link : http://www.idrix.fr/Root/SCard4Wine/winscard.tar.gz I think it would be more efficient if your effort can benefit from my patch and all the experience I have put on it. The source from my side has evolved a little bit but it remains close to the original posting. I hope there will room for collaboration of this to provide a maximum number of Wine users with smart cards functionalities. Cheers, -- Mounir IDRASSI IDRIX http://www.idrix.fr

2 2

Patchwatcher offline
by Dan Kegel 30 Aug '08

30 Aug '08

The patchwatcher robot is offline today while I move it to a faster computer and add a timeout to individual tests (since one hangs reliably on the new computer). Here's the timeout patch, if anyone's interested in doing a little prereview. I finally realized the most windows-y way of doing a timeout was to run the test in its own thread. include/wine/test.h | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)

1 0

A pat on the back for Wine community
by Dan Kegel 30 Aug '08

30 Aug '08

http://www.anthonycargile.com/blog/?p=95 is a blog post that makes it sound like we've hit the promised land already: --- snip --- In addition to multisim 8, I have also successfully installed Microsoft Office 2003 (for the proprietary features not present in OpenOffice required by some classes, mainly wizards), Visio 2003, and Autodesk Maya PLE 8. Some programs I have had installed for a while which run fine are Project 64 Beta, Morrowind (PC game), Macromedia Flash 8, Macromedia Dreamweaver 8, IDA Pro, and Quicken Premier 2008. After looking back on all of these Windows programs successfully running on a non-windows platform (Ubuntu Linux, in this case), I have to personally congradulate the Wine team for their efforts on providing the Windows compatability layer for Linux, and the winetricks script author for further enhancing that ability with Microsoft CoreFonts, .net, and registry key installers. Linux-Windows compatability has really gotten to the point now where a Windows Operating system is almost not even necessary in a Virtual Machine, thanks to Wine, OpenOffice.org, Mono, and the native Linux enhancements for usability in general. These effort have really made the permanent switch much easier than it would have been in 2005 or 2006, since back then one would get in all kinds of trouble for ditching Windows for something else, even in an environment where a Macintosh is somewhat accepted. But now, I can freely roam with native Ubuntu running, since all of my hardware on my 2007 laptop works, and all required programs needed can also run with no problems. --- snip ---

1 0

re: msvcrt: Don't depend on the system's implementation of acos () & asin().
by Dan Kegel 29 Aug '08

29 Aug '08

Henri wrote: > glibc implements acos() as the FPU equivalent of atan2(sqrt(1 - x ^ 2), x). I just looked, and there are several implementations of acos in glibc, and they all seem to very carefully choose how to do it based on how close x is to 1. > This should be fixed on the glibc side as well Indeed. Have you filed a bug report against glibc yet? I didn't see one at http://sourceware.org/bugzilla/ Please be sure to attach a simple C program that reproduces the problem, or better yet, a patch to add a test case to their test suite.

3 5

Re: [4/4] gdiplus: stub for GdipFlattenPath with tests
by Alexandre Julliard 29 Aug '08

29 Aug '08

Nikolay Sivov <bunglehead(a)gmail.com> writes: > Changelog: > - stub for GdipFlattenPath with tests This fails here: ../../../tools/runtest -q -P wine -M gdiplus.dll -T ../../.. -p gdiplus_test.exe.so graphicspath.c && touch graphicspath.ok graphicspath.c:117: Test succeeded inside todo block: Expected #0: PathPointTypeStart (100.0,25.0) but got PathPointTypeStart (100.0,25.0) graphicspath.c:117: Test succeeded inside todo block: Expected #0: PathPointTypeStart (100.0,25.0) but got PathPointTypeStart (100.0,25.0) make[2]: *** [graphicspath.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: kernel32/winerror [try 3]: Add Russian translation
by Vitaliy Margolen 29 Aug '08

29 Aug '08

Vladimir Pankratov wrote: > Dear Vitaliy. > You wrote: >> The character encoding is wrong. The patch using cp866 while it should be >> cp1251. > > Yes, I know. But I can't understand that: > If I using cp1251, see wrong_codepage.jpg > else cp866, see right_codepage.jpg. > > Please explain. > > Thank you. > > Good question - everything looks right to me. Could it be just a problem with wmc? Vitaliy.

1 0

Re: [advapi32] GetNamedSecurityInfo patch
by Nikolay Sivov 29 Aug '08

29 Aug '08

Fenixk19 wrote: > + PSECURITY_DESCRIPTOR local_descriptor; > + if(!descriptor) > + descriptor = &local_descriptor; Why do you try to return anything if a caller doesn't request it passing NULL?

1 0

Implementing textures functions of d3dx using an extern library.
by Jérôme Gardou 29 Aug '08

29 Aug '08

D3DX supports a wide range of file types for textures. Instead of rewriting everything from scratch, the best would certainly be to use some image processing library to handle them. As a bonus, this would allow lighter code. Some of those library are : SDL_Image : easy to use, but loading an image using a SDL_Surface is quite heavy. Moreover, the files supported are not enough for d3dx. MagickWand/MagickCore, the libraries on which imagemagick is based : Hard to use, and very heavy. Supports every format thet d3dx supports. FreeImage : Quite easy to use, the only files not supported are DIB and PFM... Not so widely represented. I had to recompile it, as packages for it are not available for 32 bits. (I use a 64 bits ubuntu system). Here is an implementation of D3DXGetImageInfoFromFileInMemory using FreeImage. Suggestions and comments are welcomed. PS : Please CC me your potential answers, as I'm not a subscriber of this list.

3 8

Re: ntdll: modify NtDeleteFile to fail on directories (try 2)
by Vincent Povirk 29 Aug '08

29 Aug '08

You should add a test that shows that NtDeleteFile fails in this case. Vincent Povirk On Thu, Aug 28, 2008 at 7:40 PM, Jeff Zaroyko <jeffzaroyko(a)gmail.com> wrote: > > > > >

1 0

Re: ntdll/file.c: Allow to TRACE NtCreateFile return
by Dmitry Timoshkov 29 Aug '08

29 Aug '08

"Markus Hitter" <mah(a)jump-ing.de> wrote: > Providing the file handle allows to map > read/write requests to the corresponding file name. As pointed out by Alexander, you can use an appropriate debug channel for that, +relay or +server. There is no need to pollute the source with additional traces. -- Dmitry.

5 8

Re: cryptuiapi(2/2): Document definitions missing from cryptuiapi.h
by Alexandre Julliard 29 Aug '08

29 Aug '08

"Juan Lang" <juan.lang(a)gmail.com> writes: > +/* Definitions missing from PSDK's cryptuiapi.h, but documented on MSDN. */ If they are on MSDN then it's OK to put them in the header, they will most likely end up there in a future PSDK version. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Fix for rendering issues when calling GetDepthStencilSurface
by Alexander Dorofeyev 29 Aug '08

29 Aug '08

Any reason this isn't tested? I don't know about this function in particular, but there have been games that were confused by NOT clearing output to NULL on error (not in GetDepthStencilSurface though). Also regardless of setting or not-setting to NULL, the warning may have its uses when reading +d3d log in the process of debugging something. Andrew Fenn wrote: > When IWineD3DDevice_GetDepthStencilSurface returns WINED3DERR_NOTFOUND > it was setting ppZStencilSurface to null. This was the cause of > rendering issues with the 3d models in spore. >

1 0

RE: Spore patch to fix UI and Part descriptions
by Stefan Dösinger 29 Aug '08

29 Aug '08

These changes may be correct, but they need a test. Take a look at dlls/d3d9/tests/device.c to see how the other tests look. I guess the changes are likely to be correct, but they have to be tested

4 3

Re: appwiz.cpl [try 4]: Add Russian translation
by Nikolay Sivov 29 Aug '08

29 Aug '08

Vladimir Pankratov wrote: > + CONTROL "Контактное лицо:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 53, 60, 8 Are you sure about this? This field usually contains e-mail address of support system or something like that, but not a personal contact information. Btw, how is it named in Russian Windows XP?

1 0

Re: Spore patch to fix UI and Part descriptions
by Rico Schüller 29 Aug '08

29 Aug '08

Andrew Fenn schrieb: > I made a new patch this time including a test. > > I put in some extra checking in SetScissorRect making sure that if > rect was null or it was an invalid rectangle that it was returned as > invalid as it should be. > > I'm not able to do a test on windows so if anyone does one please let > me know if there are any problems. Also please tell me if you spot any > problems with this patch. > > Thanks, > Andrew > > ------------------------------------------------------------------------ > > + RECT rect = {0, 0, 0, 0}; > + hr = IDirect3DDevice9_SetScissorRect(device, &rect); > + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %08x\n", hr); Sorry that I led you in the wrong direction but these tests didn't pass on windows! Also please read the comment to the bug, where I attached my patch. My suggestion which I made there isn't true! The real background is that wine sets the default scissor rect to {0,0,0,0} but on windows it is set to another size, I have written a patch for that, but it looks like there is something incomplete (see http://www.winehq.org/pipermail/wine-patches/2008-August/059891.html ). When the game is starting it retrieves the initial value with GetScissorRect which is in wine the null-rect. And so nothing is rendered to the screen. Cheers Rico

2 3

Re: wined3d/d3d9: Set the initial scissorrect to the dimesions of the backbuffer from the first swapchain of the device
by Andrew Fenn 29 Aug '08

29 Aug '08

This works nicely for me. Spore displays correctly now with this patch and latest git. I also tried your test case on XP and it passed. On Sun, Aug 24, 2008 at 1:09 AM, Rico Schüller <kgbricola(a)web.de> wrote: > Hi, > > this is the second try for this patch. I've renamed it because the previous > description was wrong. > > This patch adds a test for the initial scissorrect values and fixes the > wrong behaviour in wine. > > This solves partly bug 13988. > > > Cheers > Rico > > From 8f72f697284122cd3d691dc8927b127a888f6bde Mon Sep 17 00:00:00 2001 > From: =?utf-8?q?Rico=20Sch=C3=BCller?= <kgbricola(a)web.de> > Date: Sat, 23 Aug 2008 19:59:39 +0200 > Subject: [PATCH] wined3d/d3d9: Set the initial scissorrect to the dimesions > of the backbuffer from the first swapchain of the device > > --- > dlls/d3d9/tests/device.c | 104 > +++++++++++++++++++++++++++++++++++++++++++++ > dlls/wined3d/stateblock.c | 21 +++++++++ > 2 files changed, 125 insertions(+), 0 deletions(-) > > diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c > index 3164b81..a430248 100644 > --- a/dlls/d3d9/tests/device.c > +++ b/dlls/d3d9/tests/device.c > @@ -2016,6 +2016,109 @@ static void test_display_formats() > if(d3d9) IDirect3D9_Release(d3d9); > } > > +static void test_scissor_size(void) > +{ > + IDirect3D9 *d3d9_ptr = 0; > + int i; > + static const struct { > + int winx; int winy; int backx; int backy; int backswap1x; int > backswap1y; BOOL window; > + } scts[] = { /* scissor tests */ > + {800, 600, 640, 480, 1024, 768, TRUE}, > + {800, 600, 640, 480, 1024, 768, FALSE}, > + {640, 480, 800, 600, 1024, 768, TRUE}, > + {640, 480, 800, 600, 1024, 768, FALSE}, > + > + {1024, 768, 640, 480, 800, 600, TRUE}, > + {1024, 768, 640, 480, 800, 600, FALSE}, > + {640, 480, 1024, 768, 800, 600, TRUE}, > + {640, 480, 1024, 768, 800, 600, FALSE}, > + > + {1024, 768, 800, 600, 640, 480, TRUE}, > + {1024, 768, 800, 600, 640, 480, FALSE}, > + {800, 600, 1024, 768, 640, 480, TRUE}, > + {800, 600, 1024, 768, 640, 480, FALSE}, > + }; > + > + d3d9_ptr = pDirect3DCreate9(D3D_SDK_VERSION); > + ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); > + if (!d3d9_ptr){ > + skip("Failed to create IDirect3D9 object\n"); > + return; > + } > + > + for(i=0; i<sizeof(scts)/sizeof(scts[0]); i++) { > + IDirect3DDevice9 *device_ptr = 0; > + D3DPRESENT_PARAMETERS present_parameters; > + HRESULT hr; > + WNDCLASS wc = {0}; > + HWND hwnd = 0; > + IDirect3DSwapChain9 *swapchain1 = 0; > + RECT scissorrect; > + > + wc.lpfnWndProc = DefWindowProc; > + wc.lpszClassName = "d3d9_test_wc"; > + RegisterClass(&wc); > + > + hwnd = CreateWindow("d3d9_test_wc", "d3d9_test", > + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, > scts[i].winx, scts[i].winy, 0, 0, 0, 0); > + > + ZeroMemory(&present_parameters, sizeof(present_parameters)); > + present_parameters.Windowed = scts[i].window; > + present_parameters.hDeviceWindow = hwnd; > + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; > + present_parameters.BackBufferWidth = scts[i].backx; > + present_parameters.BackBufferHeight = scts[i].backy; > + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; > + present_parameters.EnableAutoDepthStencil = TRUE; > + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; > + > + hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, > D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, > D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); > + if(FAILED(hr)) { > + present_parameters.AutoDepthStencilFormat = D3DFMT_D16; > + hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, > D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, > D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); > + if(FAILED(hr)) { > + hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, > D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, > D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); > + } > + } > + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, > "IDirect3D_CreateDevice returned: %08x\n", hr); > + > + if (!device_ptr) > + { > + DestroyWindow(hwnd); > + skip("Creating the device failed\n"); > + goto err_out; > + } > + > + /* add a swapchain only in window mode */ > + if(scts[i].window) > + { > + present_parameters.BackBufferWidth = scts[i].backswap1x; > + present_parameters.BackBufferHeight = scts[i].backswap1y; > + hr = IDirect3DDevice9_CreateAdditionalSwapChain(device_ptr, > &present_parameters, &swapchain1); > + ok(hr == D3D_OK, "IDirect3DDevice9_CreateAdditionalSwapChain > failed in test %i with: %08x\n", i, hr); > + } > + > + /* Check for the default scissor rect size */ > + hr = IDirect3DDevice9_GetScissorRect(device_ptr, &scissorrect); > + ok(hr == D3D_OK, "IDirect3DDevice9_GetScissorRect failed with: > %08x\n", hr); > + ok(scissorrect.right == scts[i].backx && scissorrect.bottom == > scts[i].backy && scissorrect.top == 0 && scissorrect.left == 0, "Scissorrect > missmatch (%d, %d) should be (%d, %d)\n", scissorrect.right, > scissorrect.bottom, scts[i].backx, scts[i].backy); > + > + if(swapchain1) IDirect3DSwapChain9_Release(swapchain1); > + if(device_ptr) { > + ULONG ref; > + > + ref = IDirect3DDevice9_Release(device_ptr); > + DestroyWindow(hwnd); > + ok(ref == 0, "The device was not properly freed: refcount > %u\n", ref); > + } > + } > + > +err_out: > + if(d3d9_ptr) IDirect3D9_Release(d3d9_ptr); > + return; > +} > + > + > START_TEST(device) > { > HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); > @@ -2045,5 +2148,6 @@ START_TEST(device) > test_vertex_buffer_alignment(); > test_lights(); > test_set_stream_source(); > + test_scissor_size(); > } > } > diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c > index e8ff6c1..e953470 100644 > --- a/dlls/wined3d/stateblock.c > +++ b/dlls/wined3d/stateblock.c > @@ -1037,6 +1037,11 @@ static HRESULT WINAPI > IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat > DWORD d; > } tmpfloat; > unsigned int i; > + IWineD3DSwapChain *swapchain; > + IWineD3DSurface *backbuffer; > + WINED3DSURFACE_DESC desc = {0}; > + UINT width, height; > + RECT scissorrect; > > /* Note this may have a large overhead but it should only be executed > once, in order to initialize the complete state of the device and > @@ -1239,6 +1244,22 @@ static HRESULT WINAPI > IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat > This->textures[i] = NULL; > } > > + /* Set the default scissor rect values */ > + desc.Width = &width; > + desc.Height = &height; > + > + IWineD3DDevice_GetSwapChain(device, 0, &swapchain); > + IWineD3DSwapChain_GetBackBuffer(swapchain, 0, > WINED3DBACKBUFFER_TYPE_MONO, &backbuffer); > + IWineD3DSurface_GetDesc(backbuffer, &desc); > + IWineD3DSurface_Release(backbuffer); > + IWineD3DSwapChain_Release(swapchain); > + > + scissorrect.left = 0; > + scissorrect.right = width; > + scissorrect.top = 0; > + scissorrect.bottom = height; > + IWineD3DDevice_SetScissorRect(device, &scissorrect); > + > TRACE("-----------------------> Device defaults now set up...\n"); > return WINED3D_OK; > } > -- > 1.5.5.1 > > > > >

1 0

Re: Vertex Shader Modes > 4 error fix
by Henri Verbeet 29 Aug '08

29 Aug '08

2008/8/29 Chris Ahrendt <celticht32(a)aol.com>: > This is a patch to correct a vertex shader error that is caused by > an error in dlls/wined3d/drawprim.c > > In the function drawStridedSlow > > currently it only handles 4 modes with this fix it handles the 16 defined > nodes in the win API.. > It's not that easy.

2 1

Re: mpr: Improve stubs for WNetGetUniversalName.
by James Hawkins 28 Aug '08

28 Aug '08

On Wed, Aug 27, 2008 at 5:32 PM, Sergey Khodych <khodych(a)gmail.com> wrote: > > From 1dec9750bed16eaeff97cf88374954d5ebde383c Mon Sep 17 00:00:00 2001 > From: Sergey Khodych <khodych(a)gmail.com> > Date: Thu, 28 Aug 2008 01:00:19 +0300 > Subject: mpr: Improve stubs for WNetGetUniversalName. > There are several things wrong with this patch: * It's way too large. Please split it up. * No tests. You need to write tests to back up these changes. * You're changing the style of the file. The original file does not have spaces before or after parentheses. http://wiki.winehq.org/SubmittingPatches -- James Hawkins

2 2

Re: resend: kernel32: modify DeleteFile to fail on directories
by Vincent Povirk 28 Aug '08

28 Aug '08

I think you should avoid the GetFileAttributes call. It adds extra steps (including potentially an extra case-insensitive lookup), and the file attributes could change between that call and NtDeleteFile. It seems like it should be possible to do this without forcing ntdll to search for the file multiple times. Vincent Povirk On Thu, Aug 28, 2008 at 8:57 AM, Jeff Zaroyko <jeffzaroyko(a)gmail.com> wrote: > combining everything in one patch as Paul Vriens suggested, probably > makes more sense. > > -Jeff > > > >

1 0

improvement to patchwatcher
by Vijay Kiran Kamuju 28 Aug '08

28 Aug '08

Hi, Is it possible to add column to the patchwatcher, whether the patch has been rejected/accepted/pending into git. Also please skip the mail entries if they do have "Re:" in the subject and do not have any patch. Mark the corresponding patch to rejected/needs more work. Thanks, VJ --------------------------------------------------------------------------------------------------------------- Fred Allen - "California is a fine place to live - if you happen to be an orange."

9 18

Patch workflow recommendations (was: Re: shlwapi ...)
by Markus Hitter 28 Aug '08

28 Aug '08

Am 26.08.2008 um 16:46 schrieb Dan Kegel: > I updated http://wiki.winehq.org/SubmittingPatches with that info > (and lots more, too) The git sample commands there differ from the ones given in <http:// wiki.winehq.org/GitWine#head- f7a29e7ed999b5924748a60c5a1cd4a019032d26> by the --keep-subject flag. Which one would be the better one? Citing the web page: > If your patch isn't committed in a day or two, improve it (perhaps > by adding more tests) and resend. Or continue on with more changes, > and send a longer patch series next time. Judging by my recent experience, how about: > If your patch isn't committed in a day ot two, first have a look at > the patchwatcher status page, wether your patch were approved. If > it was, you might want to ask on the wine-devel mailing list on how > it could be improved. Especially with your first patches, it might > take a resend or two to get it accustomed to the Wine development > process. I'd avoid recommending longer patch series. MarKus - - - - - - - - - - - - - - - - - - - Dipl. Ing. Markus Hitter http://www.jump-ing.de/

2 1

Re: kernel32/winerror [try 3]: Add Russian translation
by Vitaliy Margolen 28 Aug '08

28 Aug '08

Vladimir Pankratov wrote: > Hello. > > Added Russian translation for winerrors. > > Added dlls/kernel32/nls/winerror_rus.mc file. > Changed files: > dlls/kernel32/kernel.rc > dlls/kernel32/Makefile.in > The character encoding is wrong. The patch using cp866 while it should be cp1251. Please correct this problem and don't resend your patch until you fix it. Vitaliy.

1 0

Re: [3/3] d3dxof: Add basic tests.
by Paul Vriens 28 Aug '08

28 Aug '08

Hi Christian, Could you have a look at the test results on http://test.winehq.org for the d3dxof tests? They all (if run) show: d3dxof.c:84: Test failed: IDirectXFileImpl_RegisterTemplates: 88760362 Whereas on Wine the tests succeed ! -- Cheers, Paul.

2 1

Re: winex11.drv: Hack to delete already-created destination context in wglShareLists()
by Roderick Colenbrander 28 Aug '08

28 Aug '08

The proper way to emulate wglShareLists is to recreate a context and to use glXCopyContext to restore all states. glXCopyContexts is not well known and for that reason very buggy (the nvidia drivers segfault) and dri drivers only offer it in case of indirect rendering. I hadn't encountered a case like this before and I fear we have to live with the fact that it can mess up the states. The code itself is ok but please look at the indentation as we use spaces in wine and your patch introduces tabs. Roderick > Homeworld 2 calls wglShareLists() to share two > contexts having already called wglMakeCurrent() on > both, thus forcing Wine to create both contexts. This > causes wglShareLists() to bomb with a "already > created" error. This patch instead deletes the > destination context, if it exists, before sharing. -- GMX Kostenlose Spiele: Einfach online spielen und Spaß haben mit Pastry Passion! http://games.entertainment.gmx.net/de/entertainment/games/free/puzzle/61691…

2 2

Re: shlwapi/tests: test UrlUnEscape inplace behavior (1/2) (try 4)
by Alexandre Julliard 28 Aug '08

28 Aug '08

"Dan Kegel" <dank(a)kegel.com> writes: > Add test showing UrlUnEscape should convert the url in place > when URL_UNESCAPE_INPLACE is set, even if the output buffer is NULL. > Passes on XP. > Needed by Lively, http://bugs.winehq.org/show_bug.cgi?id=14381 > > Changes since originally posted by Louis: > 1) added todo_wine around parts that fail in Wine > 2) added original From: line as requested by Alexandre > 3) unmunged From: line email address so Alexandre's script recognizes it > > From: "Louis. Lenders" <xerox_xerox2000(a)yahoo.co.uk> > Date: Tue, 26 Aug 2008 07:10:06 -0700 > Subject: test UrlUnEscape inplace behavior I put this in, but next time please make sure to include the complete git-format-patch output, including the initial "From sha1" signature line. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [1/2] kernel32: modify DeleteFile to fail on directories
by Paul Vriens 28 Aug '08

28 Aug '08

Jeff Zaroyko wrote: > Correcting the behaviour of DeleteFile also fixes Wine's > implementation of _unlink in msvcrt, test included. > > > ------------------------------------------------------------------------ > > If the msvcrt tests succeed now you should remove the todo_wine's in this patch. -- Cheers, Paul.

1 0

lsb package for wine thoughts
by Dan Kegel 28 Aug '08

28 Aug '08

One of my wild dreams is to create an LSB package for Wine. One of the many roadblocks is OpenSSL. OpenSSL is not standardized, has a very fragile interface, and the openssl devs say they have no time to fix the problem. This leaves an opening for alternative crypto implementations. The way to tell whether an alternative crypto implementation is series is whether they have a good OpenSSL compatibility wrapper. So far I know of two: nss (the ssl used by Firefox) has one, http://fedoraproject.org/wiki/Nss_compat_ossl and gnu tls has one. nss is part of the LSB, but gnu tls is not. Potentially one could link against nss and its wrapper instead of openssl when building an LSB package of wine. A few issues to consider: a) wrappers might need to be statically linked to avoid clashes with shared libraries built with the real openssl: http://www.linux-archive.org/fedora-development/148626-libgnutls-openssl-re… b) gnu tls is gpl... Does wine currently link against any GPL (as opposed to LGPL) libraries? OK, back to the real world. - Dan

6 10

Re: typelib (oleaut32): [PATCH 1/4] Implement LHASHVALOFNAMESYS
by Alexandre Julliard 28 Aug '08

28 Aug '08

Detlef Riekenberg <wine.dev(a)web.de> writes: > +ULONG WINAPI > +LHashValOfNameSys16(SYSKIND skind, LCID lcid, LPCSTR lpStr) > +{ > + TRACE("(%d, %d, %s) %s\n", skind, lcid, debugstr_a(lpStr), > + (skind == SYS_WIN16) ? "SYS_WIN16" : (skind == SYS_WIN32) ? "SYS_WIN32" : ""); > + return LHashValOfNameSysA(skind, lcid, lpStr); > +} You don't need to introduce a 16-bit function if all it does is forward to the 32-bit one. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ntdll/file.c: Fix a possible NULL dereferencing.
by Nikolay Sivov 28 Aug '08

28 Aug '08

Markus Hitter wrote: > if (!attr || !attr->ObjectName) return STATUS_INVALID_PARAMETER; Shouldn't this be splitted? It isn't safe to rely on evaluation order. Or is it a default compiler setting for us?

4 5

Re: [Gdiplus try2 09/10] Implement GdipGetLogFontA
by Alexandre Julliard 28 Aug '08

28 Aug '08

Adam Petaccia <adam(a)tpetaccia.com> writes: > + lfw = font->lfw; > + memcpy(&lfw, lfa, FIELD_OFFSET(LOGFONTA,lfFaceName)); > + MultiByteToWideChar(CP_ACP, 0, lfa->lfFaceName, -1, lfw.lfFaceName, LF_FACESIZE); The conversion should be the other way around, lfa is the output, and you don't really need lfw. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/3] mshtml: Pass IID_IHTMLBodyElement to the IDispatchEx interface
by Jacek Caban 27 Aug '08

27 Aug '08

Hi Alistair, Alistair Leslie-Hughes wrote: > Hi, > > Changelog: > mshtml: Pass IID_IHTMLBodyElement to the IDispatchEx interface Look at other elements implementation how to do it properly. Your patch will break scripts that use body element. > +static const tid_t HTMLBodyElement_iface_tids[] = { > + IHTMLBodyElement_tid, > + 0 > +}; > + You should add IHTMLDOMNode_tid, IHTMLDOMNode2_tid, IHTMLElement_tid, IHTMLElement2_tid, here. > +static dispex_static_data_t HTMLBodyElement_dispex = { > + NULL, > + IHTMLBodyElement_tid, You should use DispHTMLBodyElement here. > @@ -601,6 +613,7 @@ HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) > HTMLTextContainer_Init(&ret->textcont); > > ret->lpHTMLBodyElementVtbl = &HTMLBodyElementVtbl; > + ret->textcont.element.node.dispex.data = &HTMLBodyElement_dispex; You should call init_dispex here. Jacek

2 2

Re: regedit 1/2: Use unicode strings when updating listview
by Alexander Nicolaysen Sørnes 27 Aug '08

27 Aug '08

På Torsdag 28 august 2008 , 00:29:03 skrev Alexander Nicolaysen Sørnes: > Should be applied after Juan's regedit patch > > > Alexander N. Sørnes Sorry, mean't Lei's. No offence intended. :D

1 0

Summer of code evaluations
by Maarten Lankhorst 27 Aug '08

27 Aug '08

Hi all, As you may know yesterday was the pens down for summer of code 2008 Students are still allowed to write code, but it won't count for the mentors evaluation any more. I would like to request from the mentors to fill in the final evaluation form and from the students to give a final write up: What went well? Did you meet the goals you set? Did you have fun? Is there anything we can do to make wines summer of code better and do you feel like you've become part of the wine community? I also believe that students will have to fill in a final evaluation form as well, so get writing. ;-) Cheers, Maarten.

8 7

Re: Winscard: Correct the declaration of SCardReleaseStartedEvent to match MSDN
by Dmitry Timoshkov 27 Aug '08

27 Aug '08

"Mounir IDRASSI" <mounir.idrassi(a)idrix.net> wrote: > This patch corrects the declaration of the function > SCardReleaseStartedEvent of Winscard to match its definition in MSDN found > in the following link : > > http://msdn.microsoft.com/en-us/library/aa379799(VS.85).aspx > -void WINAPI SCardReleaseStartedEvent(void); > +void WINAPI SCardReleaseStartedEvent(HANDLE); This doesn't match an actual declaration used by PSDK. It's better to use PSDK for a reference, not an online documentation since the latter one is proved to have many typos. -- Dmitry.

2 1

Re: user32: Some changes in minimizing MDI windows (bug #1719)
by Dmitry Timoshkov 27 Aug '08

27 Aug '08

"Ilya Shpigor" <shpigor(a)etersoft.ru> wrote: These all changes need separate patches with test cases along with explanations why each of them is needed. > --- a/dlls/user32/icontitle.c > +++ b/dlls/user32/icontitle.c > @@ -217,6 +217,7 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg, > case WM_NCHITTEST: > return HTCAPTION; > case WM_NCMOUSEMOVE: > + case WM_NCLBUTTONDOWN: > case WM_NCLBUTTONDBLCLK: > return SendMessageW( owner, msg, wParam, lParam ); This one looks like an obvious one, but needs an explanation. > diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c > index 8bffeb0..1967f0c 100644 > --- a/dlls/user32/mdi.c > +++ b/dlls/user32/mdi.c > @@ -1499,6 +1499,7 @@ LRESULT WINAPI DefMDIChildProcA( HWND hwnd, UINT message, > case WM_NEXTMENU: > case WM_SYSCHAR: > case WM_DESTROY: > + case WM_ICONERASEBKGND: > return DefMDIChildProcW( hwnd, message, wParam, lParam ); > } > return DefWindowProcA(hwnd, message, wParam, lParam); > @@ -1656,6 +1657,16 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message, > } > break; > > + case WM_ICONERASEBKGND: > + { > + RECT rect; > + HDC hdc = (HDC)wParam; > + HBRUSH hbr = CreateSolidBrush( GetSysColor(COLOR_BTNFACE) ); > + GetClipBox( hdc, &rect ); > + FillRect( hdc, &rect, hbr ); > + return 1; > + } Why the job done by DefWindowProc is not enough? > --- a/dlls/user32/winpos.c > +++ b/dlls/user32/winpos.c > @@ -823,7 +823,7 @@ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt ) > > hrgn = CreateRectRgn( 0, 0, 0, 0 ); > tmp = CreateRectRgn( 0, 0, 0, 0 ); > - for (child = GetWindow( parent, GW_HWNDFIRST ); child; child = GetWindow( child, GW_HWNDNEXT )) > + for (child = GetWindow( parent, GW_CHILD ); child; child = GetWindow( child, GW_HWNDNEXT )) > { > WND *childPtr; > if (child == hwnd) continue; This change looks wrong. > @@ -2033,6 +2033,15 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos ) > SetForegroundWindow( winpos->hwnd ); > } > > + /* If the window is iconic don't any > + * sizing are needed. bug #1719 > + */ > + if( IsIconic(winpos->hwnd) ) > + { > + winpos->flags |= SWP_NOCLIENTSIZE; > + winpos->flags &= ~SWP_STATECHANGED; > + } > + This requires a test case and an explanation why it's needed. -- Dmitry.

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel