wine-commits May 2014

wine-commits@winehq.org

2 participants
404 discussions

Huw Davies : msxml3/tests: Don' t overwrite a variant which is later used in a QueryInterface call.
by Alexandre Julliard 09 May '14

09 May '14

Module: wine Branch: master Commit: f5aaaf215deb3da10f38279d4f3bd627b9d6d8da URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5aaaf215deb3da10f38279d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 9 09:14:46 2014 +0100 msxml3/tests: Don't overwrite a variant which is later used in a QueryInterface call. --- dlls/msxml3/tests/xmldoc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 2478a57..b724f5c 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -656,7 +656,7 @@ static void test_xmlelem_collection(void) WCHAR path[MAX_PATH]; LONG length, type; ULONG num_vars; - VARIANT var, vIndex, vName; + VARIANT var, dummy, vIndex, vName; BSTR url, str; static const CHAR szBankXML[] = "bank.xml"; static const WCHAR szNumber[] = {'N','U','M','B','E','R',0}; @@ -766,14 +766,16 @@ static void test_xmlelem_collection(void) ok(num_vars == 1, "Expected 1, got %d\n", num_vars); /* try advance further, no children left */ - hr = IEnumVARIANT_Next(enumVar, 1, &var, &num_vars); + V_VT(&dummy) = VT_I4; + hr = IEnumVARIANT_Next(enumVar, 1, &dummy, &num_vars); ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); - ok(V_VT(&var) == 0, "Expected 0, got %d\n", V_VT(&var)); + ok(V_VT(&dummy) == VT_EMPTY, "Expected 0, got %d\n", V_VT(&dummy)); ok(num_vars == 0, "Expected 0, got %d\n", num_vars); - hr = IEnumVARIANT_Next(enumVar, 1, &var, NULL); + V_VT(&dummy) = VT_I4; + hr = IEnumVARIANT_Next(enumVar, 1, &dummy, NULL); ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); - ok(V_VT(&var) == 0, "Expected 0, got %d\n", V_VT(&var)); + ok(V_VT(&dummy) == VT_EMPTY, "Expected 0, got %d\n", V_VT(&dummy)); hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IXMLElement, (LPVOID *)&child); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

1 0

Bruno Jesus : ws2_32: Return the correct error if SO_REUSEADDR is set in bind error.
by Alexandre Julliard 09 May '14

09 May '14

