September 2008 - Wine-Devel

Testcase - a windows run, please?
by Erik Inge Bolsø Sept. 14, 2008

Sept. 14, 2008

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 Sept. 14, 2008

Sept. 14, 2008

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 Sept. 13, 2008

Sept. 13, 2008

"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 Sept. 13, 2008

Sept. 13, 2008

"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 Sept. 12, 2008

Sept. 12, 2008

> > 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 Sept. 12, 2008

Sept. 12, 2008

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 Sept. 12, 2008

Sept. 12, 2008

> 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 Sept. 12, 2008

Sept. 12, 2008

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 Sept. 12, 2008

Sept. 12, 2008

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 Sept. 12, 2008

Sept. 12, 2008

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