February 2007 - Wine-Commits

Alexandre Julliard : Release 0.9.31.
by Alexandre Julliard Feb. 16, 2007

Feb. 16, 2007

Module: wine Branch: master Commit: 2d7c74f42a96b73b163551c65ebaf75fb06b9863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7c74f42a96b73b163551c65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 15:48:13 2007 +0100 Release 0.9.31. --- ANNOUNCE | 1167 +++++++++++++++++--------------- ChangeLog | 2256 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2886 insertions(+), 557 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d7c74f42a96b73b16355…

1 0

Chris Peterson : comctl32: treeview: New conformance tests for TreeView controls.
by Alexandre Julliard Feb. 16, 2007

Feb. 16, 2007

Module: wine Branch: master Commit: e0983d4c202bc980a95b5f30852c2eac424e5e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0983d4c202bc980a95b5f308… Author: Chris Peterson <Chrisp(a)ucla.edu> Date: Fri Feb 16 02:56:01 2007 -0800 comctl32: treeview: New conformance tests for TreeView controls. --- dlls/comctl32/tests/treeview.c | 191 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 191 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 39821fb..0c11d7a 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1,6 +1,7 @@ /* Unit tests for treeview. * * Copyright 2005 Krzysztof Foltman + * Copyright 2007 Christopher James Peterson * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -171,6 +172,195 @@ static void DoFocusTest(void) ok(GetFocus() == hEdit, "Edit control should have focus\n"); } +static void TestGetSetBkColor(void) +{ + COLORREF crColor = RGB(0,0,0); + + todo_wine{ + /* If the value is -1, the control is using the system color for the background color. */ + crColor = (COLORREF)SendMessage( hTree, TVM_GETBKCOLOR, 0, 0 ); + ok(crColor == -1, "Default background color reported as 0x%.8x\n", crColor); + } + + /* Test for black background */ + SendMessage( hTree, TVM_SETBKCOLOR, 0, (LPARAM)RGB(0,0,0) ); + crColor = (COLORREF)SendMessage( hTree, TVM_GETBKCOLOR, 0, 0 ); + ok(crColor == RGB(0,0,0), "Black background color reported as 0x%.8x\n", crColor); + + /* Test for white background */ + SendMessage( hTree, TVM_SETBKCOLOR, 0, (LPARAM)RGB(255,255,255) ); + crColor = (COLORREF)SendMessage( hTree, TVM_GETBKCOLOR, 0, 0 ); + ok(crColor == RGB(255,255,255), "White background color reported as 0x%.8x\n", crColor); + + /* Reset the default background */ + SendMessage( hTree, TVM_SETBKCOLOR, 0, -1 ); +} + +static void TestGetSetImageList(void) +{ + HIMAGELIST hImageList = NULL; + + /* Test a NULL HIMAGELIST */ + SendMessage( hTree, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)hImageList ); + hImageList = (HIMAGELIST)SendMessage( hTree, TVM_GETIMAGELIST, TVSIL_NORMAL, 0 ); + ok(hImageList == NULL, "NULL image list, reported as 0x%p, expected 0.\n", hImageList); + + /* TODO: Test an actual image list */ +} + +static void TestGetSetIndent(void) +{ + int ulIndent = -1; + int ulMinIndent = -1; + int ulMoreThanTwiceMin = -1; + + /* Finding the minimum indent */ + SendMessage( hTree, TVM_SETINDENT, 0, 0 ); + ulMinIndent = (int)SendMessage( hTree, TVM_GETINDENT, 0, 0 ); + + /* Checking an indent that is more than twice the default indent */ + ulMoreThanTwiceMin = 2*ulMinIndent+1; + SendMessage( hTree, TVM_SETINDENT, ulMoreThanTwiceMin, 0 ); + ulIndent = (DWORD)SendMessage( hTree, TVM_GETINDENT, 0, 0 ); + ok(ulIndent == ulMoreThanTwiceMin, "Indent reported as %d, expected %d\n", ulIndent, ulMoreThanTwiceMin); +} + +static void TestGetSetInsertMarkColor(void) +{ + COLORREF crColor = RGB(0,0,0); + SendMessage( hTree, TVM_SETBKCOLOR, 0, crColor ); + crColor = (COLORREF)SendMessage( hTree, TVM_GETBKCOLOR, 0, 0 ); + ok(crColor == RGB(0,0,0), "Insert mark color reported as 0x%.8x, expected 0x00000000\n", crColor); +} + +static void TestGetSetItem(void) +{ + TVITEM tviRoot = {0}; + int nBufferSize = 80; + char szBuffer[80] = {0}; + + /* Test the root item */ + tviRoot.hItem = hRoot; + tviRoot.mask = TVIF_TEXT; + tviRoot.cchTextMax = nBufferSize; + tviRoot.pszText = szBuffer; + SendMessage( hTree, TVM_GETITEM, 0, (LPARAM)&tviRoot ); + ok(!strcmp("Root", szBuffer), "GetItem: szBuffer=\"%s\", expected \"Root\"\n", szBuffer); + + /* Change the root text */ + strncpy(szBuffer, "Testing123", nBufferSize); + SendMessage( hTree, TVM_SETITEM, 0, (LPARAM)&tviRoot ); + memset(szBuffer, 0, nBufferSize); + SendMessage( hTree, TVM_GETITEM, 0, (LPARAM)&tviRoot ); + ok(!strcmp("Testing123", szBuffer), "GetItem: szBuffer=\"%s\", expected \"Testing123\"\n", szBuffer); + + /* Reset the root text */ + memset(szBuffer, 0, nBufferSize); + strncpy(szBuffer, "Root", nBufferSize); + SendMessage( hTree, TVM_SETITEM, 0, (LPARAM)&tviRoot ); +} + +static void TestGetSetItemHeight(void) +{ + int ulOldHeight = 0; + int ulNewHeight = 0; + + /* Assuming default height to begin with */ + ulOldHeight = (int) SendMessage( hTree, TVM_GETITEMHEIGHT, 0, 0 ); + + /* Explicitly setting and getting the default height */ + SendMessage( hTree, TVM_SETITEMHEIGHT, -1, 0 ); + ulNewHeight = (int) SendMessage( hTree, TVM_GETITEMHEIGHT, 0, 0 ); + ok(ulNewHeight == ulOldHeight, "Default height not set properly, reported %d, expected %d\n", ulNewHeight, ulOldHeight); + + /* Explicitly setting and getting the height of twice the normal */ + SendMessage( hTree, TVM_SETITEMHEIGHT, 2*ulOldHeight, 0 ); + ulNewHeight = (int) SendMessage( hTree, TVM_GETITEMHEIGHT, 0, 0 ); + ok(ulNewHeight == 2*ulOldHeight, "New height not set properly, reported %d, expected %d\n", ulNewHeight, 2*ulOldHeight); + + todo_wine { + /* Assuming tree doesn't have TVS_NONEVENHEIGHT set, so a set of 9 will round down to 8 */ + SendMessage( hTree, TVM_SETITEMHEIGHT, 9, 0 ); + ulNewHeight = (int) SendMessage( hTree, TVM_GETITEMHEIGHT, 0, 0 ); + ok(ulNewHeight == 8, "Uneven height not set properly, reported %d, expected %d\n", ulNewHeight, 8); + } +} + +static void TestGetSetScrollTime(void) +{ + int ulExpectedTime = 20; + int ulTime = 0; + SendMessage( hTree, TVM_SETSCROLLTIME, ulExpectedTime, 0 ); + ulTime = (int)SendMessage( hTree, TVM_GETSCROLLTIME, 0, 0 ); + ok(ulTime == ulExpectedTime, "Scroll time reported as %d, expected %d\n", ulTime, ulExpectedTime); +} + +static void TestGetSetTextColor(void) +{ + /* If the value is -1, the control is using the system color for the text color. */ + COLORREF crColor = RGB(0,0,0); + crColor = (COLORREF)SendMessage( hTree, TVM_GETTEXTCOLOR, 0, 0 ); + ok(crColor == -1, "Default text color reported as 0x%.8x\n", crColor); + + /* Test for black text */ + SendMessage( hTree, TVM_SETTEXTCOLOR, 0, (LPARAM)RGB(0,0,0) ); + crColor = (COLORREF)SendMessage( hTree, TVM_GETTEXTCOLOR, 0, 0 ); + ok(crColor == RGB(0,0,0), "Black text color reported as 0x%.8x\n", crColor); + + /* Test for white text */ + SendMessage( hTree, TVM_SETTEXTCOLOR, 0, (LPARAM)RGB(255,255,255) ); + crColor = (COLORREF)SendMessage( hTree, TVM_GETTEXTCOLOR, 0, 0 ); + ok(crColor == RGB(255,255,255), "White text color reported as 0x%.8x\n", crColor); + + /* Reset the default text color */ + SendMessage( hTree, TVM_SETTEXTCOLOR, 0, -1 ); +} + +static void TestGetSetToolTips(void) +{ + HWND hwndLastToolTip = NULL; + + /* Testing setting a NULL ToolTip */ + SendMessage( hTree, TVM_SETTOOLTIPS, 0, 0 ); + hwndLastToolTip = (HWND)SendMessage( hTree, TVM_GETTOOLTIPS, 0, 0 ); + ok(hwndLastToolTip == NULL, "NULL tool tip, reported as 0x%p, expected 0.\n", hwndLastToolTip); + + /* TODO: Add a test of an actual tooltip */ +} + +static void TestGetSetUnicodeFormat(void) +{ + BOOL bPreviousSetting = 0; + BOOL bNewSetting = 0; + + /* Set to Unicode */ + bPreviousSetting = (BOOL)SendMessage( hTree, TVM_SETUNICODEFORMAT, 1, 0 ); + bNewSetting = (BOOL)SendMessage( hTree, TVM_GETUNICODEFORMAT, 0, 0 ); + ok(bNewSetting == 1, "Unicode setting did not work.\n"); + + /* Set to ANSI */ + SendMessage( hTree, TVM_SETUNICODEFORMAT, 0, 0 ); + bNewSetting = (BOOL)SendMessage( hTree, TVM_GETUNICODEFORMAT, 0, 0 ); + ok(bNewSetting == 0, "ANSI setting did not work.\n"); + + /* Revert to original setting */ + SendMessage( hTree, TVM_SETUNICODEFORMAT, (LPARAM)bPreviousSetting, 0 ); +} + +static void TestGetSet(void) +{ + TestGetSetBkColor(); /* TVM_GETBKCOLOR and TVM_SETBKCOLOR */ + TestGetSetImageList(); /* TVM_GETIMAGELIST and TVM_SETIMAGELIST */ + TestGetSetIndent(); /* TVM_SETINDENT and TVM_GETINDENT */ + TestGetSetInsertMarkColor(); /* TVM_GETINSERTMARKCOLOR and TVM_GETINSERTMARKCOLOR */ + TestGetSetItem(); /* TVM_GETITEM and TVM_SETITEM */ + TestGetSetItemHeight(); /* TVM_GETITEMHEIGHT and TVM_SETITEMHEIGHT*/ + TestGetSetScrollTime(); /* TVM_GETSCROLLTIME and TVM_SETSCROLLTIME */ + TestGetSetTextColor(); /* TVM_GETTEXTCOLOR and TVM_SETTEXTCOLOR */ + TestGetSetToolTips(); /* TVM_GETTOOLTIPS and TVM_SETTOOLTIPS */ + TestGetSetUnicodeFormat(); /* TVM_GETUNICODEFORMAT and TVM_SETUNICODEFORMAT */ +} + static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { @@ -252,6 +442,7 @@ START_TEST(treeview) DoTest1(); DoTest2(); DoFocusTest(); + TestGetSet(); PostMessageA(hMainWnd, WM_CLOSE, 0, 0); while(GetMessageA(&msg,0,0,0)) {

1 0

Hwang YunSong(황윤성) : cmd: Updated Korean resource.
by Alexandre Julliard Feb. 16, 2007

Feb. 16, 2007

Module: wine Branch: master Commit: 644b87158f1c9edd4bb56443f31219cd37505dad URL: http://source.winehq.org/git/wine.git/?a=commit;h=644b87158f1c9edd4bb56443f… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Feb 15 09:42:00 2007 +0900 cmd: Updated Korean resource. --- programs/cmd/Ko.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/cmd/Ko.rc b/programs/cmd/Ko.rc index eaa8f49..32c6b51 100644 --- a/programs/cmd/Ko.rc +++ b/programs/cmd/Ko.rc @@ -3,7 +3,7 @@ * Korean Language Support * * Copyright (C) 1999 D A Pickles - * Copyright 2005 YunSong Hwang + * Copyright 2005,2007 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -55,17 +55,17 @@ ECHO OFF �� ȣ�� Ǵ� �� ִ°� ��ϴ�.\n" WCMD_ERASE, "ERASE ��\n" WCMD_FOR, -"FOR �� Ʈ�� ų �� .\n\ +"FOR �� ų �� .\n\ \n\ ��: FOR �� IN (set) DO ��\n\ \n\ - cmd �ȿ�� ʴ� ��ġ ��Ͽ� FOR�� ҷ�� %�� ʿ��մϴ�.\n" + wine�� cmd �ȿ�� ʴ� ��ġ ��Ͽ� FOR�� ҷ�� %�� ʿ��մϴ�.\n" WCMD_GOTO, "The GOTO �� ġ�� ȿ�� ٸ� �κ�� 帧�� ٲߴϴ�.\n\ \n\ -GOTO�� Ÿ�� ؼ� 255�ڱ�� ϴ�\n\ -(�ٸ� �ü�� ٸ� �� ִ�).\n\ +GOTO�� Ÿ�� ؼ� 255�ڱ�� մϴ�\n\ +(�ٸ� �ü�� ٸ� �� ֽ��ϴ�).\n\ �� 2�� ġ�� ù��° �͸� \n\ ��ų ��Դϴ�. �� ʴ� �󺧷� GOTO�� õ��Ѵٸ� ��ġ�� \n\ �ߴܵ˴ϴ�.\n\

1 0

Hwang YunSong(황윤성) : shell32: Updated Korean resource.
by Alexandre Julliard Feb. 16, 2007

Feb. 16, 2007

Module: wine Branch: master Commit: da33d1b92691da6feb2ec2608dad661035c1c0f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da33d1b92691da6feb2ec2608… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Feb 15 09:40:55 2007 +0900 shell32: Updated Korean resource. --- dlls/shell32/shell32_Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index 446ae69..89ae367 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -177,7 +177,7 @@ IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo y IDS_OVERWRITEFILE_CAPTION "�� �� Ȯ��" IDS_OVERWRITEFOLDER_TEXT " �� ̹� '%1'�̶� �̸�� ϰ� �ֽ��ϴ�.\n\n"\ "�� ̸�� Ѵٸ� ��õ� �� ü�� Դϴ�\n"\ - " ��ü�� Դϴ�. �� ̵��Ű�ų� ��ϰڽ��ϱ�?" + " ��ü�� Դϴ�. �� ̵��Ű�ų� ��ϰڽ��ϱ�?" /* message box strings */

1 0

Damjan Jovanovic : msvcrt: Fix fstat's handling of pipes and char devices.
by Alexandre Julliard Feb. 16, 2007

Feb. 16, 2007

Module: wine Branch: master Commit: 2705d7887692ff3019c7a4b0cf9b7812b10763eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2705d7887692ff3019c7a4b0c… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Feb 16 09:19:34 2007 +0200 msvcrt: Fix fstat's handling of pipes and char devices. For pipes/char devices, st_dev and st_rdev should be the fd, st_nlink is always 1, and st_mode is S_IFIFO and S_IFCHR respectively. Added tests to prove the new behaviour right. --- dlls/msvcrt/file.c | 51 +++++++++++++++++------------ dlls/msvcrt/tests/file.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 21 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b55d600..2a44e6d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1126,6 +1126,7 @@ int CDECL MSVCRT__fileno(MSVCRT_FILE* file) int CDECL MSVCRT__fstat64(int fd, struct MSVCRT__stat64* buf) { DWORD dw; + DWORD type; BY_HANDLE_FILE_INFORMATION hfi; HANDLE hand = msvcrt_fdtoh(fd); @@ -1142,31 +1143,39 @@ int CDECL MSVCRT__fstat64(int fd, struct MSVCRT__stat64* buf) memset(&hfi, 0, sizeof(hfi)); memset(buf, 0, sizeof(struct MSVCRT__stat64)); - if (!GetFileInformationByHandle(hand, &hfi)) + type = GetFileType(hand); + if (type == FILE_TYPE_PIPE) { - WARN(":failed-last error (%d)\n",GetLastError()); - msvcrt_set_errno(ERROR_INVALID_PARAMETER); - return -1; + buf->st_dev = buf->st_rdev = fd; + buf->st_mode = S_IFIFO; + buf->st_nlink = 1; + } + else if (type == FILE_TYPE_CHAR) + { + buf->st_dev = buf->st_rdev = fd; + buf->st_mode = S_IFCHR; + buf->st_nlink = 1; + } + else /* FILE_TYPE_DISK etc. */ + { + if (!GetFileInformationByHandle(hand, &hfi)) + { + WARN(":failed-last error (%d)\n",GetLastError()); + msvcrt_set_errno(ERROR_INVALID_PARAMETER); + return -1; + } + buf->st_mode = S_IFREG | S_IREAD; + if (!(hfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) + buf->st_mode |= S_IWRITE; + buf->st_size = ((__int64)hfi.nFileSizeHigh << 32) + hfi.nFileSizeLow; + RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastAccessTime, &dw); + buf->st_atime = dw; + RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastWriteTime, &dw); + buf->st_mtime = buf->st_ctime = dw; + buf->st_nlink = hfi.nNumberOfLinks; } - dw = GetFileType(hand); - buf->st_mode = S_IREAD; - if (!(hfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) - buf->st_mode |= S_IWRITE; - /* interestingly, Windows never seems to set S_IFDIR */ - if (dw == FILE_TYPE_CHAR) - buf->st_mode |= S_IFCHR; - else if (dw == FILE_TYPE_PIPE) - buf->st_mode |= S_IFIFO; - else - buf->st_mode |= S_IFREG; TRACE(":dwFileAttributes = 0x%x, mode set to 0x%x\n",hfi.dwFileAttributes, buf->st_mode); - buf->st_nlink = hfi.nNumberOfLinks; - buf->st_size = ((__int64)hfi.nFileSizeHigh << 32) + hfi.nFileSizeLow; - RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastAccessTime, &dw); - buf->st_atime = dw; - RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastWriteTime, &dw); - buf->st_mtime = buf->st_ctime = dw; return 0; } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 7294ff9..d7d7676 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -27,6 +27,7 @@ #include <share.h> #include <sys/stat.h> #include <io.h> +#include <direct.h> #include <windef.h> #include <winbase.h> #include <winnls.h> @@ -796,6 +797,86 @@ static void test_setmaxstdio(void) ok(-1 == _setmaxstdio(2049),"_setmaxstdio returned %d instead of -1\n",_setmaxstdio(2049)); } +static void test_stat(void) +{ + int fd; + int pipes[2]; + struct stat buf; + + /* Tests for a file */ + fd = open("stat.tst", O_WRONLY | O_CREAT | O_BINARY, _S_IREAD |_S_IWRITE); + if (fd >= 0) + { + if (fstat(fd, &buf) == 0) + { + if (S_ISREG(buf.st_mode)) + { + ok(buf.st_dev == 0, "st_dev is %d, expected 0\n", buf.st_dev); + ok(buf.st_dev == buf.st_rdev, "st_dev (%d) and st_rdev (%d) differ\n", + buf.st_dev, buf.st_rdev); + ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", + buf.st_nlink); + ok(buf.st_size == 0, "st_size is %d, expected 0\n", + buf.st_size); + } + else + skip("file is not a file?\n"); + } + else + skip("fstat failed, errno %d\n", errno); + close(fd); + remove("stat.tst"); + } + else + skip("open failed with errno %d\n", errno); + + /* Tests for a char device */ + if (_dup2(0, 10) == 0) + { + if (fstat(10, &buf) == 0) + { + if (buf.st_mode == _S_IFCHR) + { + ok(buf.st_dev == 10, "st_dev is %d, expected 10\n", buf.st_dev); + ok(buf.st_rdev == 10, "st_rdev is %d, expected 10\n", buf.st_rdev); + ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", buf.st_nlink); + } + else + skip("stdin is not a char device?\n"); + } + else + skip("fstat failed with errno %d\n", errno); + close(10); + } + else + skip("_dup2 failed with errno %d\n", errno); + + /* Tests for pipes */ + if (_pipe(pipes, 1024, O_BINARY) == 0) + { + if (fstat(pipes[0], &buf) == 0) + { + if (buf.st_mode == _S_IFIFO) + { + ok(buf.st_dev == pipes[0], "st_dev is %d, expected %d\n", + buf.st_dev, pipes[0]); + ok(buf.st_rdev == pipes[0], "st_rdev is %d, expected %d\n", + buf.st_rdev, pipes[0]); + ok(buf.st_nlink == 1, "st_nlink is %d, expected 1\n", + buf.st_nlink); + } + else + skip("pipe() didn't make a pipe?\n"); + } + else + skip("fstat failed with errno %d\n", errno); + close(pipes[0]); + close(pipes[1]); + } + else + skip("pipe failed with errno %d\n", errno); +} + START_TEST(file) { int arg_c; @@ -813,6 +894,7 @@ START_TEST(file) test_file_inherit(arg_v[0]); test_file_write_read(); test_chsize(); + test_stat(); /* testing stream I/O */ test_fdopen();

1 0

Rob Shearman : kernel32: Fix the GetComputerName* functions to not write to the buffer at all if there is not enough space .
by Alexandre Julliard Feb. 16, 2007

Feb. 16, 2007

Module: wine Branch: master Commit: fc5b795f7c544e1dff850174ebf69c8dba458549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5b795f7c544e1dff850174e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 15 23:22:18 2007 +0000 kernel32: Fix the GetComputerName* functions to not write to the buffer at all if there is not enough space. Add tests for the GetComputerName* functions that show this issue. Fix an off-by-one error in setting the size when there is not enough space. Remove the exception handlers for GetComputerNameW, GetComputerNameExA/W, since testing on XP SP2 shows that access violations are not caught and these are not present on Win9x, which does have an exception handler. --- dlls/kernel32/computername.c | 100 +++++++++++-------------------- dlls/kernel32/tests/environ.c | 131 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc5b795f7c544e1dff850…

1 0

Rob Shearman : server: Track the impersonation level of tokens.
by Alexandre Julliard Feb. 16, 2007

Feb. 16, 2007

Module: wine Branch: master Commit: c9b9847dce8cdf111458dbe5f2590ec15067674e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b9847dce8cdf111458dbe5f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 15 23:21:40 2007 +0000 server: Track the impersonation level of tokens. --- dlls/advapi32/tests/security.c | 8 +---- server/token.c | 62 +++++++++++++++++++++++++++++++-------- 2 files changed, 50 insertions(+), 20 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 11863ed..ef342b5 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -812,10 +812,8 @@ static void test_AccessCheck(void) ret = AccessCheck(SecurityDescriptor, Token, MAXIMUM_ALLOWED, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); - todo_wine { ok(!ret && err == ERROR_BAD_IMPERSONATION_LEVEL, "AccessCheck should have failed " "with ERROR_BAD_IMPERSONATION_LEVEL, instead of %d\n", err); - } CloseHandle(Token); @@ -1572,11 +1570,11 @@ static void test_impersonation_level(void) ret = ImpersonateSelf(SecurityAnonymous); ok(ret, "ImpersonateSelf(SecurityAnonymous) failed with error %d\n", GetLastError()); ret = OpenThreadToken(GetCurrentThread(), TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY_SOURCE | TOKEN_IMPERSONATE | TOKEN_ADJUST_DEFAULT, TRUE, &Token); - todo_wine { ok(!ret, "OpenThreadToken should have failed\n"); error = GetLastError(); ok(error == ERROR_CANT_OPEN_ANONYMOUS, "OpenThreadToken on anonymous token should have returned ERROR_CANT_OPEN_ANONYMOUS instead of %d\n", error); /* can't perform access check when opening object against an anonymous impersonation token */ + todo_wine { error = RegOpenKeyEx(HKEY_CURRENT_USER, "Software", 0, KEY_READ, &hkey); ok(error == ERROR_INVALID_HANDLE, "RegOpenKeyEx should have failed with ERROR_INVALID_HANDLE instead of %d\n", error); } @@ -1592,10 +1590,8 @@ static void test_impersonation_level(void) /* can't increase the impersonation level */ ret = DuplicateToken(Token, SecurityIdentification, &Token2); error = GetLastError(); - todo_wine { ok(!ret && error == ERROR_BAD_IMPERSONATION_LEVEL, "Duplicating a token and increasing the impersonation level should have failed with ERROR_BAD_IMPERSONATION_LEVEL instead of %d\n", error); - } /* we can query anything from an anonymous token, including the user */ ret = GetTokenInformation(Token, TokenUser, NULL, 0, &Size); error = GetLastError(); @@ -1621,9 +1617,7 @@ static void test_impersonation_level(void) ret = PrivilegeCheck(Token, PrivilegeSet, &AccessGranted); error = GetLastError(); - todo_wine { ok(!ret && error == ERROR_BAD_IMPERSONATION_LEVEL, "PrivilegeCheck for SecurityAnonymous token should have failed with ERROR_BAD_IMPERSONATION_LEVEL instead of %d\n", error); - } CloseHandle(Token); diff --git a/server/token.c b/server/token.c index 41a2026..f49b355 100644 --- a/server/token.c +++ b/server/token.c @@ -88,6 +88,7 @@ struct token unsigned primary; /* is this a primary or impersonation token? */ ACL *default_dacl; /* the default DACL to assign to objects created by this user */ TOKEN_SOURCE source; /* source of the token */ + SECURITY_IMPERSONATION_LEVEL impersonation_level; /* impersonation level this token is capable of if non-primary token */ }; struct privilege @@ -428,7 +429,8 @@ static struct token *create_token( unsigned primary, const SID *user, const SID_AND_ATTRIBUTES *groups, unsigned int group_count, const LUID_AND_ATTRIBUTES *privs, unsigned int priv_count, const ACL *default_dacl, TOKEN_SOURCE source, - const LUID *modified_id ) + const LUID *modified_id, + SECURITY_IMPERSONATION_LEVEL impersonation_level ) { struct token *token = alloc_object( &token_ops ); if (token) @@ -443,6 +445,11 @@ static struct token *create_token( unsigned primary, const SID *user, list_init( &token->privileges ); list_init( &token->groups ); token->primary = primary; + /* primary tokens don't have impersonation levels */ + if (primary) + token->impersonation_level = -1; + else + token->impersonation_level = impersonation_level; token->default_dacl = NULL; token->primary_group = NULL; @@ -614,7 +621,7 @@ struct token *token_create_admin( void ) token = create_token( TRUE, &interactive_sid, admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]), admin_privs, sizeof(admin_privs)/sizeof(admin_privs[0]), - default_dacl, admin_source, NULL ); + default_dacl, admin_source, NULL, -1 ); /* we really need a primary group */ assert( token->primary_group ); } @@ -1007,10 +1014,15 @@ DECL_HANDLER(open_token) if (thread) { if (thread->token) - reply->token = alloc_handle( current->process, thread->token, req->access, - req->attributes ); + { + if (thread->token->impersonation_level <= SecurityAnonymous) + set_error( STATUS_CANT_OPEN_ANONYMOUS ); + else + reply->token = alloc_handle( current->process, thread->token, + req->access, req->attributes ); + } else - set_error(STATUS_NO_TOKEN); + set_error( STATUS_NO_TOKEN ); release_object( thread ); } } @@ -1023,7 +1035,7 @@ DECL_HANDLER(open_token) reply->token = alloc_handle( current->process, process->token, req->access, req->attributes ); else - set_error(STATUS_NO_TOKEN); + set_error( STATUS_NO_TOKEN ); release_object( process ); } } @@ -1114,16 +1126,30 @@ DECL_HANDLER(get_token_privileges) DECL_HANDLER(duplicate_token) { struct token *src_token; + + if ((req->impersonation_level < SecurityAnonymous) || + (req->impersonation_level > SecurityDelegation)) + { + set_error( STATUS_BAD_IMPERSONATION_LEVEL ); + return; + } + if ((src_token = (struct token *)get_handle_obj( current->process, req->handle, TOKEN_DUPLICATE, &token_ops ))) { - /* FIXME: use req->impersonation_level */ - struct token *token = create_token( req->primary, src_token->user, - NULL, 0, NULL, 0, - src_token->default_dacl, - src_token->source, - &src_token->modified_id ); + const LUID *modified_id = + req->primary || (req->impersonation_level == src_token->impersonation_level) ? + &src_token->modified_id : NULL; + struct token *token = NULL; + + if (req->primary || (req->impersonation_level <= src_token->impersonation_level)) + token = create_token( req->primary, src_token->user, NULL, 0, + NULL, 0, src_token->default_dacl, + src_token->source, modified_id, + req->impersonation_level ); + else set_error( STATUS_BAD_IMPERSONATION_LEVEL ); + if (token) { struct privilege *privilege; @@ -1170,7 +1196,10 @@ DECL_HANDLER(check_token_privileges) &token_ops ))) { unsigned int count = get_req_data_size() / sizeof(LUID_AND_ATTRIBUTES); - if (get_reply_max_size() >= count * sizeof(LUID_AND_ATTRIBUTES)) + + if (!token->primary && token->impersonation_level <= SecurityAnonymous) + set_error( STATUS_BAD_IMPERSONATION_LEVEL ); + else if (get_reply_max_size() >= count * sizeof(LUID_AND_ATTRIBUTES)) { LUID_AND_ATTRIBUTES *usedprivs = set_reply_data_size( count * sizeof(*usedprivs) ); reply->has_privileges = token_check_privileges( token, req->all_required, get_req_data(), count, usedprivs ); @@ -1213,6 +1242,13 @@ DECL_HANDLER(access_check) release_object( token ); return; } + /* anonymous impersonation tokens can't be used */ + if (token->impersonation_level <= SecurityAnonymous) + { + set_error( STATUS_BAD_IMPERSONATION_LEVEL ); + release_object( token ); + return; + } mapping.GenericRead = req->mapping_read; mapping.GenericWrite = req->mapping_write;

1 0

Rob Shearman : server: Track IDs for tokens and modifications made to tokens.
by Alexandre Julliard Feb. 16, 2007

Feb. 16, 2007

Module: wine Branch: master Commit: df0d6253512b77941f417b8bf2a163a59ae46ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df0d6253512b77941f417b8bf… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 15 23:20:48 2007 +0000 server: Track IDs for tokens and modifications made to tokens. --- server/token.c | 32 +++++++++++++++++++++++++++++--- 1 files changed, 29 insertions(+), 3 deletions(-) diff --git a/server/token.c b/server/token.c index 88558e6..41a2026 100644 --- a/server/token.c +++ b/server/token.c @@ -74,9 +74,13 @@ const PSID security_interactive_sid = (PSID)&interactive_sid; static const PSID security_authenticated_user_sid = (PSID)&authenticated_user_sid; static const PSID security_local_system_sid = (PSID)&local_system_sid; +static LUID prev_luid_value = { 1000, 0 }; + struct token { struct object obj; /* object header */ + LUID token_id; /* system-unique id of token */ + LUID modified_id; /* new id allocated every time token is modified */ struct list privileges; /* privileges available to the token */ struct list groups; /* groups that the user of this token belongs to (sid_and_attributes) */ SID *user; /* SID of user this token represents */ @@ -354,6 +358,12 @@ static inline int is_equal_luid( const LUID *luid1, const LUID *luid2 ) return (luid1->LowPart == luid2->LowPart && luid1->HighPart == luid2->HighPart); } +static inline void allocate_luid( LUID *luid ) +{ + prev_luid_value.LowPart++; + *luid = prev_luid_value; +} + static inline void luid_and_attr_from_privilege( LUID_AND_ATTRIBUTES *out, const struct privilege *in) { out->Luid = in->luid; @@ -411,17 +421,25 @@ static void token_destroy( struct object *obj ) * privs may be NULL if priv_count is 0. * default_dacl may be NULL, indicating that all objects created by the user * are unsecured. + * modified_id may be NULL, indicating that a new modified_id luid should be + * allocated. */ static struct token *create_token( unsigned primary, const SID *user, const SID_AND_ATTRIBUTES *groups, unsigned int group_count, const LUID_AND_ATTRIBUTES *privs, unsigned int priv_count, - const ACL *default_dacl, TOKEN_SOURCE source ) + const ACL *default_dacl, TOKEN_SOURCE source, + const LUID *modified_id ) { struct token *token = alloc_object( &token_ops ); if (token) { unsigned int i; + allocate_luid( &token->token_id ); + if (modified_id) + token->modified_id = *modified_id; + else + allocate_luid( &token->modified_id ); list_init( &token->privileges ); list_init( &token->groups ); token->primary = primary; @@ -596,7 +614,7 @@ struct token *token_create_admin( void ) token = create_token( TRUE, &interactive_sid, admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]), admin_privs, sizeof(admin_privs)/sizeof(admin_privs[0]), - default_dacl, admin_source ); + default_dacl, admin_source, NULL ); /* we really need a primary group */ assert( token->primary_group ); } @@ -629,6 +647,9 @@ static unsigned int token_adjust_privileges( struct token *token, const LUID_AND { unsigned int i, modified_count = 0; + /* mark as modified */ + allocate_luid( &token->modified_id ); + for (i = 0; i < count; i++) { struct privilege *privilege = @@ -664,6 +685,10 @@ static unsigned int token_adjust_privileges( struct token *token, const LUID_AND static void token_disable_privileges( struct token *token ) { struct privilege *privilege; + + /* mark as modified */ + allocate_luid( &token->modified_id ); + LIST_FOR_EACH_ENTRY( privilege, &token->privileges, struct privilege, entry ) privilege->enabled = FALSE; } @@ -1097,7 +1122,8 @@ DECL_HANDLER(duplicate_token) struct token *token = create_token( req->primary, src_token->user, NULL, 0, NULL, 0, src_token->default_dacl, - src_token->source ); + src_token->source, + &src_token->modified_id ); if (token) { struct privilege *privilege;

1 0

Farshad Agah : comctl32: Added monthcal test cases.
by Alexandre Julliard Feb. 16, 2007

Feb. 16, 2007

Module: wine Branch: master Commit: 5d7fe33ef9af8e66e174ce468c89eb3bd651fd5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7fe33ef9af8e66e174ce468… Author: Farshad Agah <f_agah(a)yahoo.com> Date: Thu Feb 15 23:59:08 2007 -0800 comctl32: Added monthcal test cases. --- dlls/comctl32/tests/monthcal.c | 373 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 373 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d7fe33ef9af8e66e174c…

1 0

Dmitry Timoshkov : gdi32: CreateBitmapIndirect should ignore the provided bm.bmWidthBytes.
by Alexandre Julliard Feb. 16, 2007

Feb. 16, 2007

Module: wine Branch: master Commit: 0457b0c3466a92377a9662239bb34366e734456e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0457b0c3466a92377a9662239… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Feb 16 17:02:12 2007 +0800 gdi32: CreateBitmapIndirect should ignore the provided bm.bmWidthBytes. --- dlls/gdi32/bitmap.c | 3 +++ dlls/gdi32/tests/bitmap.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 22384de..d16e70f 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -263,6 +263,9 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) return NULL; } + /* Windows ignores the provided bm.bmWidthBytes */ + bm.bmWidthBytes = BITMAP_GetWidthBytes( bm.bmWidth, bm.bmBitsPixel ); + /* Create the BITMAPOBJ */ bmpobj = GDI_AllocObject( sizeof(BITMAPOBJ), BITMAP_MAGIC, (HGDIOBJ *)&hbitmap, &bitmap_funcs ); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index ee4abc3..99f2986 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1637,6 +1637,7 @@ static void test_mono_1x1_bmp_dbg(HBITMAP hbmp, int line) static void test_CreateBitmap(void) { + BITMAP bmp; HDC screenDC = GetDC(0); HDC hdc = CreateCompatibleDC(screenDC); @@ -1684,6 +1685,19 @@ static void test_CreateBitmap(void) DeleteDC(hdc); ReleaseDC(0, screenDC); + + /* show that Windows ignores the provided bm.bmWidthBytes */ + bmp.bmType = 0; + bmp.bmWidth = 1; + bmp.bmHeight = 1; + bmp.bmWidthBytes = 28; + bmp.bmPlanes = 1; + bmp.bmBitsPixel = 1; + bmp.bmBits = NULL; + bm = CreateBitmapIndirect(&bmp); + ok(bm != 0, "CreateBitmapIndirect error %u\n", GetLastError()); + test_mono_1x1_bmp(bm); + DeleteObject(bm); } START_TEST(bitmap)

1 0