Module: wine Branch: master Commit: 843ef11eb8ae7d2a9bf275c2ff5ac81144545580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=843ef11eb8ae7d2a9bf275c2f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 8 21:30:27 2014 -0300 ws2_32: Return the correct error if SO_REUSEADDR is set in bind error. --- dlls/ws2_32/socket.c | 14 ++++++++++++++ dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a8fb9a5..519ce85 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2682,6 +2682,20 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) case EADDRNOTAVAIL: SetLastError(WSAEINVAL); break; + case EADDRINUSE: + { + int optval = 0; + socklen_t optlen = sizeof(optval); + /* Windows >= 2003 will return different results depending on + * SO_REUSEADDR, WSAEACCES may be returned representing that + * the socket hijacking protection prevented the bind */ + if (!getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&optval, &optlen) && optval) + { + SetLastError(WSAEACCES); + break; + } + /* fall through */ + } default: SetLastError(wsaErrno()); break; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1752d35..0bbce27 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1529,7 +1529,6 @@ static void test_so_reuseaddr(void) { trace(">= Win 2003 behavior of SO_REUSEADDR\n"); err = WSAGetLastError(); -todo_wine ok(err==WSAEACCES, "expected 10013, got %d\n", err); closesocket(s1);

1 0

Vincent Povirk : server: Try to get a read lock if we can' t get a write lock.
by Alexandre Julliard 09 May '14

09 May '14

Module: wine Branch: master Commit: 473a3a47a7d02694e659760008c1856f305cd82c URL: http://source.winehq.org/git/wine.git/?a=commit;h=473a3a47a7d02694e65976000… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 8 15:03:10 2014 -0500 server: Try to get a read lock if we can't get a write lock. --- server/fd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index fa8874c..7043d04 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1175,8 +1175,12 @@ static int set_unix_lock( struct fd *fd, file_pos_t start, file_pos_t end, int t return 0; case EBADF: /* this can happen if we try to set a write lock on a read-only file */ - /* we just ignore that error */ - if (fl.l_type == F_WRLCK) return 1; + /* try to at least grab a read lock */ + if (fl.l_type == F_WRLCK) + { + type = F_RDLCK; + break; /* retry */ + } set_error( STATUS_ACCESS_DENIED ); return 0; #ifdef EOVERFLOW

1 0

Vincent Povirk : ole32: Use real blocking operations for storage locking when possible.
by Alexandre Julliard 09 May '14

09 May '14

Module: wine Branch: master Commit: cf75c5368be45fc9f208f790e2929e9669170c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf75c5368be45fc9f208f790e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 8 13:56:02 2014 -0500 ole32: Use real blocking operations for storage locking when possible. --- dlls/ole32/filelockbytes.c | 19 +++++++++++++++++++ dlls/ole32/storage32.c | 5 ++++- dlls/ole32/storage32.h | 2 ++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index 1f4ac55..9bd1163 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -356,6 +356,25 @@ static HRESULT WINAPI FileLockBytesImpl_LockRegion(ILockBytes* iface, return STG_E_ACCESSDENIED; } +HRESULT FileLockBytesImpl_LockRegionSync(ILockBytes* iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb) +{ + FileLockBytesImpl* This = impl_from_ILockBytes(iface); + OVERLAPPED ol; + + if (iface->lpVtbl != &FileLockBytesImpl_Vtbl) + return E_NOTIMPL; + + ol.hEvent = 0; + ol.u.s.Offset = libOffset.u.LowPart; + ol.u.s.OffsetHigh = libOffset.u.HighPart; + + if (LockFileEx(This->hfile, LOCKFILE_EXCLUSIVE_LOCK, 0, cb.u.LowPart, cb.u.HighPart, &ol)) + return S_OK; + else + return STG_E_ACCESSDENIED; +} + static HRESULT WINAPI FileLockBytesImpl_UnlockRegion(ILockBytes* iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a71ec41..56d3229 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2831,8 +2831,11 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs { HRESULT hr; - /* potential optimization: if we have an HFILE use LockFileEx in blocking mode directly */ + /* if it's a FileLockBytesImpl use LockFileEx in blocking mode */ + if (SUCCEEDED(FileLockBytesImpl_LockRegionSync(This->lockBytes, offset, cb))) + return S_OK; + /* otherwise we have to fake it based on an async lock */ do { int delay=0; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index d5041d1..0b8bcc8 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -157,6 +157,8 @@ struct DirEntry HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsName, ILockBytes **pLockBytes) DECLSPEC_HIDDEN; +HRESULT FileLockBytesImpl_LockRegionSync(ILockBytes* iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb) DECLSPEC_HIDDEN; + /************************************************************************* * Ole Convert support */

1 0

Vincent Povirk : ole32: Warn in cases where we might corrupt storage files.
by Alexandre Julliard 09 May '14

09 May '14

Module: wine Branch: master Commit: 45dd716e4e3115fb41675302d452953d30a32481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45dd716e4e3115fb41675302d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 8 13:34:38 2014 -0500 ole32: Warn in cases where we might corrupt storage files. --- dlls/ole32/storage32.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 7f1affb..a71ec41 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4992,6 +4992,8 @@ static HRESULT WINAPI TransactedSnapshotImpl_Commit( { if ((grfCommitFlags & STGC_ONLYIFCURRENT) && transactionSig != This->lastTransactionSig) hr = STG_E_NOTCURRENT; + else if (transactionSig != This->lastTransactionSig) + ERR("proceeding with unsafe commit\n"); if (SUCCEEDED(hr)) { @@ -5546,6 +5548,12 @@ static HRESULT Storage_Construct( if (openFlags & STGM_TRANSACTED) { + static int fixme; + + if (STGM_SHARE_MODE(openFlags) != STGM_SHARE_DENY_WRITE && + STGM_SHARE_MODE(openFlags) != STGM_SHARE_EXCLUSIVE && !fixme++) + FIXME("transacted storage write sharing not implemented safely\n"); + hr = Storage_ConstructTransacted(&newStorage->base, &newTransactedStorage); if (FAILED(hr)) IStorage_Release(&newStorage->base.IStorage_iface);

1 0

Jacek Caban : kernel32/tests: Added more shared memory tests, exposing MAP_PRIVATE mapping for read only mapping problem.
by Alexandre Julliard 08 May '14

08 May '14

Module: wine Branch: master Commit: ea950ac7cfe5156a96bee762cb3af0b4b0ab5e7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea950ac7cfe5156a96bee762c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 8 17:30:46 2014 +0200 kernel32/tests: Added more shared memory tests, exposing MAP_PRIVATE mapping for read only mapping problem. --- dlls/kernel32/tests/virtual.c | 54 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 0d417a6..174d422 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2447,7 +2447,7 @@ todo_wine DeleteFileA(file_name); } -static void test_shared_memory(int is_child) +static void test_shared_memory(BOOL is_child) { HANDLE mapping; LONG *p; @@ -2489,6 +2489,48 @@ static void test_shared_memory(int is_child) CloseHandle(mapping); } +static void test_shared_memory_ro(BOOL is_child) +{ + HANDLE mapping; + LONG *p; + + SetLastError(0xdeadbef); + mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, "winetest_virtual.c_ro"); + ok(mapping != 0, "CreateFileMapping error %d\n", GetLastError()); + if (is_child) + ok(GetLastError() == ERROR_ALREADY_EXISTS, "expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); + + SetLastError(0xdeadbef); + p = MapViewOfFile(mapping, FILE_MAP_READ | (is_child ? FILE_MAP_WRITE : 0), 0, 0, 4096); + ok(p != NULL, "MapViewOfFile error %d\n", GetLastError()); + + if (is_child) + { + *p = 0xdeadbeef; + } + else + { + char **argv; + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { sizeof(si) }; + DWORD ret; + + winetest_get_mainargs(&argv); + sprintf(cmdline, "\"%s\" virtual sharedmemro", argv[0]); + ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); + winetest_wait_child_process(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + ok(*p == 0xdeadbeef, "*p = %x, expected 0xdeadbeef\n", *p); + } + + UnmapViewOfFile(p); + CloseHandle(mapping); +} + START_TEST(virtual) { int argc; @@ -2504,7 +2546,12 @@ START_TEST(virtual) } if (!strcmp(argv[2], "sharedmem")) { - test_shared_memory(1); + test_shared_memory(TRUE); + return; + } + if (!strcmp(argv[2], "sharedmemro")) + { + test_shared_memory_ro(TRUE); return; } while (1) @@ -2532,7 +2579,8 @@ START_TEST(virtual) pNtMapViewOfSection = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtMapViewOfSection"); pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtUnmapViewOfSection"); - test_shared_memory(0); + test_shared_memory(FALSE); + test_shared_memory_ro(FALSE); test_mapping(); test_CreateFileMapping_protection(); test_VirtualAlloc_protection();

1 0

Mark Harmstone : setupapi: Add CM_Get_DevNode_Registry_Property wrapper around CM_Get_DevNode_Registry_Property_Ex.
by Alexandre Julliard 08 May '14

08 May '14

Module: wine Branch: master Commit: cfb81f2c606c17ff005fce87a2e79e1d27b8224a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb81f2c606c17ff005fce87a… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue May 6 17:12:45 2014 +0100 setupapi: Add CM_Get_DevNode_Registry_Property wrapper around CM_Get_DevNode_Registry_Property_Ex. --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index cac0a13..e38f720 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -56,8 +56,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex -@ stub CM_Get_DevNode_Registry_PropertyA -@ stub CM_Get_DevNode_Registry_PropertyW +@ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr long long) setupapi.CM_Get_DevNode_Registry_PropertyA +@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExW @ stub CM_Get_DevNode_Status diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 4349055..a8ce41a 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -67,8 +67,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex -@ stub CM_Get_DevNode_Registry_PropertyA -@ stub CM_Get_DevNode_Registry_PropertyW +@ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr long long) +@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) @ stub CM_Get_DevNode_Status diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index fad9d23..c07278e 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -407,6 +407,24 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExW(DEVINST dev, ULONG prop, P } /*********************************************************************** + * CM_Get_DevNode_Registry_PropertyA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyA(DEVINST dev, ULONG prop, PULONG regdatatype, + PVOID buf, PULONG len, ULONG flags) +{ + return CM_Get_DevNode_Registry_Property_ExA(dev, prop, regdatatype, buf, len, flags, NULL); +} + +/*********************************************************************** + * CM_Get_DevNode_Registry_PropertyW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyW(DEVINST dev, ULONG prop, PULONG regdatatype, + PVOID buf, PULONG len, ULONG flags) +{ + return CM_Get_DevNode_Registry_Property_ExW(dev, prop, regdatatype, buf, len, flags, NULL); +} + +/*********************************************************************** * CM_Enumerate_Classes (SETUPAPI.@) */ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags)

