October 2008 - Wine-Commits

Aric Stewart : winealsa: Don' t dereference a potentially NULL value in the WARN statement (Coverity 93).
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 2cc258f6c97891afc6feaec1b8bbaba9e7b5755e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc258f6c97891afc6feaec1b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Oct 4 13:03:17 2008 -0500 winealsa: Don't dereference a potentially NULL value in the WARN statement (Coverity 93). --- dlls/winealsa.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 068165e..c9710a2 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1050,8 +1050,8 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || lpMidiHdr->dwBufferLength >= 0x10000ul) { - WARN("%p %p %08x %d/%d\n", lpMidiHdr, lpMidiHdr->lpData, - lpMidiHdr->dwFlags, sizeof(MIDIHDR), dwSize); + WARN("%p %p %08x %d/%d\n", lpMidiHdr, lpMidiHdr ? lpMidiHdr->lpData : NULL, + lpMidiHdr ? lpMidiHdr->dwFlags : 0, sizeof(MIDIHDR), dwSize); return MMSYSERR_INVALPARAM; }

1 0

Aric Stewart : version: Check for out of memory in VerInstallFileA/ W conversion (Coverity 635).
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: ea085768201dfb8338250b2740e01c7f4ce1f420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea085768201dfb8338250b274… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 2 10:39:18 2008 -0500 version: Check for out of memory in VerInstallFileA/W conversion (Coverity 635). --- dlls/version/install.c | 32 ++++++++++++++++++++++++-------- dlls/version/tests/install.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 8 deletions(-) diff --git a/dlls/version/install.c b/dlls/version/install.c index d3170e3..2ecfeb9 100644 --- a/dlls/version/install.c +++ b/dlls/version/install.c @@ -535,7 +535,7 @@ DWORD WINAPI VerInstallFileW( LPCWSTR destdir,LPCWSTR curdir,LPWSTR tmpfile,PUINT tmpfilelen ) { LPSTR wsrcf = NULL, wsrcd = NULL, wdestf = NULL, wdestd = NULL, wtmpf = NULL, wcurd = NULL; - DWORD ret; + DWORD ret = 0; UINT len; if (srcfilename) @@ -543,34 +543,50 @@ DWORD WINAPI VerInstallFileW( len = WideCharToMultiByte( CP_ACP, 0, srcfilename, -1, NULL, 0, NULL, NULL ); if ((wsrcf = HeapAlloc( GetProcessHeap(), 0, len ))) WideCharToMultiByte( CP_ACP, 0, srcfilename, -1, wsrcf, len, NULL, NULL ); + else + ret = VIF_OUTOFMEMORY; } - if (srcdir) + if (srcdir && !ret) { len = WideCharToMultiByte( CP_ACP, 0, srcdir, -1, NULL, 0, NULL, NULL ); if ((wsrcd = HeapAlloc( GetProcessHeap(), 0, len ))) WideCharToMultiByte( CP_ACP, 0, srcdir, -1, wsrcd, len, NULL, NULL ); + else + ret = VIF_OUTOFMEMORY; } - if (destfilename) + if (destfilename && !ret) { len = WideCharToMultiByte( CP_ACP, 0, destfilename, -1, NULL, 0, NULL, NULL ); if ((wdestf = HeapAlloc( GetProcessHeap(), 0, len ))) WideCharToMultiByte( CP_ACP, 0, destfilename, -1, wdestf, len, NULL, NULL ); + else + ret = VIF_OUTOFMEMORY; } - if (destdir) + if (destdir && !ret) { len = WideCharToMultiByte( CP_ACP, 0, destdir, -1, NULL, 0, NULL, NULL ); if ((wdestd = HeapAlloc( GetProcessHeap(), 0, len ))) WideCharToMultiByte( CP_ACP, 0, destdir, -1, wdestd, len, NULL, NULL ); + else + ret = VIF_OUTOFMEMORY; } - if (curdir) + if (curdir && !ret) { len = WideCharToMultiByte( CP_ACP, 0, curdir, -1, NULL, 0, NULL, NULL ); if ((wcurd = HeapAlloc( GetProcessHeap(), 0, len ))) WideCharToMultiByte( CP_ACP, 0, curdir, -1, wcurd, len, NULL, NULL ); + else + ret = VIF_OUTOFMEMORY; } - len = *tmpfilelen * sizeof(WCHAR); - wtmpf = HeapAlloc( GetProcessHeap(), 0, len ); - ret = VerInstallFileA(flags,wsrcf,wdestf,wsrcd,wdestd,wcurd,wtmpf,&len); + if (!ret) + { + len = *tmpfilelen * sizeof(WCHAR); + wtmpf = HeapAlloc( GetProcessHeap(), 0, len ); + if (!wtmpf) + ret = VIF_OUTOFMEMORY; + } + if (!ret) + ret = VerInstallFileA(flags,wsrcf,wdestf,wsrcd,wdestd,wcurd,wtmpf,&len); if (!ret) *tmpfilelen = MultiByteToWideChar( CP_ACP, 0, wtmpf, -1, tmpfile, *tmpfilelen ); else if (ret & VIF_BUFFTOOSMALL) diff --git a/dlls/version/tests/install.c b/dlls/version/tests/install.c index ada860c..ec40d3e 100644 --- a/dlls/version/tests/install.c +++ b/dlls/version/tests/install.c @@ -165,7 +165,48 @@ static void test_find_file(void) } } +static void test_install_file(void) +{ + CHAR tmpname[MAX_PATH]; + UINT size = MAX_PATH; + DWORD rc; + static const CHAR szSrcFileName[] = "nofile.txt"; + static const CHAR szDestFileName[] = "nofile2.txt"; + static const CHAR szSrcDir[] = "D:\\oes\\not\\exist"; + static const CHAR szDestDir[] = "D:\\oes\\not\\exist\\either"; + static const CHAR szCurDir[] = "C:\\"; + + /* testing Invalid Parameters */ + memset(tmpname,0,sizeof(tmpname)); + rc = VerInstallFileA(0x0, NULL, NULL, NULL, NULL, NULL, tmpname, &size); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + memset(tmpname,0,sizeof(tmpname)); + size = MAX_PATH; + rc = VerInstallFileA(0x0, szSrcFileName, NULL, NULL, NULL, NULL, tmpname, &size); + memset(tmpname,0,sizeof(tmpname)); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + size = MAX_PATH; + rc = VerInstallFileA(0x0, szSrcFileName, szDestFileName, NULL, NULL, NULL, tmpname, &size); + memset(tmpname,0,sizeof(tmpname)); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + size = MAX_PATH; + rc = VerInstallFileA(0x0, szSrcFileName, szDestFileName, szSrcDir, NULL, NULL, tmpname, &size); + memset(tmpname,0,sizeof(tmpname)); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + + /* Source file does not exist*/ + + size = MAX_PATH; + rc = VerInstallFileA(0x0, szSrcFileName, szDestFileName, szSrcDir, szDestDir, NULL, tmpname, &size); + memset(tmpname,0,sizeof(tmpname)); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + size = MAX_PATH; + rc = VerInstallFileA(0x0, szSrcFileName, szDestFileName, szSrcDir, szDestDir, szCurDir, tmpname, &size); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); +} + START_TEST(install) { test_find_file(); + test_install_file(); }

