December 2008 - Wine-Commits

Rico Schüller : wordpad: Fix German translation.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: bd923fd3070730a208b481d6af156230f160dc1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd923fd3070730a208b481d6a… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 9 21:40:12 2008 +0100 wordpad: Fix German translation. --- programs/wordpad/De.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index b2f8e61..d891e22 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -241,6 +241,7 @@ BEGIN STRING_WRITE_ACCESS_DENIED, "Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu speichern." STRING_OPEN_FAILED, "Die Datei konnte nicht geöffnet werden." STRING_OPEN_ACCESS_DENIED, "Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu öffnen." + STRING_PRINTING_NOT_IMPLEMENTED, "Drucken ist nicht implementiert" END #pragma code_page(default)

1 0

Paul Vriens : advapi32/tests: Fix a test failure on NT4.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 2b2f04c514a78fe2ad5ab3b29c2870c47e8160ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2f04c514a78fe2ad5ab3b29… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 9 17:44:50 2008 +0100 advapi32/tests: Fix a test failure on NT4. --- dlls/advapi32/tests/security.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 2e1349b..d521e90 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2291,7 +2291,8 @@ static void test_GetNamedSecurityInfoA(void) ret = GetSecurityDescriptorControl(pSecDesc, &control, &revision); ok(ret, "GetSecurityDescriptorControl failed with error %d\n", GetLastError()); - ok((control & (SE_SELF_RELATIVE|SE_DACL_PRESENT)) == (SE_SELF_RELATIVE|SE_DACL_PRESENT), + ok((control & (SE_SELF_RELATIVE|SE_DACL_PRESENT)) == (SE_SELF_RELATIVE|SE_DACL_PRESENT) || + broken((control & (SE_SELF_RELATIVE|SE_DACL_PRESENT)) == SE_DACL_PRESENT), /* NT4 */ "control (0x%x) doesn't have (SE_SELF_RELATIVE|SE_DACL_PRESENT) flags set\n", control); ok(revision == SECURITY_DESCRIPTOR_REVISION1, "revision was %d instead of 1\n", revision); ret = GetSecurityDescriptorOwner(pSecDesc, &owner, &owner_defaulted); @@ -2300,6 +2301,7 @@ static void test_GetNamedSecurityInfoA(void) ret = GetSecurityDescriptorGroup(pSecDesc, &group, &group_defaulted); ok(ret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); ok(group != NULL, "group should not be NULL\n"); + LocalFree(pSecDesc); } static void test_ConvertStringSecurityDescriptor(void)

1 0

