January 2009 - Wine-commits

Andrew Talbot : msctf: Declare some variables static.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: d92eca1ef9e374dba9bad239cd268df1ff1ca9fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d92eca1ef9e374dba9bad239c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 29 22:12:30 2009 +0000 msctf: Declare some variables static. --- dlls/msctf/msctf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 76ed99d..254444b 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -39,9 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctf); -LONG MSCTF_refCount = 0; +static LONG MSCTF_refCount; -HINSTANCE MSCTF_hinstance = 0; +static HINSTANCE MSCTF_hinstance; typedef HRESULT (*LPFNCONSTRUCTOR)(IUnknown *pUnkOuter, IUnknown **ppvOut);

1 0

Paul Vriens : kernel32/tests: Skip some tests on Win9x and WinME.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: a21ea16f909d745121b48556df1dcf9553425d5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a21ea16f909d745121b48556d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jan 29 19:46:50 2009 +0100 kernel32/tests: Skip some tests on Win9x and WinME. --- dlls/kernel32/tests/profile.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 154d6cf..a6a1dd0 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -262,7 +262,7 @@ static void test_profile_sections_names(void) ret = GetPrivateProfileSectionNamesW( bufW, 29, testfile3W ); if (ret == 0 && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { - skip("GetPrivateProfileSectionNamesW is not implemented\n"); + win_skip("GetPrivateProfileSectionNamesW is not implemented\n"); DeleteFileA( testfile3 ); return; } @@ -475,6 +475,18 @@ static void test_GetPrivateProfileString(const char *content, const char *descri trace("test_GetPrivateProfileStringA: %s\n", descript); + if(!lstrcmpA(descript, "CR only")) + { + SetLastError(0xdeadbeef); + ret = GetPrivateProfileStringW(NULL, NULL, NULL, + NULL, 0, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("Win9x and WinME don't handle 'CR only' correctly\n"); + return; + } + } + create_test_file(filename, content, lstrlenA(content)); /* Run this test series with caching. Wine won't cache profile

1 0

Paul Vriens : kernel32/tests: Fix some test failures on Win9x and WinME.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 8236f362ff76a80b59cf25ea7cba81e0a1315559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8236f362ff76a80b59cf25ea7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jan 29 20:23:13 2009 +0100 kernel32/tests: Fix some test failures on Win9x and WinME. --- dlls/kernel32/tests/profile.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index a6a1dd0..5292c33 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -461,7 +461,7 @@ static BOOL emptystr_ok(CHAR emptystr[MAX_PATH]) static void test_GetPrivateProfileString(const char *content, const char *descript) { - DWORD ret; + DWORD ret, len; CHAR buf[MAX_PATH]; CHAR def_val[MAX_PATH]; CHAR path[MAX_PATH]; @@ -497,8 +497,11 @@ static void test_GetPrivateProfileString(const char *content, const char *descri 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), + ok(ret == 18 || + broken(ret == 19), /* Win9x and WinME */ + "Expected 18, got %d\n", ret); + len = lstrlenA("section1") + sizeof(CHAR) + lstrlenA("section2") + 2 * sizeof(CHAR); + ok(!memcmp(buf, "section1\0section2\0", len), "Expected \"section1\\0section2\\0\", got \"%s\"\n", buf); /* lpAppName is empty */ @@ -685,7 +688,9 @@ static void test_GetPrivateProfileString(const char *content, const char *descri 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), + len = lstrlenA("section1") + 2 * sizeof(CHAR); + ok(!memcmp(buf, "section1\0secti\0", ret + 1) || + broken(!memcmp(buf, "section1\0\0", len)), /* Win9x, WinME */ "Expected \"section1\\0secti\\0\", got \"%s\"\n", buf); /* lpKeyName is NULL, not enough room for final key name */ @@ -693,7 +698,8 @@ static void test_GetPrivateProfileString(const char *content, const char *descri 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), + ok(!memcmp(buf, "name1\0name2\0na\0", ret + 1) || + broken(!memcmp(buf, "name1\0name2\0n\0\0", ret + 1)), /* Win9x, WinME */ "Expected \"name1\\0name2\\0na\\0\", got \"%s\"\n", buf); /* key value has quotation marks which are stripped */

1 0

Alasdair Sinclair : oleaut32/tests: Fix missing void in empty parameter list.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: ded6c50b78c7aea98317338e11d1ee6dffd8a015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded6c50b78c7aea98317338e1… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Thu Jan 29 20:58:17 2009 +0000 oleaut32/tests: Fix missing void in empty parameter list. --- dlls/oleaut32/tests/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index f2997d6..1130410 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -495,7 +495,7 @@ static void test_OleCreatePictureIndirect(void) IPicture_Release(pict); } -static void test_apm() +static void test_apm(void) { OLE_HANDLE handle; LPSTREAM stream;

1 0

Alasdair Sinclair : quartz/tests: Fix missing void in empty parameter list.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 20f565de5ee36ac004488724b4e9bbff2bee73cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=20f565de5ee36ac004488724b… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Thu Jan 29 20:58:26 2009 +0000 quartz/tests: Fix missing void in empty parameter list. --- dlls/quartz/tests/avisplitter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index f4c8157..33a0d6d 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -185,7 +185,7 @@ static const char afile[] = "test.avi"; * By avoiding the filtergraph all together and connecting streams directly to * the null renderer I am sure that this is not the case here. */ -static void test_threads() +static void test_threads(void) { IFileSourceFilter *pfile = NULL; IBaseFilter *preader = NULL, *pavi = NULL;

1 0

Alasdair Sinclair : riched20/tests: Fix missing void in empty parameter list.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 0e543a715c54001800381e237952b3e42e4eccce URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e543a715c54001800381e237… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Thu Jan 29 20:58:33 2009 +0000 riched20/tests: Fix missing void in empty parameter list. --- dlls/riched20/tests/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 244ab09..da284d4 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3225,7 +3225,7 @@ static DWORD CALLBACK test_WM_SETTEXT_esCallback(DWORD_PTR dwCookie, return 0; } -static void test_WM_SETTEXT() +static void test_WM_SETTEXT(void) { HWND hwndRichEdit = new_richedit(NULL); const char * TestItem1 = "TestSomeText";

1 0

Alasdair Sinclair : riched32/tests: Fix missing void in empty parameter list.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 44df3f543005aaed108d8e81c295ef769094f54d URL: http://source.winehq.org/git/wine.git/?a=commit;h=44df3f543005aaed108d8e81c… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Thu Jan 29 20:58:40 2009 +0000 riched32/tests: Fix missing void in empty parameter list. --- dlls/riched32/tests/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index fe2d1d5..ac98d16 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -48,7 +48,7 @@ static HWND new_richedit(HWND parent) { return new_window(RICHEDIT_CLASS10A, ES_MULTILINE, parent); } -static void test_WM_SETTEXT() +static void test_WM_SETTEXT(void) { HWND hwndRichEdit = new_richedit(NULL); const char * TestItem1 = "TestSomeText";

1 0

Alexandre Julliard : kernel32/tests: Don' t test the implementation details of the SList structure.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 3e88d45f7c245a072d9ca8815f45a460da24a5fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e88d45f7c245a072d9ca8815… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 29 22:08:07 2009 +0100 kernel32/tests: Don't test the implementation details of the SList structure. --- dlls/kernel32/tests/sync.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 62be4c7..3910466 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -197,7 +197,7 @@ static void test_slist(void) int value; } item1, item2, item3, *pitem; - SLIST_HEADER slist_header, test_header; + SLIST_HEADER slist_header; PSLIST_ENTRY entry; USHORT size; @@ -224,11 +224,8 @@ static void test_slist(void) return; } - memset(&test_header, 0, sizeof(test_header)); memset(&slist_header, 0xFF, sizeof(slist_header)); pInitializeSListHead(&slist_header); - ok(memcmp(&test_header, &slist_header, sizeof(SLIST_HEADER)) == 0, - "InitializeSListHead didn't zero-fill list header\n"); size = pQueryDepthSList(&slist_header); ok(size == 0, "initially created slist has size %d, expected 0\n", size);

1 0

Alexandre Julliard : ntdll/tests: Add a couple of status values seen on Win2K3.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: e887b3947271e04a02728bfd38a3da11b734cd07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e887b3947271e04a02728bfd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 29 22:08:54 2009 +0100 ntdll/tests: Add a couple of status values seen on Win2K3. --- dlls/ntdll/tests/reg.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 0e25c06..25d2145 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -373,7 +373,8 @@ static void test_NtCreateKey(void) /* All NULL */ status = pNtCreateKey(NULL, 0, NULL, 0, 0, 0, 0); - ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08x\n", status); + ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER, + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER, got: 0x%08x\n", status); /* Only the key */ status = pNtCreateKey(&key, 0, NULL, 0, 0, 0, 0); @@ -382,7 +383,8 @@ static void test_NtCreateKey(void) /* Only accessmask */ status = pNtCreateKey(NULL, am, NULL, 0, 0, 0, 0); - ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08x\n", status); + ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER, + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER, got: 0x%08x\n", status); /* Key and accessmask */ status = pNtCreateKey(&key, am, NULL, 0, 0, 0, 0);

1 0

Alexandre Julliard : user32/tests: Add a few optional messages for Win2K3.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 7c1e8a9c5253bdf41c2920214cd6da71b4b97d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1e8a9c5253bdf41c2920214… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 29 22:09:11 2009 +0100 user32/tests: Add a few optional messages for Win2K3. --- dlls/user32/tests/msg.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8edcc01..298757a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -689,6 +689,9 @@ static const struct message WmShowMaxPopupResizedSeq[] = { { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCPAINT, sent|wparam|optional, 1 }, + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent|wparam, 1 }, { WM_ACTIVATE, sent|wparam, 1 }, @@ -1211,6 +1214,7 @@ static const struct message WmCreateCustomDialogSeq[] = { { WM_NCACTIVATE, sent|wparam, 1 }, { WM_GETTEXT, sent|optional|defwinproc }, { WM_GETTEXT, sent|optional|defwinproc }, + { WM_GETTEXT, sent|optional|defwinproc }, { EVENT_OBJECT_DEFACTIONCHANGE, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_ACTIVATE, sent|wparam, 1 }, { WM_GETTEXT, sent|optional },

1 0