1 0

Aric Stewart : x11drv: ime: In the update functions if we get a null string with a len report this and fix len to be 0 (Coverity 656 and 655).
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 6d652ddc4f2b3ee011031e67e644f28f5d61959c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d652ddc4f2b3ee011031e67e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 2 10:43:13 2008 -0500 x11drv: ime: In the update functions if we get a null string with a len report this and fix len to be 0 (Coverity 656 and 655). --- dlls/winex11.drv/ime.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index ab94864..b934035 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -207,6 +207,12 @@ static HIMCC updateCompStr(HIMCC old, LPWSTR compstr, DWORD len) if (old == NULL && compstr == NULL && len == 0) return NULL; + if (compstr == NULL && len != 0) + { + ERR("compstr is NULL however we have a len! Please report\n"); + len = 0; + } + if (old != NULL) { olddata = ImmLockIMCC(old); @@ -343,6 +349,12 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len) if (old == NULL && resultstr == NULL && len == 0) return NULL; + if (resultstr == NULL && len != 0) + { + ERR("resultstr is NULL however we have a len! Please report\n"); + len = 0; + } + if (old != NULL) { olddata = ImmLockIMCC(old);

1 0

Paul Vriens : kernel32/tests: Fix some failures on win9x.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 32af90d53ab9bf907a6790a6d0ca9d191384b6d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32af90d53ab9bf907a6790a6d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 6 13:33:27 2008 +0200 kernel32/tests: Fix some failures on win9x. --- dlls/kernel32/tests/locale.c | 44 ++++++++++++++++++++++++++++------------- 1 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index da7a97d..0c6bd92 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2196,25 +2196,41 @@ static void test_EnumDateFormatsA(void) trace("EnumDateFormatsA 0\n"); date_fmt_buf[0] = 0; + SetLastError(0xdeadbeef); ret = EnumDateFormatsA(enum_datetime_procA, lcid, 0); - ok(ret, "EnumDateFormatsA(0) error %d\n", GetLastError()); - trace("%s\n", date_fmt_buf); - /* test the 1st enumerated format */ - if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; - ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf)); - ok(ret, "GetLocaleInfoA(LOCALE_SSHORTDATE) error %d\n", GetLastError()); - ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); + if (!ret && (GetLastError() == ERROR_INVALID_FLAGS)) + { + win_skip("0 for dwFlags is not supported\n"); + } + else + { + ok(ret, "EnumDateFormatsA(0) error %d\n", GetLastError()); + trace("%s\n", date_fmt_buf); + /* test the 1st enumerated format */ + if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; + ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf)); + ok(ret, "GetLocaleInfoA(LOCALE_SSHORTDATE) error %d\n", GetLastError()); + ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); + } trace("EnumDateFormatsA LOCALE_USE_CP_ACP\n"); date_fmt_buf[0] = 0; + SetLastError(0xdeadbeef); ret = EnumDateFormatsA(enum_datetime_procA, lcid, LOCALE_USE_CP_ACP); - ok(ret, "EnumDateFormatsA(LOCALE_USE_CP_ACP) error %d\n", GetLastError()); - trace("%s\n", date_fmt_buf); - /* test the 1st enumerated format */ - if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; - ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf)); - ok(ret, "GetLocaleInfoA(LOCALE_SSHORTDATE) error %d\n", GetLastError()); - ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); + if (!ret && (GetLastError() == ERROR_INVALID_FLAGS)) + { + win_skip("LOCALE_USE_CP_ACP is not supported\n"); + } + else + { + ok(ret, "EnumDateFormatsA(LOCALE_USE_CP_ACP) error %d\n", GetLastError()); + trace("%s\n", date_fmt_buf); + /* test the 1st enumerated format */ + if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; + ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf)); + ok(ret, "GetLocaleInfoA(LOCALE_SSHORTDATE) error %d\n", GetLastError()); + ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); + } trace("EnumDateFormatsA DATE_SHORTDATE\n"); date_fmt_buf[0] = 0;