1 0

Jacek Caban : ntdll: Always use MAP_SHARED in NtMapViewOfSection.
by Alexandre Julliard 08 May '14

08 May '14

Module: wine Branch: master Commit: 4792cf31c5dac3f5216bff8f4fa700acc04ea128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4792cf31c5dac3f5216bff8f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 8 18:22:08 2014 +0200 ntdll: Always use MAP_SHARED in NtMapViewOfSection. --- dlls/ntdll/virtual.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 8d3539a..d9acac6 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -854,11 +854,10 @@ done: * The csVirtual section must be held by caller. */ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start, size_t size, - off_t offset, unsigned int vprot, BOOL removable ) + off_t offset, unsigned int vprot, int flags, BOOL removable ) { void *ptr; int prot = VIRTUAL_GetUnixProt( vprot | VPROT_COMMITTED /* make sure it is accessible */ ); - BOOL shared_write = (vprot & VPROT_WRITE) != 0; assert( start < view->size ); assert( start + size <= view->size ); @@ -871,11 +870,9 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start } /* only try mmap if media is not removable (or if we require write access) */ - if (!removable || shared_write) + if (!removable || (flags & MAP_SHARED)) { - int flags = MAP_FIXED | (shared_write ? MAP_SHARED : MAP_PRIVATE); - - if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != (void *)-1) + if (mmap( (char *)view->base + start, size, prot, flags | MAP_FIXED, fd, offset ) != (void *)-1) goto done; if ((errno == EPERM) && (prot & PROT_EXEC)) @@ -885,7 +882,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start /* page-aligned (EINVAL), or because the underlying filesystem */ /* does not support mmap() (ENOEXEC,ENODEV), we do it by hand. */ if ((errno != ENOEXEC) && (errno != EINVAL) && (errno != ENODEV)) return FILE_GetNtStatus(); - if (shared_write) /* we cannot fake shared write mappings */ + if (flags & MAP_SHARED) /* we cannot fake shared mappings */ { if (errno == EINVAL) return STATUS_INVALID_PARAMETER; ERR( "shared writable mmap not supported, broken filesystem?\n" ); @@ -1097,7 +1094,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz if (!st.st_size) goto error; header_size = min( header_size, st.st_size ); if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - !dup_mapping ) != STATUS_SUCCESS) goto error; + MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) goto error; dos = (IMAGE_DOS_HEADER *)ptr; nt = (IMAGE_NT_HEADERS *)(ptr + dos->e_lfanew); header_end = ptr + ROUND_SIZE( 0, header_size ); @@ -1122,7 +1119,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz /* in that case Windows simply maps in the whole file */ if (map_file_into_view( view, fd, 0, total_size, 0, VPROT_COMMITTED | VPROT_READ, - !dup_mapping ) != STATUS_SUCCESS) goto error; + MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) goto error; /* check that all sections are loaded at the right offset */ if (nt->OptionalHeader.FileAlignment != nt->OptionalHeader.SectionAlignment) goto error; @@ -1176,7 +1173,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz sec->Characteristics ); if (map_file_into_view( view, shared_fd, sec->VirtualAddress, map_size, pos, VPROT_COMMITTED | VPROT_READ | VPROT_WRITE, - FALSE ) != STATUS_SUCCESS) + MAP_SHARED, FALSE ) != STATUS_SUCCESS) { ERR_(module)( "Could not map shared section %.8s\n", sec->Name ); goto error; @@ -1193,7 +1190,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz map_file_into_view( view, shared_fd, base, end - base, pos + (base - sec->VirtualAddress), VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - FALSE ); + MAP_PRIVATE, FALSE ); } pos += map_size; continue; @@ -1215,7 +1212,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz end < file_start || map_file_into_view( view, fd, sec->VirtualAddress, file_size, file_start, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - !dup_mapping ) != STATUS_SUCCESS) + MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) { ERR_(module)( "Could not map section %.8s, file probably truncated\n", sec->Name ); goto error; @@ -2630,7 +2627,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p TRACE("handle=%p size=%lx offset=%x%08x\n", handle, size, offset.u.HighPart, offset.u.LowPart ); - res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, !dup_mapping ); + res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, MAP_SHARED, !dup_mapping ); if (res == STATUS_SUCCESS) { *addr_ptr = view->base;

1 0

Frédéric Delanoy : usp10: Silence a noisy fixme in ScriptPlaceOpenType.
by Alexandre Julliard 08 May '14

08 May '14

Module: wine Branch: master Commit: 0ec7907c611fa00cea7cf6de7708d3d0d441443f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec7907c611fa00cea7cf6de7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 8 17:04:42 2014 +0200 usp10: Silence a noisy fixme in ScriptPlaceOpenType. --- dlls/usp10/usp10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ac9c0fd..0493487 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3078,6 +3078,7 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS { HRESULT hr; int i; + static int once = 0; TRACE("(%p, %p, %p, %s, %s, %p, %p, %d, %s, %p, %p, %d, %p, %p, %d, %p %p %p)\n", hdc, psc, psa, @@ -3091,7 +3092,7 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS if (!pGoffset) return E_FAIL; if (cRanges) - FIXME("Ranges not supported yet\n"); + if (!once++) FIXME("Ranges not supported yet\n"); ((ScriptCache *)*psc)->userScript = tagScript; ((ScriptCache *)*psc)->userLang = tagLangSys;

1 0

Piotr Caban : msvcp/tests: Force dll cleanup code to get executed ( for valgrind).
by Alexandre Julliard 08 May '14

08 May '14

Module: wine Branch: master Commit: 73a996de013264379c1b68e9512aa127b0b21bfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a996de013264379c1b68e95… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 8 16:45:25 2014 +0200 msvcp/tests: Force dll cleanup code to get executed (for valgrind). --- dlls/msvcp100/tests/misc.c | 5 ++++- dlls/msvcp100/tests/string.c | 5 ++++- dlls/msvcp60/tests/ios.c | 5 ++++- dlls/msvcp60/tests/string.c | 5 ++++- dlls/msvcp90/tests/ios.c | 8 ++++++-- dlls/msvcp90/tests/misc.c | 8 ++++++-- dlls/msvcp90/tests/string.c | 8 ++++++-- 7 files changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp100/tests/misc.c b/dlls/msvcp100/tests/misc.c index 554db2e..7775888 100644 --- a/dlls/msvcp100/tests/misc.c +++ b/dlls/msvcp100/tests/misc.c @@ -93,11 +93,12 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcp = LoadLibraryA("msvcp100.dll"); + msvcp = LoadLibraryA("msvcp100.dll"); if(!msvcp) { win_skip("msvcp100.dll not installed\n"); return FALSE; @@ -200,4 +201,6 @@ START_TEST(misc) return; test__Container_base12(); + + FreeLibrary(msvcp); } diff --git a/dlls/msvcp100/tests/string.c b/dlls/msvcp100/tests/string.c index 5fb2003..eb02bc5 100644 --- a/dlls/msvcp100/tests/string.c +++ b/dlls/msvcp100/tests/string.c @@ -83,11 +83,12 @@ static void (__thiscall *_Yarn_char_dtor)(_Yarn_char *this); static const char* (__thiscall *_Yarn_char_c_str)(const _Yarn_char *this); static char (__thiscall *_Yarn_char_empty)(const _Yarn_char *this); +static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcp = LoadLibraryA("msvcp100.dll"); + msvcp = LoadLibraryA("msvcp100.dll"); if(!msvcp) { win_skip("msvcp100.dll not installed\n"); return FALSE; @@ -173,4 +174,6 @@ START_TEST(string) return; test__Yarn_char(); + + FreeLibrary(msvcp); } diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index 2a8b966..cf0fa19 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -565,11 +565,12 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcp = LoadLibraryA("msvcp60.dll"); + msvcp = LoadLibraryA("msvcp60.dll"); if(!msvcp) { win_skip("msvcp60.dll not installed\n"); return FALSE; @@ -1651,4 +1652,6 @@ START_TEST(ios) test_istream_tellg(); test_istream_getline(); test_ostream_print_ushort(); + + FreeLibrary(msvcp); } diff --git a/dlls/msvcp60/tests/string.c b/dlls/msvcp60/tests/string.c index 6d3ab1a..3ed1480 100644 --- a/dlls/msvcp60/tests/string.c +++ b/dlls/msvcp60/tests/string.c @@ -149,11 +149,12 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcp = LoadLibraryA("msvcp60.dll"); + msvcp = LoadLibraryA("msvcp60.dll"); if(!msvcp) { win_skip("msvcp60.dll not installed\n"); return FALSE; @@ -701,4 +702,6 @@ START_TEST(string) test_basic_string_char_replace(); test_basic_string_wchar(); test_basic_string_wchar_swap(); + + FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index dc70c3f..76107b0 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -590,12 +590,13 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcr, msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcr = LoadLibraryA("msvcr90.dll"); - HMODULE msvcp = LoadLibraryA("msvcp90.dll"); + msvcr = LoadLibraryA("msvcr90.dll"); + msvcp = LoadLibraryA("msvcp90.dll"); if(!msvcr || !msvcp) { win_skip("msvcp90.dll or msvcrt90.dll not installed\n"); return FALSE; @@ -1969,4 +1970,7 @@ START_TEST(ios) test_ostream_print_ushort(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); + + FreeLibrary(msvcr); + FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index f294b2a..e94ddcb 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -183,12 +183,13 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcr, msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcr = LoadLibraryA("msvcr90.dll"); - HMODULE msvcp = LoadLibraryA("msvcp90.dll"); + msvcr = LoadLibraryA("msvcr90.dll"); + msvcp = LoadLibraryA("msvcp90.dll"); if(!msvcr || !msvcp) { win_skip("msvcp90.dll or msvcrt90.dll not installed\n"); return FALSE; @@ -863,4 +864,7 @@ START_TEST(misc) test_complex(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); + + FreeLibrary(msvcr); + FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 6cc06ce..f1aa92a 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -170,12 +170,13 @@ static void init_thiscall_thunk(void) #endif /* __i386__ */ +static HMODULE msvcr, msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HMODULE msvcr = LoadLibraryA("msvcr90.dll"); - HMODULE msvcp = LoadLibraryA("msvcp90.dll"); + msvcr = LoadLibraryA("msvcr90.dll"); + msvcp = LoadLibraryA("msvcp90.dll"); if(!msvcr || !msvcp) { win_skip("msvcp90.dll or msvcrt90.dll not installed\n"); return FALSE; @@ -784,4 +785,7 @@ START_TEST(string) test_basic_string_char_find_last_not_of(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); + + FreeLibrary(msvcr); + FreeLibrary(msvcp); }

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
41
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 May 2014