Jacek Caban : mshtml: Fixed a typo.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: f0da28fc50bba9e50f8f0264d7d4950ead855749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0da28fc50bba9e50f8f0264d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 9 19:33:04 2008 +0100 mshtml: Fixed a typo. --- dlls/mshtml/script.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 4d10853..a3dfded 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -715,7 +715,7 @@ static ScriptHost *get_script_host(HTMLDocument *doc, const GUID *guid) { ScriptHost *iter; - if(IsEqualGUID(&CLSID_JScript, &guid) && doc->scriptmode != SCRIPTMODE_ACTIVESCRIPT) { + if(IsEqualGUID(&CLSID_JScript, guid) && doc->scriptmode != SCRIPTMODE_ACTIVESCRIPT) { TRACE("Ignoring JScript\n"); return NULL; }

1 0

Paul Vriens : advapi32/tests: Only skip tests on NT4.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: d6cfe04621015cfe03410b878e37ece2bffd07e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6cfe04621015cfe03410b878… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 9 14:14:25 2008 +0100 advapi32/tests: Only skip tests on NT4. --- dlls/advapi32/tests/security.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index bdcdb9e..2e1349b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1728,7 +1728,9 @@ static void test_LookupAccountName(void) sid_use = 0xcafebabe; SetLastError(0xdeadbeef); ret = LookupAccountNameA(NULL, NULL, NULL, &sid_size, NULL, &domain_size, &sid_use); - if (!ret && GetLastError() != ERROR_NONE_MAPPED) + if (!ret && GetLastError() == ERROR_NONE_MAPPED) + win_skip("NULL account name doesn't work on NT4\n"); + else { ok(!ret, "Expected 0, got %d\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, @@ -1753,8 +1755,6 @@ static void test_LookupAccountName(void) HeapFree(GetProcessHeap(), 0, psid); HeapFree(GetProcessHeap(), 0, domain); } - else - win_skip("NULL account name doesn't work on NT4\n"); /* try an invalid account name */ SetLastError(0xdeadbeef);

1 0

Paul Vriens : msi/tests: Run tests again on Win9x and NT4.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 732c1e8d314362cc76ca95f1497f654ab35e241e URL: http://source.winehq.org/git/wine.git/?a=commit;h=732c1e8d314362cc76ca95f14… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 9 16:55:06 2008 +0100 msi/tests: Run tests again on Win9x and NT4. --- dlls/msi/tests/msi.c | 436 ++++++++++++++++++++++++++------------------------ 1 files changed, 223 insertions(+), 213 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=732c1e8d314362cc76ca9…

1 0

Jacek Caban : mshtml: Skip tests on broken IE6 versions.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 095ce18b44c196d9c35002c7166bde3586eeb1d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=095ce18b44c196d9c35002c71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 9 15:35:13 2008 +0100 mshtml: Skip tests on broken IE6 versions. --- dlls/mshtml/tests/htmldoc.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 1e932de..84803fb 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -149,7 +149,7 @@ static BOOL expect_InPlaceUIWindow_SetActiveObject_active = TRUE; static BOOL ipsex; static BOOL set_clientsite = FALSE, container_locked = FALSE; static BOOL readystate_set_loading = FALSE, load_from_stream; -static BOOL editmode = FALSE; +static BOOL editmode = FALSE, show_failed; static int stream_read, protocol_read; static enum load_state_t { LD_DOLOAD, @@ -1732,6 +1732,14 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum expect_status_text = (load_state == LD_COMPLETE ? (LPCOLESTR)0xdeadbeef : NULL); hres = IOleDocumentView_Show(view, TRUE); + if(FAILED(hres)) { + win_skip("Show failed\n"); + if(activeobj) + IOleInPlaceActiveObject_Release(activeobj); + IOleDocument_Release(document); + show_failed = TRUE; + return S_OK; + } ok(hres == S_OK, "Show failed: %08x\n", hres); CHECK_CALLED(CanInPlaceActivate); @@ -3891,6 +3899,10 @@ static void test_HTMLDocument_hlink(void) test_GetCurMoniker(unk, NULL, NULL); test_Persist(unk); test_Navigate(unk); + if(show_failed) { + IUnknown_Release(unk); + return; + } test_download(FALSE, TRUE, TRUE); @@ -4126,12 +4138,14 @@ START_TEST(htmldoc) container_hwnd = create_container_window(); register_protocol(); - test_HTMLDocument(FALSE); - test_HTMLDocument(TRUE); test_HTMLDocument_hlink(); - test_HTMLDocument_StreamLoad(); - test_editing_mode(FALSE); - test_editing_mode(TRUE); + if(!show_failed) { + test_HTMLDocument(FALSE); + test_HTMLDocument(TRUE); + test_HTMLDocument_StreamLoad(); + test_editing_mode(FALSE); + test_editing_mode(TRUE); + } DestroyWindow(container_hwnd); CoUninitialize();

1 0

Jacek Caban : mshtml: Make IHTMLElement:: get_document vtbl offset independent.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 905fcb87cff1bd3e41dc98d671875c99449a4644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905fcb87cff1bd3e41dc98d67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 9 15:26:12 2008 +0100 mshtml: Make IHTMLElement::get_document vtbl offset independent. --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7cc1a62..11d0fb7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -585,7 +585,7 @@ static HRESULT WINAPI HTMLElement_get_document(IHTMLElement *iface, IDispatch ** if(!p) return E_POINTER; - *p = (IDispatch*)This->node.doc; + *p = (IDispatch*)HTMLDOC(This->node.doc); IDispatch_AddRef(*p); return S_OK; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cf8f8f0..e620e56 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3343,6 +3343,11 @@ static void test_elems(IHTMLDocument2 *doc) ok(type == 1, "type=%ld\n", type); IHTMLSelectElement_Release(select); + + hres = IHTMLElement_get_document(elem, &disp); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(iface_cmp((IUnknown*)disp, (IUnknown*)doc), "disp != doc\n"); + IHTMLElement_Release(elem); }

1 0

Francois Gouget : clock: Remove spaces before '\n' in the Swedish resources .
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 2e7fc3e5c648914158ddc7193c3ec16195a558b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e7fc3e5c648914158ddc7193… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 9 15:35:13 2008 +0100 clock: Remove spaces before '\n' in the Swedish resources. --- programs/clock/Sv.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/clock/Sv.rc b/programs/clock/Sv.rc index 8814b08..6267c5a 100644 --- a/programs/clock/Sv.rc +++ b/programs/clock/Sv.rc @@ -58,7 +58,7 @@ n vara anv�ndbart,men UTAN N�GON SOM HELST GARANTI, �ven utan \ underf�rst�dd garanti om S�LJBARHET eller L�MPLIGHET F�R N�GOT \ SPECIELLT �NDAM�L. Se GNU General Public License f�r ytterligare \ -information. \n\ +information.\n\ Du b�r ha f�tt en kopia av GNU General Public License tillsammans \ med detta program. Om inte, skriv till Free Software Foundation, \ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA"

1 0

Francois Gouget : appwiz.cpl: It's ok to use "SysListView32" directly.
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: 5e318eb46a43d08d6be7b67ac78b224f5e7d8b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e318eb46a43d08d6be7b67ac… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 9 15:34:58 2008 +0100 appwiz.cpl: It's ok to use "SysListView32" directly. --- dlls/appwiz.cpl/En.rc | 2 -- dlls/appwiz.cpl/Fr.rc | 2 -- dlls/appwiz.cpl/Ja.rc | 2 -- dlls/appwiz.cpl/Ko.rc | 2 -- dlls/appwiz.cpl/Nl.rc | 2 -- dlls/appwiz.cpl/No.rc | 2 -- dlls/appwiz.cpl/Pt.rc | 2 -- dlls/appwiz.cpl/Ru.rc | 2 -- dlls/appwiz.cpl/Si.rc | 2 -- dlls/appwiz.cpl/Zh.rc | 4 ---- 10 files changed, 0 insertions(+), 22 deletions(-) diff --git a/dlls/appwiz.cpl/En.rc b/dlls/appwiz.cpl/En.rc index f04af8e..d0b4de3 100644 --- a/dlls/appwiz.cpl/En.rc +++ b/dlls/appwiz.cpl/En.rc @@ -35,8 +35,6 @@ STRINGTABLE IDS_COLUMN_VERSION, "Version" } -/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ - IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Install/Uninstall" diff --git a/dlls/appwiz.cpl/Fr.rc b/dlls/appwiz.cpl/Fr.rc index 20bfa6e..8dbdff1 100644 --- a/dlls/appwiz.cpl/Fr.rc +++ b/dlls/appwiz.cpl/Fr.rc @@ -35,8 +35,6 @@ STRINGTABLE IDS_COLUMN_VERSION, "Version" } -/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ - IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation/D�sinstallation" diff --git a/dlls/appwiz.cpl/Ja.rc b/dlls/appwiz.cpl/Ja.rc index 4a9cdb9..b0d5717 100644 --- a/dlls/appwiz.cpl/Ja.rc +++ b/dlls/appwiz.cpl/Ja.rc @@ -38,8 +38,6 @@ STRINGTABLE IDS_COLUMN_VERSION, "バージョン" } -/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ - IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "インストールとアンインストール" diff --git a/dlls/appwiz.cpl/Ko.rc b/dlls/appwiz.cpl/Ko.rc index 2c01136..e2bd60a 100644 --- a/dlls/appwiz.cpl/Ko.rc +++ b/dlls/appwiz.cpl/Ko.rc @@ -35,8 +35,6 @@ STRINGTABLE IDS_COLUMN_VERSION, "��" } -/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ - IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "��ġ/��" diff --git a/dlls/appwiz.cpl/Nl.rc b/dlls/appwiz.cpl/Nl.rc index 82d8f21..4abee57 100644 --- a/dlls/appwiz.cpl/Nl.rc +++ b/dlls/appwiz.cpl/Nl.rc @@ -35,8 +35,6 @@ STRINGTABLE IDS_COLUMN_VERSION, "Versie" } -/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ - IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installeren/Verwijderen" diff --git a/dlls/appwiz.cpl/No.rc b/dlls/appwiz.cpl/No.rc index 0060ea0..2b15cbb 100644 --- a/dlls/appwiz.cpl/No.rc +++ b/dlls/appwiz.cpl/No.rc @@ -35,8 +35,6 @@ STRINGTABLE IDS_COLUMN_VERSION, "Versjon" } -/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ - IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installer/Avinstaller" diff --git a/dlls/appwiz.cpl/Pt.rc b/dlls/appwiz.cpl/Pt.rc index f38bba5..31c7d8a 100644 --- a/dlls/appwiz.cpl/Pt.rc +++ b/dlls/appwiz.cpl/Pt.rc @@ -35,8 +35,6 @@ STRINGTABLE IDS_COLUMN_VERSION, "Vers�o" } -/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ - IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalar/Desinstalar" diff --git a/dlls/appwiz.cpl/Ru.rc b/dlls/appwiz.cpl/Ru.rc index 4510c5e..49322e4 100644 --- a/dlls/appwiz.cpl/Ru.rc +++ b/dlls/appwiz.cpl/Ru.rc @@ -35,8 +35,6 @@ STRINGTABLE IDS_COLUMN_VERSION, "��" } -/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ - IDD_MAIN DIALOG 0, 0, 320, 235 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "��/��" diff --git a/dlls/appwiz.cpl/Si.rc b/dlls/appwiz.cpl/Si.rc index dd6601d..83f2d4b 100644 --- a/dlls/appwiz.cpl/Si.rc +++ b/dlls/appwiz.cpl/Si.rc @@ -37,8 +37,6 @@ STRINGTABLE IDS_COLUMN_VERSION, "Različica" } -/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ - IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Dodaj/odstrani programe" diff --git a/dlls/appwiz.cpl/Zh.rc b/dlls/appwiz.cpl/Zh.rc index 8f67b0c..247cbfa 100644 --- a/dlls/appwiz.cpl/Zh.rc +++ b/dlls/appwiz.cpl/Zh.rc @@ -38,8 +38,6 @@ STRINGTABLE IDS_COLUMN_VERSION, "版本" } -/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ - IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "安装/卸载" @@ -97,8 +95,6 @@ STRINGTABLE IDS_COLUMN_VERSION, "版本" } -/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ - IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "安裝/卸載"

1 0

Francois Gouget : msvcrt: Fix the permissions returned by fstat*() ( with test).
by Alexandre Julliard Dec. 10, 2008

Dec. 10, 2008

Module: wine Branch: master Commit: e766985b20aa4293bf000dbbdd6d31bceeed5b10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e766985b20aa4293bf000dbbd… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 9 15:19:20 2008 +0100 msvcrt: Fix the permissions returned by fstat*() (with test). --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/tests/file.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7c0f74d..78861e4 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1167,9 +1167,9 @@ int CDECL MSVCRT__fstat64(int fd, struct MSVCRT__stat64* buf) msvcrt_set_errno(ERROR_INVALID_PARAMETER); return -1; } - buf->st_mode = S_IFREG | S_IREAD; + buf->st_mode = S_IFREG | 0444; if (!(hfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) - buf->st_mode |= S_IWRITE; + buf->st_mode |= 0222; buf->st_size = ((__int64)hfi.nFileSizeHigh << 32) + hfi.nFileSizeLow; RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastAccessTime, &dw); buf->st_atime = dw; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index c925948..8dcba00 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -905,6 +905,7 @@ static void test_stat(void) { ok(fstat(fd, &buf) == 0, "fstat failed: errno=%d", errno); ok((buf.st_mode & _S_IFMT) == _S_IFREG, "bad format = %06o\n", buf.st_mode); + ok((buf.st_mode & 0777) == 0666, "bad st_mode = %06o\n", 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); @@ -912,6 +913,7 @@ static void test_stat(void) ok(stat("stat.tst", &buf) == 0, "stat failed: errno=%d", errno); ok((buf.st_mode & _S_IFMT) == _S_IFREG, "bad format = %06o\n", buf.st_mode); + ok((buf.st_mode & 0777) == 0666, "bad st_mode = %06o\n", buf.st_mode); 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);

1 0