1 0

Paul Vriens : kernel32/tests: Fix the remaining errors on win95.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: cc57b863b5cf19a96a518446aac3ebe1bd881127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc57b863b5cf19a96a518446a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 6 13:12:03 2008 +0200 kernel32/tests: Fix the remaining errors on win95. --- dlls/kernel32/tests/codepage.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index c7daf19..8dc6af9 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -236,21 +236,26 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = WideCharToMultiByte(1251, 0, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); - ok(ret == 1, "ret is %d\n", ret); - ok(mbc == -16, "mbc is %d\n", mbc); - if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); - ok(GetLastError() == 0xdeadbeef || - broken(GetLastError() == 0), /* win95 */ - "GetLastError() is %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - ret = WideCharToMultiByte(1251, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); - ok(ret == 1, "ret is %d\n", ret); - ok(mbc == 97, "mbc is %d\n", mbc); - if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); - ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + if (IsValidCodePage(1251)) + { + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(1251, 0, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); + ok(ret == 1, "ret is %d\n", ret); + ok(mbc == -16, "mbc is %d\n", mbc); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef || + broken(GetLastError() == 0), /* win95 */ + "GetLastError() is %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(1251, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); + ok(ret == 1, "ret is %d\n", ret); + ok(mbc == 97, "mbc is %d\n", mbc); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + } + else + skip("Codepage 1251 not available\n"); /* This call triggers the last Win32 error */ SetLastError(0xdeadbeef);

