wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Huw Davies : user32/tests: Use the correct codepage for WM_CHAR tests.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 30c529c9f7baf683faf66a100a1e754949720aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c529c9f7baf683faf66a100… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 12 10:34:32 2015 +0100 user32/tests: Use the correct codepage for WM_CHAR tests. --- dlls/user32/tests/msg.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 5ef3840..5cbfec8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11964,6 +11964,18 @@ static void test_SetForegroundWindow(void) DestroyWindow(hwnd); } +static DWORD get_input_codepage( void ) +{ + DWORD cp; + int ret; + HKL hkl = GetKeyboardLayout( 0 ); + + ret = GetLocaleInfoW( LOWORD(hkl), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, + (WCHAR *)&cp, sizeof(cp) / sizeof(WCHAR) ); + if (!ret) cp = CP_ACP; + return cp; +} + static void test_dbcs_wm_char(void) { BYTE dbch[2]; @@ -11977,6 +11989,7 @@ static void test_dbcs_wm_char(void) UINT i, j, k; struct message wmCharSeq[2]; BOOL ret; + DWORD cp = get_input_codepage(); if (!pGetCPInfoExA) { @@ -11984,7 +11997,7 @@ static void test_dbcs_wm_char(void) return; } - pGetCPInfoExA( CP_ACP, 0, &cpinfo ); + pGetCPInfoExA( cp, 0, &cpinfo ); if (cpinfo.MaxCharSize != 2) { skip( "Skipping DBCS WM_CHAR test in SBCS codepage '%s'\n", cpinfo.CodePageName ); @@ -12002,8 +12015,8 @@ static void test_dbcs_wm_char(void) WCHAR wstr[2]; str[0] = j; str[1] = k; - if (MultiByteToWideChar( CP_ACP, 0, str, 2, wstr, 2 ) == 1 && - WideCharToMultiByte( CP_ACP, 0, wstr, 1, str, 2, NULL, NULL ) == 2 && + if (MultiByteToWideChar( cp, 0, str, 2, wstr, 2 ) == 1 && + WideCharToMultiByte( cp, 0, wstr, 1, str, 2, NULL, NULL ) == 2 && (BYTE)str[0] == j && (BYTE)str[1] == k && HIBYTE(wstr[0]) && HIBYTE(wstr[0]) != 0xff) {

1 0

Huw Davies : wininet/tests: Fix tests on Win 2k.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 53dbffd31430e168234925f8406e49e24b09c7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53dbffd31430e168234925f84… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 12 10:34:13 2015 +0100 wininet/tests: Fix tests on Win 2k. --- dlls/wininet/tests/http.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bd4ca54..df7dd07 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4838,7 +4838,13 @@ static void test_secure_connection(void) ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret, "HttpSendRequest failed: %d\n", GetLastError()); + ok(ret || broken(GetLastError() == ERROR_INTERNET_CANNOT_CONNECT), + "HttpSendRequest failed: %d\n", GetLastError()); + if (!ret) + { + win_skip("Cannot connect to https.\n"); + goto done; + } size = sizeof(flags); ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); @@ -4963,6 +4969,7 @@ static void test_secure_connection(void) } HeapFree(GetProcessHeap(), 0, certificate_structW); +done: InternetCloseHandle(req); InternetCloseHandle(con); InternetCloseHandle(ses);

1 0

Iván Matellanes : msvcirt: Fix implementation of streambuf::sync.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: c69ac67206c833d7b44d18d4e928fd41005ef636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69ac67206c833d7b44d18d4e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jun 12 11:51:54 2015 +0200 msvcirt: Fix implementation of streambuf::sync. --- dlls/msvcirt/msvcirt.c | 2 +- dlls/msvcirt/tests/msvcirt.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index ae644b3..8c05fe3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -457,7 +457,7 @@ DEFINE_THISCALL_WRAPPER(streambuf_sync, 4) int __thiscall streambuf_sync(streambuf *this) { TRACE("(%p)\n", this); - return (this->gptr == this->egptr && this->pbase == this->pptr) ? 0 : EOF; + return (this->gptr >= this->egptr && this->pbase >= this->pptr) ? 0 : EOF; } /* ?unbuffered@streambuf@@IAEXH@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 3ee987b..1a6ce5d 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -372,7 +372,7 @@ static void test_streambuf(void) ok(ret == 0, "sync failed, expected 0 got %d\n", ret); sb.gptr = sb.egptr + 1; ret = (int) call_func1(p_streambuf_sync, &sb); - todo_wine ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + ok(ret == 0, "sync failed, expected 0 got %d\n", ret); sb.gptr = sb.eback; ret = (int) call_func1(p_streambuf_sync, &sb2); ok(ret == EOF, "sync failed, expected EOF got %d\n", ret); @@ -381,7 +381,7 @@ static void test_streambuf(void) ok(ret == 0, "sync failed, expected 0 got %d\n", ret); sb2.pptr = sb2.pbase - 1; ret = (int) call_func1(p_streambuf_sync, &sb2); - todo_wine ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + ok(ret == 0, "sync failed, expected 0 got %d\n", ret); sb2.pptr = sb2.epptr; ret = (int) call_func1(p_streambuf_sync, &sb3); ok(ret == 0, "sync failed, expected 0 got %d\n", ret);

1 0

Iván Matellanes : msvcirt/tests: Add more streambuf tests.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: b36a526f5a568bd0075e264c73e1650aa2436980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36a526f5a568bd0075e264c7… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jun 12 11:51:48 2015 +0200 msvcirt/tests: Add more streambuf tests. --- dlls/msvcirt/tests/msvcirt.c | 51 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 057c6c8..3ee987b 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -196,7 +196,7 @@ static DWORD WINAPI lock_streambuf(void *arg) static void test_streambuf(void) { - streambuf sb, sb2, *psb; + streambuf sb, sb2, sb3, *psb; struct streambuf_lock_arg lock_arg; HANDLE thread; char reserve[16]; @@ -205,6 +205,7 @@ static void test_streambuf(void) memset(&sb, 0xab, sizeof(streambuf)); memset(&sb2, 0xab, sizeof(streambuf)); + memset(&sb3, 0xab, sizeof(streambuf)); /* constructors */ call_func1(p_streambuf_ctor, &sb); @@ -219,6 +220,11 @@ static void test_streambuf(void) ok(sb2.base == reserve, "wrong base pointer, expected %p got %p\n", reserve, sb2.base); ok(sb2.ebuf == reserve+16, "wrong ebuf pointer, expected %p got %p\n", reserve+16, sb2.ebuf); ok(sb.lock.LockCount == -1, "wrong critical section state, expected -1 got %d\n", sb.lock.LockCount); + call_func1(p_streambuf_ctor, &sb3); + ok(sb3.allocated == 0, "wrong allocate value, expected 0 got %d\n", sb3.allocated); + ok(sb3.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", sb3.unbuffered); + ok(sb3.base == NULL, "wrong base pointer, expected %p got %p\n", NULL, sb3.base); + ok(sb3.ebuf == NULL, "wrong ebuf pointer, expected %p got %p\n", NULL, sb3.ebuf); /* setlock */ ok(sb.do_lock == -1, "expected do_lock value -1, got %d\n", sb.do_lock); @@ -326,34 +332,58 @@ static void test_streambuf(void) ok(ret == 1, "doallocate failed, got %d\n", ret); ok(sb2.allocated == 1, "wrong allocate value, expected 1 got %d\n", sb2.allocated); ok(sb2.ebuf - sb2.base == 512 , "wrong reserve area size, expected 512 got %p-%p\n", sb2.ebuf, sb2.base); + ret = (int) call_func1(p_streambuf_doallocate, &sb3); + ok(ret == 1, "doallocate failed, got %d\n", ret); + ok(sb3.allocated == 1, "wrong allocate value, expected 1 got %d\n", sb3.allocated); + ok(sb3.ebuf - sb3.base == 512 , "wrong reserve area size, expected 512 got %p-%p\n", sb3.ebuf, sb3.base); + + /* sb: buffered, space available */ + sb.eback = sb.gptr = sb.base; + sb.egptr = sb.base + 256; + sb.pbase = sb.pptr = sb.base + 256; + sb.epptr = sb.base + 512; + /* sb2: buffered, no space available */ + sb2.eback = sb2.base; + sb2.gptr = sb2.egptr = sb2.base + 256; + sb2.pbase = sb2.base + 256; + sb2.pptr = sb2.epptr = sb2.base + 512; + /* sb3: unbuffered */ + sb3.unbuffered = 1; /* gbump */ - sb.eback = sb.base + 100; - sb.gptr = sb.base + 104; - sb.egptr = sb.base + 110; call_func2(p_streambuf_gbump, &sb, 10); - ok(sb.gptr == sb.eback + 14, "advance get pointer failed, expected %p got %p\n", sb.eback + 14, sb.gptr); + ok(sb.gptr == sb.eback + 10, "advance get pointer failed, expected %p got %p\n", sb.eback + 10, sb.gptr); call_func2(p_streambuf_gbump, &sb, -15); - ok(sb.gptr == sb.eback - 1, "advance get pointer failed, expected %p got %p\n", sb.eback - 1, sb.gptr); + ok(sb.gptr == sb.eback - 5, "advance get pointer failed, expected %p got %p\n", sb.eback - 5, sb.gptr); + sb.gptr = sb.eback; /* pbump */ - sb.pbase = sb.pptr = sb.base + 200; - sb.epptr = sb.base + 210; call_func2(p_streambuf_pbump, &sb, -2); ok(sb.pptr == sb.pbase - 2, "advance put pointer failed, expected %p got %p\n", sb.pbase - 2, sb.pptr); call_func2(p_streambuf_pbump, &sb, 20); ok(sb.pptr == sb.pbase + 18, "advance put pointer failed, expected %p got %p\n", sb.pbase + 18, sb.pptr); + sb.pptr = sb.pbase; /* sync */ ret = (int) call_func1(p_streambuf_sync, &sb); ok(ret == EOF, "sync failed, expected EOF got %d\n", ret); sb.gptr = sb.egptr; ret = (int) call_func1(p_streambuf_sync, &sb); - ok(ret == EOF, "sync failed, expected EOF got %d\n", ret); - sb.pptr = sb.pbase; + ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + sb.gptr = sb.egptr + 1; ret = (int) call_func1(p_streambuf_sync, &sb); + todo_wine ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + sb.gptr = sb.eback; + ret = (int) call_func1(p_streambuf_sync, &sb2); + ok(ret == EOF, "sync failed, expected EOF got %d\n", ret); + sb2.pptr = sb2.pbase; + ret = (int) call_func1(p_streambuf_sync, &sb2); ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + sb2.pptr = sb2.pbase - 1; ret = (int) call_func1(p_streambuf_sync, &sb2); + todo_wine ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + sb2.pptr = sb2.epptr; + ret = (int) call_func1(p_streambuf_sync, &sb3); ok(ret == 0, "sync failed, expected 0 got %d\n", ret); SetEvent(lock_arg.test[3]); @@ -361,6 +391,7 @@ static void test_streambuf(void) call_func1(p_streambuf_dtor, &sb); call_func1(p_streambuf_dtor, &sb2); + call_func1(p_streambuf_dtor, &sb3); for (i = 0; i < 4; i++) { CloseHandle(lock_arg.lock[i]); CloseHandle(lock_arg.test[i]);

1 0

Thomas Faller : cmd: Fix access of uninitialized memory.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 43dfe7637670d51ddab43c487e772109b7708fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43dfe7637670d51ddab43c487… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Thu Jun 11 22:14:11 2015 +0200 cmd: Fix access of uninitialized memory. --- programs/cmd/builtins.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 724da20..30b8684 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3313,7 +3313,8 @@ void WCMD_setshow_default (const WCHAR *args) { WINE_TRACE("Request change to directory '%s'\n", wine_dbgstr_w(args)); /* Skip /D and trailing whitespace if on the front of the command line */ - if (CompareStringW(LOCALE_USER_DEFAULT, + if (strlenW(args) >= 2 && + CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, args, 2, parmD, -1) == CSTR_EQUAL) { args += 2;

1 0

Vincent Povirk : ole32: Fix storage locking for read-only exclusive mode.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 3f83b788d4663d321af6de4ee5885b645e5ad485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f83b788d4663d321af6de4ee… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 11 16:37:25 2015 -0500 ole32: Fix storage locking for read-only exclusive mode. --- dlls/ole32/storage32.c | 8 ++++++++ dlls/ole32/tests/storage32.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index bde8481..b1bad38 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5031,6 +5031,14 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) if (SUCCEEDED(hr) && (share_mode == STGM_SHARE_DENY_WRITE || share_mode == STGM_SHARE_EXCLUSIVE)) hr = StorageImpl_CheckLockRange(This, RANGELOCK_WRITE_FIRST, RANGELOCK_WRITE_LAST, STG_E_LOCKVIOLATION); + if (SUCCEEDED(hr) && STGM_ACCESS_MODE(openFlags) == STGM_READ && share_mode == STGM_SHARE_EXCLUSIVE) + { + hr = StorageImpl_CheckLockRange(This, 0, RANGELOCK_CHECKLOCKS-1, STG_E_LOCKVIOLATION); + + if (SUCCEEDED(hr)) + hr = StorageImpl_CheckLockRange(This, RANGELOCK_CHECKLOCKS+1, RANGELOCK_LAST, STG_E_LOCKVIOLATION); + } + /* Then grab our locks. */ if (SUCCEEDED(hr) && (openFlags & STGM_PRIORITY) == STGM_PRIORITY) { diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index e83ae2a..0113d1b 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3185,8 +3185,8 @@ static const struct lock_test lock_tests[] = { { STGM_READWRITE|STGM_TRANSACTED|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, rwdw_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ, FILE_SHARE_READ, no_locked_bytes, dw_fail_ranges, TRUE }, { STGM_READ|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, tr_locked_bytes, tr_fail_ranges, FALSE }, - { STGM_READ|STGM_SHARE_EXCLUSIVE, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, TRUE }, - { STGM_READ|STGM_SHARE_EXCLUSIVE|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, TRUE }, + { STGM_READ|STGM_SHARE_EXCLUSIVE, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, FALSE }, + { STGM_READ|STGM_SHARE_EXCLUSIVE|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, FALSE }, }; static BOOL can_open(LPCWSTR filename, DWORD access, DWORD sharing)

1 0

Michael Stefaniuc : dmcompos: Get rid of the extra pointer to a DMUS_OBJECTDESC.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 06e988a5d3b34f81e16576817ece8ae6a3636296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e988a5d3b34f81e16576817… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 11 23:17:13 2015 +0200 dmcompos: Get rid of the extra pointer to a DMUS_OBJECTDESC. --- dlls/dmcompos/chordmap.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index 5ae8e8b..e3259e6 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -30,7 +30,6 @@ typedef struct IDirectMusicChordMapImpl { IDirectMusicChordMap IDirectMusicChordMap_iface; struct dmobject dmobj; LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicChordMapImpl; /* IDirectMusicChordMapImpl IDirectMusicChordMap part: */ @@ -296,20 +295,20 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS switch (chunkID) { case DMUS_FOURCC_GUID_CHUNK: { TRACE_(dmfile)(": GUID chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read (pStm, &This->pDesc->guidObject, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; + IStream_Read (pStm, &This->dmobj.desc.guidObject, chunkSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: { TRACE_(dmfile)(": version chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read (pStm, &This->pDesc->vVersion, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; + IStream_Read (pStm, &This->dmobj.desc.vVersion, chunkSize, NULL); break; } case DMUS_FOURCC_CATEGORY_CHUNK: { TRACE_(dmfile)(": category chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_CATEGORY; - IStream_Read (pStm, This->pDesc->wszCategory, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_CATEGORY; + IStream_Read (pStm, This->dmobj.desc.wszCategory, chunkSize, NULL); break; } case FOURCC_LIST: { @@ -331,8 +330,8 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS case mmioFOURCC('I','N','A','M'): case DMUS_FOURCC_UNAM_CHUNK: { TRACE_(dmfile)(": name chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, This->pDesc->wszName, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; + IStream_Read (pStm, This->dmobj.desc.wszName, chunkSize, NULL); break; } case mmioFOURCC('I','A','R','T'): @@ -443,7 +442,6 @@ HRESULT WINAPI create_dmchordmap(REFIID lpcGUID, void **ppobj) (IUnknown *)&obj->IDirectMusicChordMap_iface); obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - obj->pDesc = &obj->dmobj.desc; DMCOMPOS_LockModule(); hr = IDirectMusicChordMap_QueryInterface(&obj->IDirectMusicChordMap_iface, lpcGUID, ppobj);

1 0

Michael Stefaniuc : dmcompos: Use the generic DirectMusicObject implementation for DMChordMap.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: c64d41fa470cfe9127aea2bb975971adf6d3335e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64d41fa470cfe9127aea2bb9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 11 23:16:06 2015 +0200 dmcompos: Use the generic DirectMusicObject implementation for DMChordMap. --- dlls/dmcompos/Makefile.in | 1 + dlls/dmcompos/chordmap.c | 152 ++++++++------------------------- dlls/dmcompos/dmobject.c | 185 +++++++++++++++++++++++++++++++++++++++++ dlls/dmcompos/dmobject.h | 55 ++++++++++++ dlls/dmcompos/tests/dmcompos.c | 6 +- 5 files changed, 278 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c64d41fa470cfe9127aea…

1 0

Ken Thomases : ntdll: Fix the "not found" status set by read_directory_stat() and read_directory_getattrlist() for when restart_scan is set.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 3b74ac0f088f0eed37ef9280f8a1d558a1ec46e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b74ac0f088f0eed37ef9280f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 11 16:04:14 2015 -0500 ntdll: Fix the "not found" status set by read_directory_stat() and read_directory_getattrlist() for when restart_scan is set. --- dlls/ntdll/directory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 8e4db83..0e02f2e 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2103,7 +2103,7 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG info->next = 0; if (io->u.Status != STATUS_BUFFER_OVERFLOW) lseek( fd, 1, SEEK_CUR ); } - else io->u.Status = STATUS_NO_MORE_FILES; + else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } else if (!case_sensitive && ret && (errno == ENOENT || errno == ENOTDIR)) { @@ -2112,7 +2112,7 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG * read_directory_* function (we need to return the case-preserved * filename stored on the filesystem). */ ret = 0; - io->u.Status = STATUS_NO_MORE_FILES; + io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } else { @@ -2197,11 +2197,11 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer info->next = 0; if (io->u.Status != STATUS_BUFFER_OVERFLOW) lseek( fd, 1, SEEK_CUR ); } - else io->u.Status = STATUS_NO_MORE_FILES; + else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } else if ((errno == ENOENT || errno == ENOTDIR) && !get_dir_case_sensitivity(".")) { - io->u.Status = STATUS_NO_MORE_FILES; + io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; ret = 0; } }

1 0

Ken Thomases : Revert "ntdll: Avoid one of the calls to getattrlist() when read_directory_getattrlist() checks the case sensitivity of the file system.".
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: e7fa76637858bffb2970606463008c8f6e62ce39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7fa76637858bffb297060646… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 11 16:04:04 2015 -0500 Revert "ntdll: Avoid one of the calls to getattrlist() when read_directory_getattrlist() checks the case sensitivity of the file system.". This was wrong-headed and could never have worked. The second getattrlist() call that I was trying to avoid was only necessary when the first fails. Given that the first failed, its results can't be used to avoid the second, no matter what information we requested. This reverts commit 5514df9d4e4c14cafcc4284e12d26ad6c74709fe. --- dlls/ntdll/directory.c | 62 ++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 40 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index cd9fdb0..8e4db83 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -983,35 +983,43 @@ static void add_fs_cache( dev_t dev, fsid_t fsid, BOOLEAN case_sensitive ) } /*********************************************************************** - * get_dir_case_sensitivity_attr_by_id + * get_dir_case_sensitivity_attr * - * Checks if the volume with the specified device and file system IDs - * is case sensitive or not. Uses getattrlist(2). + * Checks if the volume containing the specified directory is case + * sensitive or not. Uses getattrlist(2). */ -static int get_dir_case_sensitivity_attr_by_id( dev_t dev, fsid_t fsid ) +static int get_dir_case_sensitivity_attr( const char *dir ) { char *mntpoint = NULL; struct attrlist attr; struct vol_caps caps; + struct get_fsid get_fsid; struct fs_cache *entry; + /* First get the FS ID of the volume */ + attr.bitmapcount = ATTR_BIT_MAP_COUNT; + attr.reserved = 0; + attr.commonattr = ATTR_CMN_DEVID|ATTR_CMN_FSID; + attr.volattr = attr.dirattr = attr.fileattr = attr.forkattr = 0; + get_fsid.size = 0; + if (getattrlist( dir, &attr, &get_fsid, sizeof(get_fsid), 0 ) != 0 || + get_fsid.size != sizeof(get_fsid)) + return -1; /* Try to look it up in the cache */ - entry = look_up_fs_cache( dev ); - if (entry && !memcmp( &entry->fsid, &fsid, sizeof(fsid_t) )) + entry = look_up_fs_cache( get_fsid.dev ); + if (entry && !memcmp( &entry->fsid, &get_fsid.fsid, sizeof(fsid_t) )) /* Cache lookup succeeded */ return entry->case_sensitive; /* Cache is stale at this point, we have to update it */ - mntpoint = get_device_mount_point( dev ); + mntpoint = get_device_mount_point( get_fsid.dev ); /* Now look up the case-sensitivity */ - attr.bitmapcount = ATTR_BIT_MAP_COUNT; - attr.reserved = attr.commonattr = 0; + attr.commonattr = 0; attr.volattr = ATTR_VOL_INFO|ATTR_VOL_CAPABILITIES; - attr.dirattr = attr.fileattr = attr.forkattr = 0; if (getattrlist( mntpoint, &attr, &caps, sizeof(caps), 0 ) < 0) { RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); - add_fs_cache( dev, fsid, TRUE ); + add_fs_cache( get_fsid.dev, get_fsid.fsid, TRUE ); return TRUE; } RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); @@ -1028,34 +1036,11 @@ static int get_dir_case_sensitivity_attr_by_id( dev_t dev, fsid_t fsid ) else ret = TRUE; /* Update the cache */ - add_fs_cache( dev, fsid, ret ); + add_fs_cache( get_fsid.dev, get_fsid.fsid, ret ); return ret; } return FALSE; } - -/*********************************************************************** - * get_dir_case_sensitivity_attr - * - * Checks if the volume containing the specified directory is case - * sensitive or not. Uses getattrlist(2). - */ -static int get_dir_case_sensitivity_attr( const char *dir ) -{ - struct attrlist attr; - struct get_fsid get_fsid; - - /* First get the FS ID of the volume */ - attr.bitmapcount = ATTR_BIT_MAP_COUNT; - attr.reserved = 0; - attr.commonattr = ATTR_CMN_DEVID|ATTR_CMN_FSID; - attr.volattr = attr.dirattr = attr.fileattr = attr.forkattr = 0; - get_fsid.size = 0; - if (getattrlist( dir, &attr, &get_fsid, sizeof(get_fsid), 0 ) != 0 || - get_fsid.size != sizeof(get_fsid)) - return -1; - return get_dir_case_sensitivity_attr_by_id( get_fsid.dev, get_fsid.fsid ); -} #endif /*********************************************************************** @@ -2163,8 +2148,6 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer { u_int32_t length; struct attrreference name_reference; - dev_t devid; - fsid_t fsid; fsobj_type_t type; char name[NAME_MAX * 3 + 1]; } attrlist_buffer; @@ -2196,7 +2179,7 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer memset( &attrlist, 0, sizeof(attrlist) ); attrlist.bitmapcount = ATTR_BIT_MAP_COUNT; - attrlist.commonattr = ATTR_CMN_NAME | ATTR_CMN_DEVID | ATTR_CMN_FSID | ATTR_CMN_OBJTYPE; + attrlist.commonattr = ATTR_CMN_NAME | ATTR_CMN_OBJTYPE; ret = getattrlist( unix_name, &attrlist, &attrlist_buffer, sizeof(attrlist_buffer), FSOPT_NOFOLLOW ); /* If unix_name named a symlink, the above may have succeeded even if the symlink is broken. Check that with another call without FSOPT_NOFOLLOW. We don't ask for any attributes. */ @@ -2216,8 +2199,7 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer } else io->u.Status = STATUS_NO_MORE_FILES; } - else if ((errno == ENOENT || errno == ENOTDIR) && - !get_dir_case_sensitivity_attr_by_id( attrlist_buffer.devid, attrlist_buffer.fsid )) + else if ((errno == ENOENT || errno == ENOTDIR) && !get_dir_case_sensitivity(".")) { io->u.Status = STATUS_NO_MORE_FILES; ret = 0;

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015