1 0

Dylan Smith : richedit: Show arrow cursor over scrollbar.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 1d21d24a51f6cf7652f63b436f544fceb217fa2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d21d24a51f6cf7652f63b436… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Oct 6 04:28:37 2008 -0400 richedit: Show arrow cursor over scrollbar. --- dlls/riched20/editor.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 608be01..f78e515 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2103,10 +2103,29 @@ static BOOL ME_SetCursor(ME_TextEditor *editor) POINT pt; BOOL isExact; int offset; + SCROLLBARINFO sbi; DWORD messagePos = GetMessagePos(); pt.x = (short)LOWORD(messagePos); pt.y = (short)HIWORD(messagePos); + + sbi.cbSize = sizeof(sbi); + GetScrollBarInfo(editor->hWnd, OBJID_HSCROLL, &sbi); + if (!(sbi.rgstate[0] & (STATE_SYSTEM_INVISIBLE|STATE_SYSTEM_OFFSCREEN)) && + PtInRect(&sbi.rcScrollBar, pt)) + { + SetCursor(LoadCursorW(NULL, (WCHAR*)IDC_ARROW)); + return TRUE; + } + sbi.cbSize = sizeof(sbi); + GetScrollBarInfo(editor->hWnd, OBJID_VSCROLL, &sbi); + if (!(sbi.rgstate[0] & (STATE_SYSTEM_INVISIBLE|STATE_SYSTEM_OFFSCREEN)) && + PtInRect(&sbi.rcScrollBar, pt)) + { + SetCursor(LoadCursorW(NULL, (WCHAR*)IDC_ARROW)); + return TRUE; + } ScreenToClient(editor->hWnd, &pt); + if ((GetWindowLongW(editor->hWnd, GWL_STYLE) & ES_SELECTIONBAR) && (pt.x < editor->selofs || (editor->nSelectionType == stLine && GetCapture() == editor->hWnd)))

1 0

Dylan Smith : user32: Converted rcScrollBar to screen coordinates.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 936191887eef62e9db8d86fba1332c9d9b994ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=936191887eef62e9db8d86fba… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Oct 6 04:28:22 2008 -0400 user32: Converted rcScrollBar to screen coordinates. --- dlls/user32/scroll.c | 4 +++ dlls/user32/tests/scroll.c | 64 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 1 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 5556315..7b7818b 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1237,6 +1237,7 @@ static BOOL SCROLL_GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO in INT nDummy; DWORD style = GetWindowLongW(hwnd, GWL_STYLE); BOOL pressed; + RECT rect; switch (idObject) { @@ -1252,6 +1253,9 @@ static BOOL SCROLL_GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO in SCROLL_GetScrollBarRect(hwnd, nBar, &info->rcScrollBar, &nDummy, &info->dxyLineButton, &info->xyThumbTop); + /* rcScrollBar needs to be in screen coordinates */ + GetWindowRect(hwnd, &rect); + OffsetRect(&info->rcScrollBar, rect.left, rect.top); info->xyThumbBottom = info->xyThumbTop + info->dxyLineButton; diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 3bc407a..62513fa 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -127,6 +127,66 @@ static void scrollbar_test3(void) } +static void scrollbar_test4(void) +{ + BOOL ret; + SCROLLBARINFO sbi; + RECT rect; + + /* Test GetScrollBarInfo to make sure it returns rcScrollBar in screen + * coordinates. */ + sbi.cbSize = sizeof(sbi); + ret = GetScrollBarInfo( hScroll, OBJID_CLIENT, &sbi); + ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); + GetWindowRect( hScroll, &rect ); + ok( ret, "The GetWindowRect() call should not fail.\n" ); + ok( !(sbi.rgstate[0] & (STATE_SYSTEM_INVISIBLE|STATE_SYSTEM_OFFSCREEN)), + "unexpected rgstate(0x%x)\n", sbi.rgstate[0]); + ok( EqualRect(&rect, &sbi.rcScrollBar), + "WindowRect(%d, %d, %d, %d) != rcScrollBar(%d, %d, %d, %d)\n", + rect.top, rect.left, rect.bottom, rect.right, + sbi.rcScrollBar.top, sbi.rcScrollBar.left, + sbi.rcScrollBar.bottom, sbi.rcScrollBar.right ); + + /* Test windows horizontal and vertical scrollbar to make sure rcScrollBar + * is still returned in screen coordinates by moving the window, and + * making sure that it shifts the rcScrollBar value. */ + ShowWindow( hMainWnd, SW_SHOW ); + sbi.cbSize = sizeof(sbi); + ret = GetScrollBarInfo( hMainWnd, OBJID_HSCROLL, &sbi); + ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); + GetWindowRect( hMainWnd, &rect ); + ok( ret, "The GetWindowRect() call should not fail.\n" ); + MoveWindow( hMainWnd, rect.left+5, rect.top+5, + rect.right-rect.left, rect.bottom-rect.top, TRUE ); + rect = sbi.rcScrollBar; + OffsetRect(&rect, 5, 5); + ret = GetScrollBarInfo( hMainWnd, OBJID_HSCROLL, &sbi); + ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); + ok( EqualRect(&rect, &sbi.rcScrollBar), + "PreviousRect(%d, %d, %d, %d) != CurrentRect(%d, %d, %d, %d)\n", + rect.top, rect.left, rect.bottom, rect.right, + sbi.rcScrollBar.top, sbi.rcScrollBar.left, + sbi.rcScrollBar.bottom, sbi.rcScrollBar.right ); + + sbi.cbSize = sizeof(sbi); + ret = GetScrollBarInfo( hMainWnd, OBJID_VSCROLL, &sbi); + ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); + GetWindowRect( hMainWnd, &rect ); + ok( ret, "The GetWindowRect() call should not fail.\n" ); + MoveWindow( hMainWnd, rect.left+5, rect.top+5, + rect.right-rect.left, rect.bottom-rect.top, TRUE ); + rect = sbi.rcScrollBar; + OffsetRect(&rect, 5, 5); + ret = GetScrollBarInfo( hMainWnd, OBJID_VSCROLL, &sbi); + ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); + ok( EqualRect(&rect, &sbi.rcScrollBar), + "PreviousRect(%d, %d, %d, %d) != CurrentRect(%d, %d, %d, %d)\n", + rect.top, rect.left, rect.bottom, rect.right, + sbi.rcScrollBar.top, sbi.rcScrollBar.left, + sbi.rcScrollBar.bottom, sbi.rcScrollBar.right ); +} + START_TEST ( scroll ) { WNDCLASSA wc; @@ -143,7 +203,8 @@ START_TEST ( scroll ) wc.lpfnWndProc = MyWndProc; RegisterClassA(&wc); - hMainWnd = CreateWindowExA( 0, "MyTestWnd", "Scroll", WS_OVERLAPPEDWINDOW, + hMainWnd = CreateWindowExA( 0, "MyTestWnd", "Scroll", + WS_OVERLAPPEDWINDOW|WS_VSCROLL|WS_HSCROLL, CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0 ); if ( !ok( hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n" ) ) @@ -154,6 +215,7 @@ START_TEST ( scroll ) scrollbar_test1(); scrollbar_test2(); scrollbar_test3(); + scrollbar_test4(); DestroyWindow(hScroll); DestroyWindow(hMainWnd);

1 0

Marcus Meissner : advapi32: Check for NULL ptr.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 49c1f1f464b08641884a8f898f004daf040b7c0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c1f1f464b08641884a8f898… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat Oct 4 10:35:32 2008 +0200 advapi32: Check for NULL ptr. --- dlls/advapi32/security.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index ef9ce6e..ca26217 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3147,7 +3147,8 @@ DWORD WINAPI SetEntriesInAclA( ULONG count, PEXPLICIT_ACCESSA pEntries, PACL OldAcl, PACL* NewAcl ) { FIXME("%d %p %p %p\n",count,pEntries,OldAcl,NewAcl); - *NewAcl = NULL; + if (NewAcl) + *NewAcl = NULL; return ERROR_SUCCESS; }

1 0

Aric Stewart : ole32: Handle GetMenuItemCount returning -1 by changing UINT to INT (Coverity 228 ).
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 39b2c1eb50dad989ce319170ef27a0420894f462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b2c1eb50dad989ce319170e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 3 09:55:57 2008 -0500 ole32: Handle GetMenuItemCount returning -1 by changing UINT to INT (Coverity 228). --- dlls/ole32/ole2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 5cee7a1..bdbf6da 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -1299,7 +1299,7 @@ static OleMenuHookItem * OLEMenu_IsHookInstalled( DWORD tid ) */ static BOOL OLEMenu_FindMainMenuIndex( HMENU hMainMenu, HMENU hPopupMenu, UINT *pnPos ) { - UINT i, nItems; + INT i, nItems; nItems = GetMenuItemCount( hMainMenu );

1 0

Alistair Leslie-Hughes : gdiplus: Stub GdipRecordMetafileFileName and GdipRecordMetafileFileNameI.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 4b6cc6e3fd3cb8df681b1ad9a6cbd4c2a580044d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b6cc6e3fd3cb8df681b1ad9a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 3 20:56:40 2008 +1000 gdiplus: Stub GdipRecordMetafileFileName and GdipRecordMetafileFileNameI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/image.c | 21 +++++++++++++++++++++ include/gdiplusenums.h | 11 +++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8d13a19..3ef4271 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -467,8 +467,8 @@ @ stdcall GdipPrivateAddFontFile(ptr wstr) @ stub GdipPrivateAddMemoryFont @ stub GdipRecordMetafile -@ stub GdipRecordMetafileFileName -@ stub GdipRecordMetafileFileNameI +@ stdcall GdipRecordMetafileFileName(wstr long long ptr long wstr ptr) +@ stdcall GdipRecordMetafileFileNameI(wstr long long ptr long wstr ptr) @ stub GdipRecordMetafileI @ stub GdipRecordMetafileStream @ stub GdipRecordMetafileStreamI diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4d6a54f..9516d64 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1455,3 +1455,24 @@ GpStatus WINGDIPAPI GdipTestControl(GpTestControlEnum control, void *param) return Ok; } + +GpStatus WINGDIPAPI GdipRecordMetafileFileName(GDIPCONST WCHAR* fileName, + HDC hdc, EmfType type, GDIPCONST GpRectF *pFrameRect, + MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, + GpMetafile **metafile) +{ + FIXME("%s %p %d %p %d %s %p stub!\n", debugstr_w(fileName), hdc, type, pFrameRect, + frameUnit, debugstr_w(desc), metafile); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipRecordMetafileFileNameI(GDIPCONST WCHAR* fileName, HDC hdc, EmfType type, + GDIPCONST GpRect *pFrameRect, MetafileFrameUnit frameUnit, + GDIPCONST WCHAR *desc, GpMetafile **metafile) +{ + FIXME("%s %p %d %p %d %s %p stub!\n", debugstr_w(fileName), hdc, type, pFrameRect, + frameUnit, debugstr_w(desc), metafile); + + return NotImplemented; +} diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index f3cdad8..0299f41 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -336,6 +336,16 @@ enum GpTestControlEnum TestControlGetBuildNumber = 2 }; +enum MetafileFrameUnit +{ + MetafileFrameUnitPixel = UnitPixel, + MetafileFrameUnitPoint = UnitPoint, + MetafileFrameUnitInch = UnitInch, + MetafileFrameUnitDocument = UnitDocument, + MetafileFrameUnitMillimeter = UnitMillimeter, + MetafileFrameUnitGdi +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -372,6 +382,7 @@ typedef enum CombineMode CombineMode; typedef enum FlushIntention FlushIntention; typedef enum CoordinateSpace CoordinateSpace; typedef enum GpTestControlEnum GpTestControlEnum; +typedef enum MetafileFrameUnit MetafileFrameUnit; #endif /* end of c typedefs */

1 0