May 2014 - Wine-Commits - list.winehq.org

Bruno Jesus : ws2_32: Return the correct error if SO_REUSEADDR is set in bind error.
by Alexandre Julliard May 9, 2014

May 9, 2014

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 : ole32: Use real blocking operations for storage locking when possible.
by Alexandre Julliard May 9, 2014

May 9, 2014

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 May 9, 2014

May 9, 2014

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

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

May 9, 2014

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

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

May 9, 2014

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

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

May 8, 2014

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 May 8, 2014

May 8, 2014

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 May 8, 2014

May 8, 2014

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

Ken Thomases : winemac: Don't bring owned windows to the front when they' re clicked.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 3bca22a6b9d49bbf0255adfc06444227d6228c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bca22a6b9d49bbf0255adfc0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 7 17:09:29 2014 -0500 winemac: Don't bring owned windows to the front when they're clicked. Cocoa will bring an unowned window to the front of its level when it's clicked, but it doesn't do that for owned windows. The old code went out of its way to make owned windows behave like unowned windows in this respect. That was exactly backward. We wish we could control whether windows are raised on a click. We don't have that opportunity for unowned windows, but, by ripping out a bunch of code, we do for owned windows. --- dlls/winemac.drv/cocoa_app.m | 54 ------------------------------------------ 1 file changed, 54 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index ab045b2..e5594d1 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1597,60 +1597,6 @@ int macdrv_err_on; } } } - - if (broughtWindowForward) - { - // Clicking on a child window does not normally reorder it with - // respect to its siblings, but we want it to. We have to do it - // manually. - NSWindow* parent = [window parentWindow]; - NSInteger level = [window level]; - __block BOOL needReorder = FALSE; - NSMutableArray* higherLevelSiblings = [NSMutableArray array]; - - // If the window is already the last child or if it's only below - // children with higher window level, then no need to reorder it. - [[parent childWindows] enumerateObjectsWithOptions:NSEnumerationReverse - usingBlock:^(id obj, NSUInteger idx, BOOL *stop){ - WineWindow* child = obj; - if (child == window) - *stop = TRUE; - else if ([child level] <= level) - { - needReorder = TRUE; - *stop = TRUE; - } - else - [higherLevelSiblings insertObject:child atIndex:0]; - }]; - - if (needReorder) - { - WineWindow* sibling; - - NSDisableScreenUpdates(); - - [parent removeChildWindow:window]; - for (sibling in higherLevelSiblings) - [parent removeChildWindow:sibling]; - - [parent addChildWindow:window ordered:NSWindowAbove]; - for (sibling in higherLevelSiblings) - { - // Setting a window as a child can reset its level to be - // the same as the parent, so save it and restore it. - // The call to -setLevel: puts the window at the front - // of its level but testing shows that that's what Cocoa - // does when you click on any window in an ownership - // hierarchy, anyway. - level = [sibling level]; - [parent addChildWindow:sibling ordered:NSWindowAbove]; - [sibling setLevel:level]; - } - - NSEnableScreenUpdates(); - } - } } if ([windowsBeingDragged count])

1 0

Piotr Caban : msvcp: Fix global_locale leak.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 6fb5155f3037a8a635f9e82c4d862fe2f517507b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb5155f3037a8a635f9e82c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 8 16:44:44 2014 +0200 msvcp: Fix global_locale leak. --- dlls/msvcp60/locale.c | 3 ++- dlls/msvcp90/locale.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 6b95521..2320886 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -8696,8 +8696,9 @@ void free_locale(void) facets_elem *iter, *safe; if(global_locale) { - locale__Locimp_dtor(global_locale); locale_dtor(&classic_locale); + locale__Locimp_dtor(global_locale); + MSVCRT_operator_delete(global_locale); } LIST_FOR_EACH_ENTRY_SAFE(iter, safe, &lazy_facets, facets_elem, entry) { diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 606d6ca..ef06172 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -10690,8 +10690,9 @@ void free_locale(void) facets_elem *iter, *safe; if(global_locale) { - locale__Locimp_dtor(global_locale); locale_dtor(&classic_locale); + locale__Locimp_dtor(global_locale); + MSVCRT_operator_delete(global_locale); } LIST_FOR_EACH_ENTRY_SAFE(iter, safe, &lazy_facets, facets_elem, entry) {

1 0

Piotr Caban : msvcp/tests: Force dll cleanup code to get executed ( for valgrind).
by Alexandre Julliard May 8, 2014

May 8, 2014

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

Frédéric Delanoy : usp10: Silence a noisy fixme in ScriptPlaceOpenType.
by Alexandre Julliard May 8, 2014

May 8, 2014

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

Jacek Caban : mshtml: Use debugmsg_mshtml_guid in a few more places.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: cac04a675c22c593bd0ad82bdddd5c0a270ee4b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac04a675c22c593bd0ad82bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 8 11:48:32 2014 +0200 mshtml: Use debugmsg_mshtml_guid in a few more places. --- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/htmlelem.c | 54 +++++++++++++++-------------------------------- dlls/mshtml/htmlelem2.c | 6 +++--- dlls/mshtml/htmlevent.c | 17 ++++++--------- dlls/mshtml/htmlimg.c | 18 +++++++--------- dlls/mshtml/htmlnode.c | 54 +++++++++++++++++------------------------------ dlls/mshtml/main.c | 16 ++++++++++++++ 7 files changed, 72 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cac04a675c22c593bd0ad…

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Client Initialize.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 0d8f86c66de4fc75793f777967c7df2d9202776b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8f86c66de4fc75793f77796… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 3 15:45:06 2014 +1000 dpnet: Implement IDirectPlay8Client Initialize. --- dlls/dpnet/client.c | 15 ++++++++++++--- dlls/dpnet/dpnet_private.h | 10 +++++++--- dlls/dpnet/tests/client.c | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 9668a68..43ffb59 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -86,9 +86,18 @@ static ULONG WINAPI IDirectPlay8ClientImpl_Release(IDirectPlay8Client *iface) static HRESULT WINAPI IDirectPlay8ClientImpl_Initialize(IDirectPlay8Client *iface, void * const pvUserContext, const PFNDPNMESSAGEHANDLER pfn, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%p,%p,%x): Stub\n", This, pvUserContext, pfn, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + + TRACE("(%p):(%p,%p,%x)\n", This, pvUserContext, pfn, dwFlags); + + if(!pfn) + return DPNERR_INVALIDPARAM; + + This->usercontext = pvUserContext; + This->msghandler = pfn; + This->flags = dwFlags; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8ClientImpl_EnumServiceProviders(IDirectPlay8Client *iface, diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 00ea94b..34d2aee 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -46,9 +46,13 @@ typedef struct IDirectPlay8ThreadPoolImpl IDirectPlay8ThreadPoolImpl; */ struct IDirectPlay8ClientImpl { - IDirectPlay8Client IDirectPlay8Client_iface; - LONG ref; - /* IDirectPlay8Client fields */ + IDirectPlay8Client IDirectPlay8Client_iface; + LONG ref; + + /* IDirectPlay8Client fields */ + PFNDPNMESSAGEHANDLER msghandler; + DWORD flags; + void *usercontext; }; /* ------------------- */ diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 890f218..0df99dd 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -44,7 +44,7 @@ static BOOL test_init_dp(void) ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); hr = IDirectPlay8Client_Initialize(client, NULL, NULL, 0); - todo_wine ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); + ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr);

1 0

Zhenbo Li : mshtml: Added IHTMLSelectElement:: remove method implementation.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 15ccfef0804fe1730ded9ab22c30291573bbf61a URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ccfef0804fe1730ded9ab22… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun May 4 18:51:32 2014 +0800 mshtml: Added IHTMLSelectElement::remove method implementation. --- dlls/mshtml/htmlselect.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index aef0bf0..08a374a 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -407,8 +407,14 @@ static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElem static HRESULT WINAPI HTMLSelectElement_remove(IHTMLSelectElement *iface, LONG index) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%d)\n", This, index); - return E_NOTIMPL; + nsresult nsres; + TRACE("(%p)->(%d)\n", This, index); + nsres = nsIDOMHTMLSelectElement_select_Remove(This->nsselect, index); + if(NS_FAILED(nsres)) { + ERR("Remove failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLSelectElement_put_length(IHTMLSelectElement *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 02e0d00..4378ad3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2559,6 +2559,24 @@ static void _test_select_get_disabled(unsigned line, IHTMLSelectElement *select, _test_elem3_get_disabled(line, (IUnknown*)select, exb); } +static void test_select_remove(IHTMLSelectElement *select) +{ + HRESULT hres; + + hres = IHTMLSelectElement_remove(select, 3); + ok(hres == S_OK, "remove failed: %08x, expected S_OK\n", hres); + test_select_length(select, 2); + + hres = IHTMLSelectElement_remove(select, -1); + todo_wine + ok(hres == E_INVALIDARG, "remove failed: %08x, expected E_INVALIDARG\n", hres); + test_select_length(select, 2); + + hres = IHTMLSelectElement_remove(select, 0); + ok(hres == S_OK, "remove failed:%08x\n", hres); + test_select_length(select, 1); +} + #define test_text_length(u,l) _test_text_length(__LINE__,u,l) static void _test_text_length(unsigned line, IUnknown *unk, LONG l) { @@ -4324,6 +4342,7 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_multiple(select, VARIANT_FALSE); test_select_set_multiple(select, VARIANT_TRUE); + test_select_remove(select); } static void test_form_item(IHTMLElement *elem)

1 0

Shuai Meng : vbscript: Fixed CBool handling.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: b8aecb92b959eaf140a4e752b8caf911db391079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8aecb92b959eaf140a4e752b… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Sat May 3 10:14:26 2014 +0800 vbscript: Fixed CBool handling. --- dlls/vbscript/global.c | 41 ++++++++++---------------------- dlls/vbscript/tests/api.vbs | 55 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 29 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index b89b888..9aeba34 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -114,16 +114,6 @@ static HRESULT return_int(VARIANT *res, int val) return S_OK; } -static HRESULT return_bool(VARIANT *res, int val) -{ - if(res) { - V_VT(res) = VT_BOOL; - V_BOOL(res) = val != 0 ? VARIANT_TRUE : VARIANT_FALSE; - } - - return S_OK; -} - static inline HRESULT return_double(VARIANT *res, double val) { if(res) { @@ -413,30 +403,23 @@ static HRESULT Global_CLng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CBool(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - int val; + VARIANT v; + HRESULT hres; + TRACE("%s\n", debugstr_variant(arg)); assert(args_cnt == 1); - switch(V_VT(arg)) { - case VT_I2: - val = V_I2(arg); - break; - case VT_I4: - val = V_I4(arg); - break; - case VT_R4: - val = V_R4(arg) > 0.0 || V_R4(arg) < 0.0; - break; - case VT_R8: - val = V_R8(arg) > 0.0 || V_R8(arg) < 0.0; - break; - default: - ERR("Not a numeric value: %s\n", debugstr_variant(arg)); - return E_FAIL; - } + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, VARIANT_LOCALBOOL, VT_BOOL); + if(FAILED(hres)) + return hres; - return return_bool(res, val); + if(res) + *res = v; + else + VariantClear(&v); + return S_OK; } static HRESULT Global_CByte(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index ee9ebd3..12124b7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -478,4 +478,59 @@ Call ok(getVT(CBool(0)) = "VT_BOOL", "getVT(CBool(0)) = " & getVT(CBool(0))) Call ok(CBool(-5) = true, "CBool(-5) = " & CBool(-5)) Call ok(getVT(CBool(-5)) = "VT_BOOL", "getVT(CBool(-5)) = " & getVT(CBool(-5))) +Sub testCBoolError(strings, error_num) + on error resume next + + Call Err.clear() + Call CBool(strings) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +Class ValClass + Public myval + + Public default Property Get defprop + defprop = myval + End Property +End Class + +Dim MyObject +Set MyObject = New ValClass + +Call ok(CBool(Empty) = False, "CBool(Empty) = " & CBool(Empty)) +Call ok(getVT(CBool(Empty)) = "VT_BOOL", "getVT(CBool(Empty)) = " & getVT(CBool(Empty))) +Call ok(CBool(1) = True, "CBool(1) = " & CBool(1)) +Call ok(getVT(CBool(1)) = "VT_BOOL", "getVT(CBool(1)) = " & getVT(CBool(1))) +Call ok(CBool(0) = False, "CBool(0) = " & CBool(0)) +Call ok(getVT(CBool(0)) = "VT_BOOL", "getVT(CBool(0)) = " & getVT(CBool(0))) +Call ok(CBool(-0.56) = True, "CBool(-0.56) = " & CBool(-0.56)) +Call ok(getVT(CBool(-0.56)) = "VT_BOOL", "getVT(CBool(-0.56)) = " & getVT(CBool(-0.56))) +Call testCBoolError("", 13) +Call ok(CBool("0") = False, "CBool(""0"") = " & CBool("0")) +Call ok(getVT(CBool("0")) = "VT_BOOL", "getVT(CBool(""0"")) = " & getVT(CBool("0"))) +If isEnglishLang Then + Call ok(CBool("0.1") = True, "CBool(""0.1"") = " & CBool("0.1")) + Call ok(getVT(CBool("0.1")) = "VT_BOOL", "getVT(CBool(""0.1"")) = " & getVT(CBool("0.1"))) +End If + Call ok(CBool("true") = True, "CBool(""true"") = " & CBool("true")) +Call ok(getVT(CBool("true")) = "VT_BOOL", "getVT(CBool(""true"")) = " & getVT(CBool("true"))) +Call ok(CBool("false") = False, "CBool(""false"") = " & CBool("false")) +Call ok(getVT(CBool("false")) = "VT_BOOL", "getVT(CBool(""false"")) = " & getVT(CBool("false"))) +Call ok(CBool("TRUE") = True, "CBool(""TRUE"") = " & CBool("TRUE")) +Call ok(getVT(CBool("TRUE")) = "VT_BOOL", "getVT(CBool(""TRUE"")) = " & getVT(CBool("TRUE"))) +Call ok(CBool("FALSE") = False, "CBool(""FALSE"") = " & CBool("FALSE")) +Call ok(getVT(CBool("FALSE")) = "VT_BOOL", "getVT(CBool(""FALSE"")) = " & getVT(CBool("FALSE"))) +Call ok(CBool("#TRUE#") = True, "CBool(""#TRUE#"") = " & CBool("#TRUE#")) +Call ok(getVT(CBool("#TRUE#")) = "VT_BOOL", "getVT(CBool(""#TRUE#"")) = " & getVT(CBool("#TRUE#"))) +Call ok(CBool("#FALSE#") = False, "CBool(""#FALSE#"") = " & CBool("#FALSE#")) +Call ok(getVT(CBool("#FALSE#")) = "VT_BOOL", "getVT(CBool(""#FALSE#"")) = " & getVT(CBool("#FALSE#"))) +Call ok(CBool(MyObject) = False, "CBool(MyObject) = " & CBool(MyObject)) +Call ok(getVT(CBool(MyObject)) = "VT_BOOL", "getVT(CBool(MyObject)) = " & getVT(CBool(MyObject))) +MyObject.myval = 1 +Call ok(CBool(MyObject) = True, "CBool(MyObject) = " & CBool(MyObject)) +Call ok(getVT(CBool(MyObject)) = "VT_BOOL", "getVT(CBool(MyObject)) = " & getVT(CBool(MyObject))) +MyObject.myval = 0 +Call ok(CBool(MyObject) = False, "CBool(MyObject) = " & CBool(MyObject)) +Call ok(getVT(CBool(MyObject)) = "VT_BOOL", "getVT(CBool(MyObject)) = " & getVT(CBool(MyObject))) + Call reportSuccess()

1 0

Alistair Leslie-Hughes : dpnet/tests: Add IDirectPlay8Client tests.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 594c4ea392743b4b81306279997dfa0b2b2e2076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=594c4ea392743b4b813062799… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 3 15:31:13 2014 +1000 dpnet/tests: Add IDirectPlay8Client tests. --- dlls/dpnet/tests/Makefile.in | 1 + dlls/dpnet/tests/client.c | 206 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 207 insertions(+) diff --git a/dlls/dpnet/tests/Makefile.in b/dlls/dpnet/tests/Makefile.in index 69339dc..f6e45ea 100644 --- a/dlls/dpnet/tests/Makefile.in +++ b/dlls/dpnet/tests/Makefile.in @@ -3,5 +3,6 @@ IMPORTS = dxguid uuid dpnet ole32 C_SRCS = \ address.c \ + client.c \ peer.c \ server.c diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c new file mode 100644 index 0000000..890f218 --- /dev/null +++ b/dlls/dpnet/tests/client.c @@ -0,0 +1,206 @@ +/* + * Copyright 2011 Louis Lenders + * Copyright 2014 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN +#include <stdio.h> + +#include <dplay8.h> +#include "wine/test.h" + + +static IDirectPlay8Client* client = NULL; +static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; + +static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) +{ + trace("DirectPlayMessageHandler: 0x%08x\n", message_id); + return S_OK; +} + +static BOOL test_init_dp(void) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok(hr == S_OK, "CoInitialize failed with %x\n", hr); + + hr = CoCreateInstance(&CLSID_DirectPlay8Client, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Client, (void **)&client); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + + hr = IDirectPlay8Client_Initialize(client, NULL, NULL, 0); + todo_wine ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); + + hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayMessageHandler, 0); + ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr); + + return client != NULL; +} + +static void test_enum_service_providers(void) +{ + DPN_SERVICE_PROVIDER_INFO *serv_prov_info; + DWORD items, size; + DWORD i; + HRESULT hr; + + size = 0; + items = 0; + + hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, NULL, &size, NULL, 0); + todo_wine ok(hr == E_POINTER, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, NULL, NULL, &items, 0); + todo_wine ok(hr == E_POINTER, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, NULL, &size, &items, 0); + todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, serv_prov_info, &size, &items, 0); + ok(hr == S_OK, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(items != 0, "Found unexpectedly no service providers\n"); + + trace("number of items found: %d\n", items); + + for (i=0;i<items;i++) + { + trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); + } + + ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + + size = 0; + items = 0; + + hr = IDirectPlay8Client_EnumServiceProviders(client, &CLSID_DP8SP_TCPIP, NULL, NULL, &size, &items, 0); + todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Client_EnumServiceProviders(client, &CLSID_DP8SP_TCPIP, NULL, serv_prov_info, &size, &items, 0); + ok(hr == S_OK, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(items != 0, "Found unexpectedly no adapter\n"); + + + for (i=0;i<items;i++) + { + trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); + } + + ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); +} + +static void test_enum_hosts(void) +{ + HRESULT hr; + IDirectPlay8Address *host = NULL; + IDirectPlay8Address *local = NULL; + DPN_APPLICATION_DESC appdesc; + DPNHANDLE async = 0; + static const WCHAR localhost[] = {'1','2','7','.','0','.','0','.','1',0}; + + memset( &appdesc, 0, sizeof(DPN_APPLICATION_DESC) ); + appdesc.dwSize = sizeof( DPN_APPLICATION_DESC ); + appdesc.guidApplication = appguid; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&local); + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_SetSP(local, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&host); + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_SetSP(host, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "IDirectPlay8Address_SetSP failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_AddComponent(host, DPNA_KEY_HOSTNAME, localhost, sizeof(localhost), + DPNA_DATATYPE_STRING); + ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); + + /* Since we are running asynchronously, EnumHosts returns DPNSUCCESS_PENDING. */ + hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); + todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumServiceProviders failed with 0x%08x\n", hr); + todo_wine ok(async, "No Handle returned\n"); + + hr = IDirectPlay8Client_CancelAsyncOperation(client, async, 0); + ok(hr == S_OK, "IDirectPlay8Client_CancelAsyncOperation failed with 0x%08x\n", hr); + + IDirectPlay8Address_Release(local); + IDirectPlay8Address_Release(host); +} + +static void test_get_sp_caps(void) +{ + DPN_SP_CAPS caps; + HRESULT hr; + + memset(&caps, 0, sizeof(DPN_SP_CAPS)); + + hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + todo_wine ok(hr == DPNERR_INVALIDPARAM, "GetSPCaps unexpectedly returned %x\n", hr); + + caps.dwSize = sizeof(DPN_SP_CAPS); + + hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); + + todo_wine ok((caps.dwFlags & + (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS)) == + (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS), + "unexpected flags %x\n", caps.dwFlags); + todo_wine ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); + todo_wine ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); + todo_wine ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); + todo_wine ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); + todo_wine ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); + todo_wine ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); + todo_wine ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), + "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); +} + +static void test_cleanup_dp(void) +{ + HRESULT hr; + + hr = IDirectPlay8Client_Close(client, 0); + ok(hr == S_OK, "IDirectPlay8Client_Close failed with %x\n", hr); + + hr = IDirectPlay8Client_Release(client); + ok(hr == S_OK, "IDirectPlay8Client_Release failed with %x\n", hr); + + CoUninitialize(); +} + +START_TEST(client) +{ + if(!test_init_dp()) + return; + + test_enum_service_providers(); + test_enum_hosts(); + test_get_sp_caps(); + test_cleanup_dp(); +}

1 0

Bruno Jesus : ws2_32: Avoid using WS_ prefix on unix sockaddr struct.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: 43241934c616a5b757212241f2b0ca48a0f755f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43241934c616a5b757212241f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed May 7 23:31:57 2014 -0300 ws2_32: Avoid using WS_ prefix on unix sockaddr struct. The address was already converted to unix in these situations, so it's wrong to check against windows #defines. --- dlls/ws2_32/socket.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 630e463..a8fb9a5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2559,7 +2559,7 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) DWORD adap_size; int enable = 1; - if (bind_addr == htonl(WS_INADDR_ANY) || bind_addr == htonl(WS_INADDR_LOOPBACK)) + if (bind_addr == htonl(INADDR_ANY) || bind_addr == htonl(INADDR_LOOPBACK)) return FALSE; /* Not binding to a network adapter, special interface binding unnecessary. */ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &sock_type, &optlen) == -1 || sock_type != SOCK_DGRAM) return FALSE; /* Special interface binding is only necessary for UDP datagrams. */ @@ -2664,10 +2664,10 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) * INADDR_ANY instead*/ WARN("Trying to bind to magic IP address, using " "INADDR_ANY instead.\n"); - in4->sin_addr.s_addr = htonl(WS_INADDR_ANY); + in4->sin_addr.s_addr = htonl(INADDR_ANY); } else if (interface_bind(s, fd, &uaddr.addr)) - in4->sin_addr.s_addr = htonl(WS_INADDR_ANY); + in4->sin_addr.s_addr = htonl(INADDR_ANY); } if (bind(fd, &uaddr.addr, uaddrlen) < 0) { @@ -2725,7 +2725,7 @@ static int do_connect(int fd, const struct WS_sockaddr* name, int namelen) * assuming we really want to connect to localhost */ TRACE("Trying to connect to magic IP address, using " "INADDR_LOOPBACK instead.\n"); - in4->sin_addr.s_addr = htonl(WS_INADDR_LOOPBACK); + in4->sin_addr.s_addr = htonl(INADDR_LOOPBACK); } }

1 0

Piotr Caban : msvcp60: Fix uninitialized variable access in basic_string:: _Tidy.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: ea7baf5304d7c9fa72840999b2da6adc764d5fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7baf5304d7c9fa72840999b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 8 13:43:42 2014 +0200 msvcp60: Fix uninitialized variable access in basic_string::_Tidy. --- dlls/msvcp60/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 01b535d..f1b2b8e 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -164,7 +164,7 @@ void __thiscall basic_string_char__Tidy(basic_string_char *this, MSVCP_bool buil { TRACE("(%p %d)\n", this, built); - if(!this->ptr || !built); + if(!built || !this->ptr); else if(!this->ptr[-1] || (unsigned char)this->ptr[-1]==FROZEN) MSVCP_allocator_char_deallocate(NULL, this->ptr-1, this->res+2); else @@ -1885,7 +1885,7 @@ void __thiscall basic_string_wchar__Tidy(basic_string_wchar *this, MSVCP_bool bu { TRACE("(%p %d)\n", this, built); - if(!this->ptr || !built); + if(!built || !this->ptr); else if(!this->ptr[-1] || (unsigned short)this->ptr[-1]==FROZEN) MSVCP_allocator_wchar_deallocate(NULL, this->ptr-1, this->res+2); else

1 0

Jacek Caban : mshtml: Forward IHTMLImageElementFactory IDispatch functions to IDispatchEx implementation.
by Alexandre Julliard May 8, 2014

May 8, 2014

Module: wine Branch: master Commit: cf2278b2d0cae4684bbc8e5244879a9a88df0322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2278b2d0cae4684bbc8e524… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 8 11:48:43 2014 +0200 mshtml: Forward IHTMLImageElementFactory IDispatch functions to IDispatchEx implementation. --- dlls/mshtml/htmlimg.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index defb08e..212d01e 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -750,16 +750,14 @@ static HRESULT WINAPI HTMLImageElementFactory_GetTypeInfoCount(IHTMLImageElement UINT *pctinfo) { HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLImageElementFactory_GetTypeInfo(IHTMLImageElementFactory *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLImageElementFactory_GetIDsOfNames(IHTMLImageElementFactory *iface, @@ -767,9 +765,7 @@ static HRESULT WINAPI HTMLImageElementFactory_GetIDsOfNames(IHTMLImageElementFac DISPID *rgDispId) { HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, - cNames, lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLImageElementFactory_Invoke(IHTMLImageElementFactory *iface, @@ -778,9 +774,8 @@ static HRESULT WINAPI HTMLImageElementFactory_Invoke(IHTMLImageElementFactory *i UINT *puArgErr) { HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); } static LONG var_to_size(const VARIANT *v)

1 0

Vincent Povirk : shell32/tests: Use SW_HIDE with ShellExecuteA in tests.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 3ebb9b7b7530a14acec574af127aec5d7a26b053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ebb9b7b7530a14acec574af1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 7 13:55:01 2014 -0500 shell32/tests: Use SW_HIDE with ShellExecuteA in tests. --- dlls/shell32/tests/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index e3169c8..7f07c70 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -118,7 +118,7 @@ static INT_PTR shell_execute(LPCSTR verb, LPCSTR file, LPCSTR parameters, LPCSTR * association it displays the 'Open With' dialog and I could not find * a flag to prevent this. */ - rc=(INT_PTR)ShellExecuteA(NULL, verb, file, parameters, directory, SW_SHOWNORMAL); + rc=(INT_PTR)ShellExecuteA(NULL, verb, file, parameters, directory, SW_HIDE); if (rc > 32) {

1 0

Aric Stewart : user32: Pass WM_IME_CONTROL messages to the IME.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: dfa65a52bbc84b03709fd3d3f7c569b4d9e1642f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa65a52bbc84b03709fd3d3f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 7 10:27:51 2014 -0500 user32: Pass WM_IME_CONTROL messages to the IME. --- dlls/user32/defwnd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index b359c06..bcd6f91 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -831,6 +831,7 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case WM_IME_ENDCOMPOSITION: case WM_IME_SELECT: case WM_IME_NOTIFY: + case WM_IME_CONTROL: { HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); if (hwndIME) @@ -983,6 +984,7 @@ LRESULT WINAPI DefWindowProcW( case WM_IME_ENDCOMPOSITION: case WM_IME_SELECT: case WM_IME_NOTIFY: + case WM_IME_CONTROL: { HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); if (hwndIME)

1 0

Huw Davies : gdi32: In a Hebrew locale the last char of a symbol font is reported as 0xf896 rather than 0xf0ff.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: c66f0019fff40b4755e217ce555d5147b78d523f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66f0019fff40b4755e217ce5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 7 14:51:11 2014 +0100 gdi32: In a Hebrew locale the last char of a symbol font is reported as 0xf896 rather than 0xf0ff. --- dlls/gdi32/freetype.c | 3 +++ dlls/gdi32/tests/font.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 54241a5..fae9ffe 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7390,6 +7390,9 @@ static BOOL get_outline_text_metrics(GdiFont *font) TM.tmFirstChar = 0; switch(GetACP()) { + case 1255: /* Hebrew */ + TM.tmLastChar = 0xf896; + break; case 1257: /* Baltic */ TM.tmLastChar = 0xf8fd; break; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index fa3b420..255771a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3543,6 +3543,9 @@ static void test_text_metrics(const LOGFONTA *lf, const NEWTEXTMETRICA *ntm) expect_first_W = 0; switch(GetACP()) { + case 1255: /* Hebrew */ + expect_last_W = 0xf896; + break; case 1257: /* Baltic */ expect_last_W = 0xf8fd; break;

1 0

Stefan Dösinger : gdi32/tests: Test RGBQUAD.rgbReserved in SetDIBColorTable.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: a373c35371016b6fb1129da02f4a5f4da756709b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a373c35371016b6fb1129da02… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 7 15:16:35 2014 +0200 gdi32/tests: Test RGBQUAD.rgbReserved in SetDIBColorTable. --- dlls/gdi32/tests/bitmap.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 39ca454..2a2dd3a 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -854,6 +854,21 @@ static void test_dibsections(void) i, colors[i].rgbRed, colors[i].rgbGreen, colors[i].rgbBlue, colors[i].rgbReserved); } + rgb[0].rgbRed = 1; + rgb[0].rgbGreen = 2; + rgb[0].rgbBlue = 3; + rgb[0].rgbReserved = 123; + ret = SetDIBColorTable( hdcmem, 0, 1, rgb ); + ok( ret == 1, "SetDIBColorTable returned unexpected result %u\n", ret ); + ok( rgb[0].rgbReserved == 123, "Expected rgbReserved = 123, got %u\n", rgb[0].rgbReserved ); + + ret = GetDIBColorTable( hdcmem, 0, 1, rgb ); + ok( ret == 1, "GetDIBColorTable returned unexpected result %u\n", ret ); + ok( rgb[0].rgbRed == 1, "Expected rgbRed = 1, got %u\n", rgb[0].rgbRed ); + ok( rgb[0].rgbGreen == 2, "Expected rgbGreen = 2, got %u\n", rgb[0].rgbGreen ); + ok( rgb[0].rgbBlue == 3, "Expected rgbBlue = 3, got %u\n", rgb[0].rgbBlue ); + todo_wine ok( rgb[0].rgbReserved == 0, "Expected rgbReserved = 0, got %u\n", rgb[0].rgbReserved ); + SelectObject(hdcmem, oldbm); DeleteObject(hdib); DeleteObject(hpal);

1 0

Huw Davies : advapi32/tests: Fix access rights tests in win 8.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 0451a89ca12690e1d97a69fb1b178f10f74da909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0451a89ca12690e1d97a69fb1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 7 09:42:16 2014 +0100 advapi32/tests: Fix access rights tests in win 8. --- dlls/advapi32/tests/security.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a0574c4..05da0ae 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5073,12 +5073,16 @@ static void test_thread_security(void) { case GENERIC_READ: case GENERIC_EXECUTE: - ok(access == map[i].mapped || access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */, + ok(access == map[i].mapped || + access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */ || + access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION | THREAD_RESUME) /* win8 */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_WRITE: todo_wine - ok(access == map[i].mapped || access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION) /* Vista+ */, + ok(access == map[i].mapped || + access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION) /* Vista+ */ || + access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION | THREAD_RESUME) /* win8 */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_ALL: @@ -5144,7 +5148,9 @@ static void test_process_access(void) "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_WRITE: - ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */, + ok(access == map[i].mapped || + access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */ || + access == (map[i].mapped | PROCESS_SET_LIMITED_INFORMATION) /* win8 */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_EXECUTE:

1 0

Huw Davies : include: Add a couple of new win 8 access rights.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 76fca0f953505209fd9b2a12f506895ffbfb40a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76fca0f953505209fd9b2a12f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 7 09:42:15 2014 +0100 include: Add a couple of new win 8 access rights. --- include/winnt.h | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 3f33c6b..bae8aed 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4533,31 +4533,33 @@ typedef enum tagSID_NAME_USE { #define TIMER_MODIFY_STATE 0x0002 #define TIMER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3) -#define PROCESS_TERMINATE 0x0001 -#define PROCESS_CREATE_THREAD 0x0002 -#define PROCESS_VM_OPERATION 0x0008 -#define PROCESS_VM_READ 0x0010 -#define PROCESS_VM_WRITE 0x0020 -#define PROCESS_DUP_HANDLE 0x0040 -#define PROCESS_CREATE_PROCESS 0x0080 -#define PROCESS_SET_QUOTA 0x0100 -#define PROCESS_SET_INFORMATION 0x0200 -#define PROCESS_QUERY_INFORMATION 0x0400 -#define PROCESS_SUSPEND_RESUME 0x0800 +#define PROCESS_TERMINATE 0x0001 +#define PROCESS_CREATE_THREAD 0x0002 +#define PROCESS_VM_OPERATION 0x0008 +#define PROCESS_VM_READ 0x0010 +#define PROCESS_VM_WRITE 0x0020 +#define PROCESS_DUP_HANDLE 0x0040 +#define PROCESS_CREATE_PROCESS 0x0080 +#define PROCESS_SET_QUOTA 0x0100 +#define PROCESS_SET_INFORMATION 0x0200 +#define PROCESS_QUERY_INFORMATION 0x0400 +#define PROCESS_SUSPEND_RESUME 0x0800 #define PROCESS_QUERY_LIMITED_INFORMATION 0x1000 +#define PROCESS_SET_LIMITED_INFORMATION 0x2000 #define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xffff) -#define THREAD_TERMINATE 0x0001 -#define THREAD_SUSPEND_RESUME 0x0002 -#define THREAD_GET_CONTEXT 0x0008 -#define THREAD_SET_CONTEXT 0x0010 -#define THREAD_SET_INFORMATION 0x0020 -#define THREAD_QUERY_INFORMATION 0x0040 -#define THREAD_SET_THREAD_TOKEN 0x0080 -#define THREAD_IMPERSONATE 0x0100 -#define THREAD_DIRECT_IMPERSONATION 0x0200 -#define THREAD_SET_LIMITED_INFORMATION 0x0400 -#define THREAD_QUERY_LIMITED_INFORMATION 0x0800 +#define THREAD_TERMINATE 0x0001 +#define THREAD_SUSPEND_RESUME 0x0002 +#define THREAD_GET_CONTEXT 0x0008 +#define THREAD_SET_CONTEXT 0x0010 +#define THREAD_SET_INFORMATION 0x0020 +#define THREAD_QUERY_INFORMATION 0x0040 +#define THREAD_SET_THREAD_TOKEN 0x0080 +#define THREAD_IMPERSONATE 0x0100 +#define THREAD_DIRECT_IMPERSONATION 0x0200 +#define THREAD_SET_LIMITED_INFORMATION 0x0400 +#define THREAD_QUERY_LIMITED_INFORMATION 0x0800 +#define THREAD_RESUME 0x1000 #define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xffff) #define THREAD_BASE_PRIORITY_LOWRT 15

1 0

Qian Hong : include: Added atlcom.h.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: e7aaeae73ba94e51c09c2198a9e680cdbb0339f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7aaeae73ba94e51c09c2198a… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed May 7 15:38:46 2014 +0800 include: Added atlcom.h. --- include/Makefile.in | 1 + include/atlcom.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index cdb7b09..383bef28 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -160,6 +160,7 @@ SRCDIR_INCLUDES = \ asynot.idl \ asysta.idl \ atlbase.h \ + atlcom.h \ atlwin.h \ audevcod.h \ audiosessiontypes.h \ diff --git a/include/atlcom.h b/include/atlcom.h new file mode 100644 index 0000000..c141fbe --- /dev/null +++ b/include/atlcom.h @@ -0,0 +1,50 @@ +/* + * Copyright 2014 Qian Hong for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_ATLCOM_H__ +#define __WINE_ATLCOM_H__ + +#ifndef __WINE_ATLBASE_H__ +# error You must include atlbase.h to use this header +#endif + +typedef struct ATL_PROPMAP_ENTRY +{ + LPCOLESTR szDesc; +#if _ATL_VER < _ATL_VER_100 + DISPID dispid; + const CLSID *pclsidPropPage; + const IID *piidDispatch; +#else + const CLSID *pclsidPropPage; + const IID *piidDispatch; + void *rgclsidAllowed; + DWORD cclsidAllowed; + DISPID dispid; +#endif + DWORD dwOffsetData; + DWORD dwSizeData; + VARTYPE vt; +} ATL_PROPMAP_ENTRY; + +HRESULT WINAPI AtlIPersistStreamInit_Load(IStream*, ATL_PROPMAP_ENTRY*, void*, IUnknown*); +HRESULT WINAPI AtlIPersistStreamInit_Save(IStream*, BOOL, ATL_PROPMAP_ENTRY*, void*, IUnknown*); +HRESULT WINAPI AtlIPersistPropertyBag_Load(IPropertyBag*, IErrorLog*, ATL_PROPMAP_ENTRY*, void*, IUnknown*); +HRESULT WINAPI AtlIPersistPropertyBag_Save(IPropertyBag*, BOOL, BOOL, ATL_PROPMAP_ENTRY*, void*, IUnknown*); + +#endif /* __WINE_ATLCOM_H__ */

1 0

Stefan Dösinger : wined3d: Copy the DIB to sysmem when PIN_SYSMEM is set.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 19f45af19cd0c1162f15d6779506431d1cd99d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f45af19cd0c1162f15d6779… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 7 15:16:34 2014 +0200 wined3d: Copy the DIB to sysmem when PIN_SYSMEM is set. --- dlls/wined3d/surface.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cd3b5a2..dc8c595 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3234,8 +3234,19 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) surface->resource.map_count--; surface->flags &= ~SFLAG_DCINUSE; - if (surface->map_binding == WINED3D_LOCATION_USER_MEMORY) - surface_load_location(surface, WINED3D_LOCATION_USER_MEMORY); + if (surface->map_binding == WINED3D_LOCATION_USER_MEMORY || (surface->flags & SFLAG_PIN_SYSMEM + && surface->map_binding != WINED3D_LOCATION_DIB)) + { + /* The game Salammbo modifies the surface contents without mapping the surface between + * a GetDC/ReleaseDC operation and flipping the surface. If the DIB remains the active + * copy and is copied to the screen, this update, which draws the mouse pointer, is lost. + * Do not only copy the DIB to the map location, but also make sure the map location is + * copied back to the DIB in the next getdc call. + * + * The same consideration applies to user memory surfaces. */ + surface_load_location(surface, surface->map_binding); + surface_invalidate_location(surface, WINED3D_LOCATION_DIB); + } return WINED3D_OK; }

1 0

Stefan Dösinger : ddraw/tests: Test palette alpha behavior.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 8ca711f4286343fb4e5a8116722771a1334f60e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca711f4286343fb4e5a81167… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 7 15:16:38 2014 +0200 ddraw/tests: Test palette alpha behavior. What I care about here is that setting peFlags != 0 doesn't cause errors either during ddraw palette creation or DIB section creation. peFlags isn't an alpha channel, but P8 textures abuse it that way, hence the name of the test. It probably has deeper meaning in DDSCL_NORMAL when the X server is running in 8 bit paletteindexed mode, but I don't think we really care about this. --- dlls/ddraw/tests/ddraw1.c | 158 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 166 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 154 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 154 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 632 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ca711f4286343fb4e5a8…

1 0

Stefan Dösinger : ddraw: Alpha palettes can only be attached to textures.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: a227188573dc727dd6d2c53059c1c093a595be05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a227188573dc727dd6d2c5305… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 7 15:16:37 2014 +0200 ddraw: Alpha palettes can only be attached to textures. --- dlls/ddraw/surface.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d192348..349bbda 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -454,6 +454,13 @@ static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectD TRACE("iface %p, palette %p.\n", surface, palette); + if (palette_impl && palette_impl->flags & DDPCAPS_ALPHA + && !(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + { + WARN("Alpha palette set on non-texture surface, returning DDERR_INVALIDSURFACETYPE.\n"); + return DDERR_INVALIDSURFACETYPE; + } + if (!(surface->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) return DDERR_INVALIDPIXELFORMAT;

1 0

Piotr Caban : msvcr80: Add __AdjustPointer implementation.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 87bfb306bd591b2a45a9d09a19eb3ab090cc387d URL: http://source.winehq.org/git/wine.git/?a=commit;h=87bfb306bd591b2a45a9d09a1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 7 12:08:06 2014 +0200 msvcr80: Add __AdjustPointer implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 34 ++++++++++++++++++++++++++++++++++ dlls/msvcrt/cpp.c | 5 +++++ 6 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 77ba21d..07d50fc 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -538,7 +538,7 @@ @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) @ cdecl _XcptFilter(long ptr) -@ stub __AdjustPointer +@ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 1afb3f2..e6576e0 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -869,7 +869,7 @@ @ stub _W_Gettnames @ stub _Wcsftime @ cdecl _XcptFilter(long ptr) -@ stub __AdjustPointer +@ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2aee520..9c7f85b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -172,7 +172,7 @@ @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) @ cdecl _XcptFilter(long ptr) -@ stub __AdjustPointer +@ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 766d62e..e86541c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -163,7 +163,7 @@ @ stub _NLG_Return2 @ cdecl _Strftime(str long str ptr ptr) @ cdecl _XcptFilter(long ptr) -@ stub __AdjustPointer +@ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 1c8da4e..0a81edc 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -120,6 +120,7 @@ static int (__cdecl *p_ferror)(FILE*); static int (__cdecl *p_flsbuf)(int, FILE*); static unsigned long (__cdecl *p_byteswap_ulong)(unsigned long); static void** (__cdecl *p__pxcptinfoptrs)(void); +static void* (__cdecl *p__AdjustPointer)(void*, const void*); /* make sure we use the correct errno */ #undef errno @@ -377,6 +378,7 @@ static BOOL init(void) SET(p_flsbuf, "_flsbuf"); SET(p_byteswap_ulong, "_byteswap_ulong"); SET(p__pxcptinfoptrs, "__pxcptinfoptrs"); + SET(p__AdjustPointer, "__AdjustPointer"); if (sizeof(void *) == 8) { SET(p_type_info_name_internal_method, "?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); @@ -1419,6 +1421,37 @@ static void test_is_exception_typeof(void) ok(ret == 0, "_is_exception_typeof returned %d\n", ret); } +static void test__AdjustPointer(void) +{ + int off = 0xf0; + void *obj1 = &off; + void *obj2 = (char*)&off - 2; + struct test_data { + void *ptr; + void *ret; + struct { + int this_offset; + int vbase_descr; + int vbase_offset; + } this_ptr_offsets; + } data[] = { + {NULL, NULL, {0, -1, 0}}, + {(void*)0xbeef, (void*)0xbef0, {1, -1, 1}}, + {(void*)0xbeef, (void*)0xbeee, {-1, -1, 0}}, + {&obj1, (char*)&obj1 + off, {0, 0, 0}}, + {(char*)&obj1 - 5, (char*)&obj1 + off, {0, 5, 0}}, + {(char*)&obj1 - 3, (char*)&obj1 + off + 24, {24, 3, 0}}, + {(char*)&obj2 - 17, (char*)&obj2 + off + 4, {4, 17, 2}} + }; + void *ret; + int i; + + for(i=0; i<sizeof(data)/sizeof(data[0]); i++) { + ret = p__AdjustPointer(data[i].ptr, &data[i].this_ptr_offsets); + ok(ret == data[i].ret, "%d) __AdjustPointer returned %p, expected %p\n", i, ret, data[i].ret); + } +} + START_TEST(msvcr90) { if(!init()) @@ -1446,4 +1479,5 @@ START_TEST(msvcr90) test_byteswap(); test_access_s(); test_is_exception_typeof(); + test__AdjustPointer(); } diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 37dc18a..db48dcb 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1431,3 +1431,8 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) return; } #endif + +void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) +{ + return get_this_pointer(off, obj); +}

1 0

Christoph von Wittich : comctl32/treeview: Notify the parent on a return key press.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 4cc503d164ab00b75567d1a206a303c373cbe044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cc503d164ab00b75567d1a20… Author: Christoph von Wittich <Christoph_vW(a)ReactOS.org> Date: Tue May 6 23:27:44 2014 +0200 comctl32/treeview: Notify the parent on a return key press. --- dlls/comctl32/treeview.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index dcc2be4..bb42b21 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5259,6 +5259,10 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam) newSelection = TREEVIEW_GetNextListItem(infoPtr, prevItem); break; + case VK_RETURN: + TREEVIEW_SendSimpleNotify(infoPtr, NM_RETURN); + break; + case VK_HOME: newSelection = infoPtr->root->firstChild; break;

1 0

Qian Hong : atl: Include atlcom.h for ATL_PROPMAP_ENTRY.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 2d80b3ed54891f5f897bf55fd300fa634870a611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d80b3ed54891f5f897bf55fd… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed May 7 15:39:02 2014 +0800 atl: Include atlcom.h for ATL_PROPMAP_ENTRY. --- dlls/atl/atl.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 53c7181..795ca9b 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "atlbase.h" +#include "atlcom.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -249,18 +250,6 @@ HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pE return rc; } -/* FIXME: should be in a header file */ -typedef struct ATL_PROPMAP_ENTRY -{ - LPCOLESTR szDesc; - DISPID dispid; - const CLSID* pclsidPropPage; - const IID* piidDispatch; - DWORD dwOffsetData; - DWORD dwSizeData; - VARTYPE vt; -} ATL_PROPMAP_ENTRY; - /*********************************************************************** * AtlIPersistStreamInit_Load [atl100.@] */

1 0

Alistair Leslie-Hughes : netcfgx: Fix memory leak (valgrind).
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 2aaef5e48fa0d4881ed4f3fcd18d9a2dd4d8b8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aaef5e48fa0d4881ed4f3fcd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 7 14:02:01 2014 +1000 netcfgx: Fix memory leak (valgrind). --- dlls/netcfgx/tests/netcfgx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/netcfgx/tests/netcfgx.c b/dlls/netcfgx/tests/netcfgx.c index 084f8cd..fda39f5 100644 --- a/dlls/netcfgx/tests/netcfgx.c +++ b/dlls/netcfgx/tests/netcfgx.c @@ -74,6 +74,7 @@ static void create_configuration(void) hr = INetCfgLock_ReleaseWriteLock(netlock); ok(hr == S_OK, "got 0x%08x\n", hr); + INetCfgLock_Release(netlock); INetCfg_Release(config); } }

1 0

Alistair Leslie-Hughes : dplayx: Initial msgtid variable (Valgrind).
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: e95f42fca418dbaa815997de9817b6f1aca98674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95f42fca418dbaa815997de9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 7 12:06:17 2014 +1000 dplayx: Initial msgtid variable (Valgrind). --- dlls/dplayx/dplobby.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 7b0c57a..3a968de 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -2044,6 +2044,7 @@ HRESULT dplobby_create( REFIID riid, void **ppv ) obj->IDirectPlayLobby3_iface.lpVtbl = &dpl3_vt; obj->IDirectPlayLobby3A_iface.lpVtbl = &dpl3A_vt; obj->numIfaces = 1; + obj->msgtid = 0; obj->ref = 0; obj->refA = 0; obj->ref2 = 0;

1 0

Piotr Caban : msvcrt: Fix ioinfo structure size.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 42e800fe796665d914f8ab7f93495e0c1d9602c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e800fe796665d914f8ab7f9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 7 09:27:59 2014 +0200 msvcrt: Fix ioinfo structure size. --- dlls/msvcr100/msvcr100.spec | 3 +-- dlls/msvcr110/msvcr110.spec | 3 +-- dlls/msvcr80/msvcr80.spec | 3 +-- dlls/msvcr90/msvcr90.spec | 3 +-- dlls/msvcrt/file.c | 11 +++++++++++ 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 98e9539..77ba21d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -573,7 +573,7 @@ @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv -### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +@ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ stub __create_locale @@ -648,7 +648,6 @@ @ cdecl __p__wenviron() MSVCRT___p__wenviron @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -#FIXME: add correct __pioinfo implementation @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index cdca5c3..1afb3f2 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -900,7 +900,7 @@ @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv -### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +@ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ stub __create_locale @@ -997,7 +997,6 @@ @ cdecl __p__wenviron() MSVCRT___p__wenviron @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -#FIXME: add correct __pioinfo implementation @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 13ea9f0..2aee520 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -207,7 +207,7 @@ @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv -### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +@ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ stub __create_locale @@ -297,7 +297,6 @@ @ cdecl __p__winver() @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -#FIXME: add correct __pioinfo implementation @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 710cb15..766d62e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -198,7 +198,7 @@ @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv -### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +@ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ stub __create_locale @@ -281,7 +281,6 @@ @ cdecl __p__wenviron() MSVCRT___p__wenviron @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -#FIXME: add correct __pioinfo implementation @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 957cfaf..77a0fed 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -88,6 +88,17 @@ typedef struct { char lookahead[3]; int exflag; CRITICAL_SECTION crit; +#if _MSVCR_VER >= 80 + char textmode : 7; + char unicode : 1; + char pipech2[2]; + __int64 startpos; + BOOL utf8translations; +#endif +#if _MSVCR_VER >= 90 + char dbcsBuffer; + BOOL dbcsBufferUsed; +#endif } ioinfo; /*********************************************************************

1 0

Erich E. Hoover : hhctrl.ocx: Fix an off by one mistake in searching for the node endpoint.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 74c5e38b7c229fbd427a1dcc63507e687db4f69c URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c5e38b7c229fbd427a1dcc6… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Mon May 5 23:12:10 2014 -0600 hhctrl.ocx: Fix an off by one mistake in searching for the node endpoint. --- dlls/hhctrl.ocx/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/stream.c b/dlls/hhctrl.ocx/stream.c index 6e831e5..84ed317 100644 --- a/dlls/hhctrl.ocx/stream.c +++ b/dlls/hhctrl.ocx/stream.c @@ -122,7 +122,7 @@ static BOOL find_node_end(stream_t *stream, strbuf_t *buf) if(buf->len == 0) break; p = &buf->buf[b]; - while((p = memchr(p+1, '"', buf->len-(p-buf->buf))) != NULL) + while((p = memchr(p+1, '"', buf->len-(p+1-buf->buf))) != NULL) tag_count++; b = buf->len; if(tag_count % 2 != 0)

1 0

Piotr Caban : msvcp70: Add basic_fstream(const char*, int) constructor implementation.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 6c4b075d1aeb8bdc9ab408580fa58dcb7a25f34b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4b075d1aeb8bdc9ab408580… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 7 10:28:27 2014 +0200 msvcp70: Add basic_fstream(const char*, int) constructor implementation. --- dlls/msvcp70/msvcp70.spec | 10 +++++----- dlls/msvcp90/ios.c | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 8ff6620..4f02785 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -40,15 +40,15 @@ @ cdecl -arch=win64 ??0?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEAU_iobuf@@@Z(ptr ptr) basic_filebuf_wchar_ctor_file @ thiscall -arch=win32 ??0?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)W4_Uninitialized@1@@Z(ptr long) basic_filebuf_wchar_ctor_uninitialized @ cdecl -arch=win64 ??0?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)W4_Uninitialized@1@@Z(ptr long) basic_filebuf_wchar_ctor_uninitialized -@ stub -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_fstream_char_ctor_name_noprot +@ cdecl -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_fstream_char_ctor_name_noprot @ thiscall -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_char_ctor @ cdecl -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_char_ctor -@ stub -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_fstream_short_ctor_name_noprot +@ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_fstream_short_ctor_name_noprot @ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_short_ctor @ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_short_ctor -@ stub -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDH@Z +@ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_fstream_wchar_ctor_name_noprot @ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_wchar_ctor @ stub -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z @ stub -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 98d1696..e8d4b06 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -11626,6 +11626,15 @@ basic_fstream_char* __thiscall basic_fstream_char_ctor_name(basic_fstream_char * return this; } +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_char_ctor_name_noprot, 16) +basic_fstream_char* __thiscall basic_fstream_char_ctor_name_noprot(basic_fstream_char *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_fstream_char_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + /* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBGHH@Z */ /* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBGHH@Z */ /* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PB_WHH@Z */ @@ -11881,6 +11890,23 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor_name(basic_fstream_wcha return this; } +/* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_wchar_ctor_name_noprot, 16) +basic_fstream_wchar* __thiscall basic_fstream_wchar_ctor_name_noprot(basic_fstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_fstream_wchar_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + +/* ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_short_ctor_name_noprot, 16) +basic_fstream_wchar* __thiscall basic_fstream_short_ctor_name_noprot(basic_fstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_fstream_short_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + /* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBGHH@Z */ /* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEBGHH@Z */ /* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PB_WHH@Z */

1 0

Stefan Dösinger : wined3d: Store RGBQUADs in palettes.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 1558391a110c24e0119dbe4b2a013d26fa808915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1558391a110c24e0119dbe4b2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 7 18:02:14 2014 +0200 wined3d: Store RGBQUADs in palettes. --- dlls/wined3d/palette.c | 38 +++++++++++++------- dlls/wined3d/surface.c | 77 +++++++++++----------------------------- dlls/wined3d/utils.c | 10 +++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 52 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1558391a110c24e0119db…

1 0

Bruno Jesus : ws2_32/tests: Test more the behavior of SO_REUSEADDR.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: eda14e611cce9e9c0f72b9a2f84f75885ed3262e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda14e611cce9e9c0f72b9a2f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue May 6 19:36:04 2014 -0300 ws2_32/tests: Test more the behavior of SO_REUSEADDR. --- dlls/ws2_32/tests/sock.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index dcedd99..1752d35 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1468,6 +1468,7 @@ static void test_so_reuseaddr(void) SOCKET s1,s2; unsigned int rc,reuse; int size; + DWORD err; saddr.sin_family = AF_INET; saddr.sin_port = htons(9375); @@ -1496,9 +1497,45 @@ static void test_so_reuseaddr(void) /* On Win2k3 and above, all SO_REUSEADDR seems to do is to allow binding to * a port immediately after closing another socket on that port, so * basically following the BSD socket semantics here. */ - closesocket(s1); rc = bind(s2, (struct sockaddr*)&saddr, sizeof(saddr)); - ok(rc==0, "bind() failed error: %d\n", WSAGetLastError()); + if(rc==0) + { + int s3=socket(AF_INET, SOCK_STREAM, 0), s4; + trace("<= Win XP behavior of SO_REUSEADDR\n"); + + /* If we could bind again in the same port this is Windows version <= XP. + * Lets test if we can really connect to one of them. */ + set_blocking(s1, FALSE); + set_blocking(s2, FALSE); + rc = listen(s1, 1); + ok(!rc, "listen() failed with error: %d\n", WSAGetLastError()); + rc = listen(s2, 1); + ok(!rc, "listen() failed with error: %d\n", WSAGetLastError()); + rc = connect(s3, (struct sockaddr*)&saddr, sizeof(saddr)); + ok(!rc, "connecting to accepting socket failed %d\n", WSAGetLastError()); + + /* the delivery of the connection is random so we need to try on both sockets */ + size = sizeof(saddr); + s4 = accept(s1, (struct sockaddr*)&saddr, &size); + if(s4 == INVALID_SOCKET) + s4 = accept(s2, (struct sockaddr*)&saddr, &size); + ok(s4 != INVALID_SOCKET, "none of the listening sockets could get the connection\n"); + + closesocket(s1); + closesocket(s3); + closesocket(s4); + } + else + { + trace(">= Win 2003 behavior of SO_REUSEADDR\n"); + err = WSAGetLastError(); +todo_wine + ok(err==WSAEACCES, "expected 10013, got %d\n", err); + + closesocket(s1); + rc = bind(s2, (struct sockaddr*)&saddr, sizeof(saddr)); + ok(rc==0, "bind() failed error: %d\n", WSAGetLastError()); + } closesocket(s2); }

1 0

Alex Henrie : gdi32: Simplify family_matches and face_matches.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: d2dce849b50bc8a312696ddf43909606ebdbdc35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2dce849b50bc8a312696ddf4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 6 14:42:41 2014 -0600 gdi32: Simplify family_matches and face_matches. --- dlls/gdi32/freetype.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cece358..54241a5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5709,25 +5709,25 @@ static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEX free_font(font); } -static BOOL family_matches(Family *family, const LOGFONTW *lf) +static BOOL family_matches(Family *family, const WCHAR *face_name) { Face *face; const struct list *face_list; - if (!strcmpiW(lf->lfFaceName, family->FamilyName)) return TRUE; + if (!strcmpiW(face_name, family->FamilyName)) return TRUE; face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) - if (face->FullName && !strcmpiW(lf->lfFaceName, face->FullName)) return TRUE; + if (face->FullName && !strcmpiW(face_name, face->FullName)) return TRUE; return FALSE; } -static BOOL face_matches(const WCHAR *family_name, Face *face, const LOGFONTW *lf) +static BOOL face_matches(const WCHAR *family_name, Face *face, const WCHAR *face_name) { - if (!strcmpiW(lf->lfFaceName, family_name)) return TRUE; + if (!strcmpiW(face_name, family_name)) return TRUE; - return (face->FullName && !strcmpiW(lf->lfFaceName, face->FullName)); + return (face->FullName && !strcmpiW(face_name, face->FullName)); } static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_charset_list *list, @@ -5805,22 +5805,20 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); if(plf->lfFaceName[0]) { - FontSubst *psub; - psub = get_font_subst(&font_subst_list, plf->lfFaceName, plf->lfCharSet); + WCHAR *face_name = plf->lfFaceName; + FontSubst *psub = get_font_subst(&font_subst_list, plf->lfFaceName, plf->lfCharSet); if(psub) { TRACE("substituting %s -> %s\n", debugstr_w(plf->lfFaceName), debugstr_w(psub->to.name)); - lf = *plf; - strcpyW(lf.lfFaceName, psub->to.name); - plf = &lf; + face_name = psub->to.name; } LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { - if (!family_matches(family, plf)) continue; + if (!family_matches(family, face_name)) continue; face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY( face, face_list, Face, entry ) { - if (!face_matches(family->FamilyName, face, plf)) continue; + if (!face_matches(family->FamilyName, face, face_name)) continue; if (!enum_face_charsets(family, face, &enum_charsets, proc, lparam)) return FALSE; } }

1 0

Henri Verbeet : gdi32: Use FIELD_OFFSET to calculate the structure size in GetRegionData().
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 9016d1eda0cec04606fd3996559dabcee6e493b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9016d1eda0cec04606fd39965… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 6 13:06:22 2014 +0200 gdi32: Use FIELD_OFFSET to calculate the structure size in GetRegionData(). --- dlls/gdi32/region.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 2632de5..93aa6a7 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -886,13 +886,13 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata) if(!obj) return 0; size = obj->numRects * sizeof(RECT); - if(count < (size + sizeof(RGNDATAHEADER)) || rgndata == NULL) + if (!rgndata || count < FIELD_OFFSET(RGNDATA, Buffer[size])) { GDI_ReleaseObj( hrgn ); if (rgndata) /* buffer is too small, signal it by return 0 */ return 0; - else /* user requested buffer size with rgndata NULL */ - return size + sizeof(RGNDATAHEADER); + /* user requested buffer size with rgndata NULL */ + return FIELD_OFFSET(RGNDATA, Buffer[size]); } rgndata->rdh.dwSize = sizeof(RGNDATAHEADER); @@ -907,7 +907,7 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata) memcpy( rgndata->Buffer, obj->rects, size ); GDI_ReleaseObj( hrgn ); - return size + sizeof(RGNDATAHEADER); + return FIELD_OFFSET(RGNDATA, Buffer[size]); }

1 0

Piotr Caban : msvcrt: Add __ExceptionPtr* functions implementation.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 868e009e795037e741d5565f2c4c49442de731a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=868e009e795037e741d5565f2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 6 16:24:53 2014 +0200 msvcrt: Add __ExceptionPtr* functions implementation. --- dlls/msvcr100/msvcr100.spec | 20 ++-- dlls/msvcr110/msvcr110.spec | 20 ++-- dlls/msvcrt/cpp.c | 220 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 240 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=868e009e795037e741d55…

1 0

Hans Leidekker : wininet: Add support for retrieving the proxy automatic configuration URL on Mac OS X.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 89d40b3de103e1cf785e4606f000f8f85957073e URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d40b3de103e1cf785e4606f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 6 11:33:18 2014 +0200 wininet: Add support for retrieving the proxy automatic configuration URL on Mac OS X. --- dlls/wininet/Makefile.in | 2 +- dlls/wininet/internet.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index f7b8e89..357b924 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -3,7 +3,7 @@ MODULE = wininet.dll IMPORTLIB = wininet IMPORTS = mpr shlwapi shell32 user32 advapi32 DELAYIMPORTS = secur32 crypt32 cryptui -EXTRALIBS = $(SOCKET_LIBS) $(Z_LIBS) +EXTRALIBS = $(CORESERVICES_LIBS) $(SOCKET_LIBS) $(Z_LIBS) C_SRCS = \ cookie.c \ diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 30e8f60..8ea2803 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -56,6 +56,15 @@ #endif #include <assert.h> +#ifdef HAVE_CORESERVICES_CORESERVICES_H +#define GetCurrentThread MacGetCurrentThread +#define LoadResource MacLoadResource +#include <CoreServices/CoreServices.h> +#undef GetCurrentThread +#undef LoadResource +#undef DPRINTF +#endif + #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -2389,6 +2398,33 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, return res == ERROR_SUCCESS; } +static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen ) +{ +#ifdef HAVE_CORESERVICES_CORESERVICES_H + CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); + const void *ref; + BOOL ret = FALSE; + + if (!settings) return FALSE; + + if (!(ref = CFDictionaryGetValue( settings, kCFNetworkProxiesProxyAutoConfigURLString ))) + { + CFRelease( settings ); + return FALSE; + } + if (CFStringGetCString( ref, buf, buflen, kCFStringEncodingASCII )) + { + TRACE( "returning %s\n", debugstr_a(buf) ); + ret = TRUE; + } + CFRelease( settings ); + return ret; +#else + FIXME( "no support on this platform\n" ); + return FALSE; +#endif +} + static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL unicode) { /* FIXME: This function currently handles more options than it should. Options requiring @@ -2472,16 +2508,20 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u } case INTERNET_OPTION_PER_CONNECTION_OPTION: { + char url[INTERNET_MAX_URL_LENGTH + 1]; INTERNET_PER_CONN_OPTION_LISTW *con = buffer; INTERNET_PER_CONN_OPTION_LISTA *conA = buffer; DWORD res = ERROR_SUCCESS, i; proxyinfo_t pi; + BOOL have_url; LONG ret; TRACE("Getting global proxy info\n"); if((ret = INTERNET_LoadProxySettings(&pi))) return ret; + have_url = get_proxy_autoconfig_url(url, sizeof(url)); + FIXME("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n"); if (*size < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) { @@ -2499,6 +2539,9 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u optionW->Value.dwValue = PROXY_TYPE_PROXY; else optionW->Value.dwValue = PROXY_TYPE_DIRECT; + if (have_url) + /* native includes PROXY_TYPE_DIRECT even if PROXY_TYPE_PROXY is set */ + optionW->Value.dwValue |= PROXY_TYPE_DIRECT|PROXY_TYPE_AUTO_PROXY_URL; break; case INTERNET_PER_CONN_PROXY_SERVER: @@ -2516,7 +2559,18 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u break; case INTERNET_PER_CONN_AUTOCONFIG_URL: + if (!have_url) + optionW->Value.pszValue = NULL; + else if (unicode) + optionW->Value.pszValue = heap_strdupAtoW(url); + else + optionA->Value.pszValue = heap_strdupA(url); + break; + case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: + optionW->Value.dwValue = AUTO_PROXY_FLAG_ALWAYS_DETECT; + break; + case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME:

1 0

Ken Thomases : winex11: Consolidate duplicate code from glxdrv_wglSetPixelFormat() and X11DRV_wglSetPixelFormatWINE().
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 351fae120690a19530f0c399f0a8956aa877b16d URL: http://source.winehq.org/git/wine.git/?a=commit;h=351fae120690a19530f0c399f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 6 03:44:01 2014 -0500 winex11: Consolidate duplicate code from glxdrv_wglSetPixelFormat() and X11DRV_wglSetPixelFormatWINE(). --- dlls/winex11.drv/opengl.c | 141 ++++++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 79 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 0077ac3..71af3db 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1407,6 +1407,66 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) return TRUE; } + +static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change) +{ + const struct wgl_pixel_format *fmt; + int value; + HWND hwnd = WindowFromDC( hdc ); + + TRACE("(%p,%d)\n", hdc, format); + + if (!hwnd || hwnd == GetDesktopWindow()) + { + WARN( "not a valid window DC %p/%p\n", hdc, hwnd ); + return FALSE; + } + + fmt = get_pixel_format(gdi_display, format, FALSE /* Offscreen */); + if (!fmt) + { + ERR( "Invalid format %d\n", format ); + return FALSE; + } + + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); + if (!(value & GLX_WINDOW_BIT)) + { + WARN( "Pixel format %d is not compatible for window rendering\n", format ); + return FALSE; + } + + if (!allow_change) + { + struct gl_drawable *gl; + if ((gl = get_gl_drawable( hwnd, hdc ))) + { + int prev = pixel_format_index( gl->format ); + release_gl_drawable( gl ); + return prev == format; /* cannot change it if already set */ + } + } + + if (TRACE_ON(wgl)) { + int gl_test = 0; + + gl_test = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_FBCONFIG_ID, &value); + if (gl_test) { + ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); + } else { + TRACE(" FBConfig have :\n"); + TRACE(" - FBCONFIG_ID 0x%x\n", value); + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_VISUAL_ID, &value); + TRACE(" - VISUAL_ID 0x%x\n", value); + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); + TRACE(" - DRAWABLE_TYPE 0x%x\n", value); + } + } + + return set_win_format( hwnd, fmt ); +} + + /*********************************************************************** * sync_gl_drawable */ @@ -1686,57 +1746,7 @@ static int glxdrv_wglGetPixelFormat( HDC hdc ) */ static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd ) { - const struct wgl_pixel_format *fmt; - int value; - struct gl_drawable *gl; - HWND hwnd = WindowFromDC( hdc ); - - TRACE("(%p,%d,%p)\n", hdc, iPixelFormat, ppfd); - - if (!hwnd || hwnd == GetDesktopWindow()) - { - WARN( "not a proper window DC %p/%p\n", hdc, hwnd ); - return FALSE; - } - - /* Check if iPixelFormat is in our list of supported formats to see if it is supported. */ - fmt = get_pixel_format(gdi_display, iPixelFormat, FALSE /* Offscreen */); - if(!fmt) { - ERR("Invalid iPixelFormat: %d\n", iPixelFormat); - return FALSE; - } - - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); - if (!(value & GLX_WINDOW_BIT)) - { - WARN("Pixel format %d is not compatible for window rendering\n", iPixelFormat); - return FALSE; - } - - if ((gl = get_gl_drawable( hwnd, hdc ))) - { - int prev = pixel_format_index( gl->format ); - release_gl_drawable( gl ); - return prev == iPixelFormat; /* cannot change it if already set */ - } - - if (TRACE_ON(wgl)) { - int gl_test = 0; - - gl_test = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_FBCONFIG_ID, &value); - if (gl_test) { - ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); - } else { - TRACE(" FBConfig have :\n"); - TRACE(" - FBCONFIG_ID 0x%x\n", value); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_VISUAL_ID, &value); - TRACE(" - VISUAL_ID 0x%x\n", value); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); - TRACE(" - DRAWABLE_TYPE 0x%x\n", value); - } - } - - return set_win_format( hwnd, fmt ); + return set_pixel_format(hdc, iPixelFormat, FALSE); } /*********************************************************************** @@ -3019,34 +3029,7 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) */ static BOOL X11DRV_wglSetPixelFormatWINE(HDC hdc, int format) { - const struct wgl_pixel_format *fmt; - int value; - HWND hwnd; - - TRACE("(%p,%d)\n", hdc, format); - - fmt = get_pixel_format(gdi_display, format, FALSE /* Offscreen */); - if (!fmt) - { - ERR( "Invalid format %d\n", format ); - return FALSE; - } - - hwnd = WindowFromDC( hdc ); - if (!hwnd || hwnd == GetDesktopWindow()) - { - ERR( "not a valid window DC %p\n", hdc ); - return FALSE; - } - - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); - if (!(value & GLX_WINDOW_BIT)) - { - WARN( "Pixel format %d is not compatible for window rendering\n", format ); - return FALSE; - } - - return set_win_format( hwnd, fmt ); + return set_pixel_format(hdc, format, TRUE); } /**

1 0

Huw Davies : usp10/tests: Mark two failing Hebrew strings as broken under win8.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: ee14105afd87256b180b3f225ce90d5f9597cd5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee14105afd87256b180b3f225… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 6 14:59:22 2014 +0100 usp10/tests: Mark two failing Hebrew strings as broken under win8. The strings are tagged as Hebrew, yet the RTL and bidi levels are not correctly set. --- dlls/usp10/tests/usp10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index a7fbc73..dea378a 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -243,12 +243,12 @@ static void test_ScriptItemize( void ) /* Hebrew */ static const WCHAR test6[] = {0x05e9, 0x05dc, 0x05d5, 0x05dd, '.',0}; - static const itemTest t61[3] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},4,0,0,0,0,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; + static const itemTest t61[3] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,TRUE,{-1,0,0,0,-1}},{{0,0,0,0,0},4,0,0,0,0,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; static const itemTest t62[3] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},4,1,1,1,0,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; static const itemTest t63[2] = {{{0,0,0,0,0},0,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; static const int b63[2] = {2,2}; static const WCHAR test7[] = {'p','a','r','t',' ','o','n','e',' ',0x05d7, 0x05dc, 0x05e7, ' ', 0x05e9, 0x05ea, 0x05d9, 0x05d9, 0x05dd, ' ','p','a','r','t',' ','t','h','r','e','e', 0}; - static const itemTest t71[4] = {{{0,0,0,0,0},0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},9,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},19,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},29,0,0,0,-1,FALSE}}; + static const itemTest t71[4] = {{{0,0,0,0,0},0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},9,1,1,1,hebr_tag,TRUE,{-1,0,0,0,-1}},{{0,0,0,0,0},19,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},29,0,0,0,-1,FALSE}}; static const itemTest t72[4] = {{{0,0,0,0,0},0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},9,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},18,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},29,0,0,0,-1,FALSE}}; static const itemTest t73[4] = {{{0,0,0,0,0},0,0,0,2,latn_tag,FALSE},{{0,0,0,0,0},8,1,1,1,hebr_tag,FALSE},{{0,0,0,0,0},19,0,0,2,latn_tag,FALSE},{{0,0,0,0,0},29,0,0,0,-1,FALSE}}; static const WCHAR test8[] = {0x0633, 0x0644, 0x0627, 0x0645,0};

1 0

Nikolay Sivov : setupapi: Implement a binary compatible string table.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 8802f84c8cc473d5617c134c16973b1cb2c4b53e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8802f84c8cc473d5617c134c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 23:29:53 2014 +0400 setupapi: Implement a binary compatible string table. --- dlls/setupapi/stringtable.c | 781 ++++++++++++++++--------------------- dlls/setupapi/tests/stringtable.c | 152 +++++--- 2 files changed, 426 insertions(+), 507 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8802f84c8cc473d5617c1…

1 0

Damjan Jovanovic : winex11: Fix a WM_DROPFILES memory ownership ambiguity.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: f0a91c0248d8e584e1095dc2308657c6b7a51a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a91c0248d8e584e1095dc23… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 6 03:02:45 2014 +0200 winex11: Fix a WM_DROPFILES memory ownership ambiguity. --- dlls/winex11.drv/xdnd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 5d37495..dbe87e8 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -727,17 +727,20 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) if (found) { - DROPFILES *lpDrop = current->data; + HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, current->size); - if (lpDrop) + if (dropHandle) { + DROPFILES *lpDrop = GlobalLock(dropHandle); lpDrop->pt.x = XDNDxy.x; lpDrop->pt.y = XDNDxy.y; - + memcpy(lpDrop, current->data, current->size); TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd, ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); + GlobalUnlock(dropHandle); - PostMessageW(hwnd, WM_DROPFILES, (WPARAM)lpDrop, 0L); + if (!PostMessageW(hwnd, WM_DROPFILES, (WPARAM)dropHandle, 0)) + GlobalFree(dropHandle); } } @@ -761,6 +764,7 @@ static void X11DRV_XDND_FreeDragDropOp(void) LIST_FOR_EACH_ENTRY_SAFE(current, next, &xdndData, XDNDDATA, entry) { list_remove(&current->entry); + HeapFree(GetProcessHeap(), 0, current->data); HeapFree(GetProcessHeap(), 0, current); }

1 0

Huw Davies : wintrust/tests: Fix failing test on win8.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: a27a1214a2fba12069671bffd9854164737a7d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a27a1214a2fba12069671bffd… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 6 16:29:36 2014 +0100 wintrust/tests: Fix failing test on win8. --- dlls/wintrust/tests/crypt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 4d9061b..55f9ece 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -551,7 +551,9 @@ static void test_CryptCATAdminAddRemoveCatalog(void) hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, basenameW, 1); error = GetLastError(); ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", GetLastError()); + ok(error == ERROR_INVALID_PARAMETER || + error == ERROR_BAD_FORMAT, /* win 8 */ + "got %u\n", GetLastError()); SetLastError(0xdeadbeef); hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, NULL, 0);

1 0

Piotr Caban : msvcr80: Update exceptions RTTI data to reflect it' s part of std namespace.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 1be46548421aab77c7a9262081459ddc28fe5a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be46548421aab77c7a926208… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 6 16:24:49 2014 +0200 msvcr80: Update exceptions RTTI data to reflect it's part of std namespace. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/cpp.c | 16 ++++++++++++++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 72cf6f3..0cc8fcb 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -226,7 +226,7 @@ @ extern ??_7__non_rtti_object(a)std@@6B@ MSVCRT___non_rtti_object_vtable @ extern ??_7bad_cast(a)std@@6B@ MSVCRT_bad_cast_vtable @ extern ??_7bad_typeid(a)std@@6B@ MSVCRT_bad_typeid_vtable -@ extern ??_7exception@@6B@ MSVCRT_exception_vtable +@ extern ??_7exception@@6B@ MSVCRT_exception_old_vtable @ extern ??_7exception(a)std@@6B@ MSVCRT_exception_vtable @ stub -arch=win32 ??_F?$_SpinWait@$00(a)details@Concurrency@@QAEXXZ @ stub -arch=win64 ??_F?$_SpinWait@$00(a)details@Concurrency@@QEAAXXZ diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ef70cf1..13ea9f0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -54,7 +54,7 @@ @ extern ??_7__non_rtti_object(a)std@@6B@ MSVCRT___non_rtti_object_vtable @ extern ??_7bad_cast(a)std@@6B@ MSVCRT_bad_cast_vtable @ extern ??_7bad_typeid(a)std@@6B@ MSVCRT_bad_typeid_vtable -@ extern ??_7exception@@6B@ MSVCRT_exception_vtable +@ extern ??_7exception@@6B@ MSVCRT_exception_old_vtable @ extern ??_7exception(a)std@@6B@ MSVCRT_exception_vtable @ thiscall -arch=i386 ??_Fbad_cast(a)std@@QAEXXZ(ptr) MSVCRT_bad_cast_default_ctor @ cdecl -arch=win64 ??_Fbad_cast(a)std@@QEAAXXZ(ptr) MSVCRT_bad_cast_default_ctor diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 161d224..710cb15 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -54,7 +54,7 @@ @ extern ??_7__non_rtti_object(a)std@@6B@ MSVCRT___non_rtti_object_vtable @ extern ??_7bad_cast(a)std@@6B@ MSVCRT_bad_cast_vtable @ extern ??_7bad_typeid(a)std@@6B@ MSVCRT_bad_typeid_vtable -@ extern ??_7exception@@6B@ MSVCRT_exception_vtable +@ extern ??_7exception@@6B@ MSVCRT_exception_old_vtable @ extern ??_7exception(a)std@@6B@ MSVCRT_exception_vtable @ thiscall -arch=i386 ??_Fbad_cast(a)std@@QAEXXZ(ptr) MSVCRT_bad_cast_default_ctor @ cdecl -arch=win64 ??_Fbad_cast(a)std@@QEAAXXZ(ptr) MSVCRT_bad_cast_default_ctor diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index e392208..50c2681 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -658,6 +658,11 @@ __ASM_VTABLE(type_info, __ASM_VTABLE(exception, VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor) VTABLE_ADD_FUNC(MSVCRT_what_exception)); +#if _MSVCR_VER >= 80 +__ASM_VTABLE(exception_old, + VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor) + VTABLE_ADD_FUNC(MSVCRT_what_exception)); +#endif __ASM_VTABLE(bad_typeid, VTABLE_ADD_FUNC(MSVCRT_bad_typeid_vector_dtor) VTABLE_ADD_FUNC(MSVCRT_what_exception)); @@ -673,10 +678,18 @@ __ASM_VTABLE(__non_rtti_object, #endif DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) +#if _MSVCR_VER >= 80 +DEFINE_RTTI_DATA0( exception, 0, ".?AVexception(a)std@@" ) +DEFINE_RTTI_DATA0( exception_old, 0, ".?AVexception@@" ) +DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid(a)std@@" ) +DEFINE_RTTI_DATA1( bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast(a)std@@" ) +DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object(a)std@@" ) +#else DEFINE_RTTI_DATA0( exception, 0, ".?AVexception@@" ) DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid@@" ) DEFINE_RTTI_DATA1( bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast@@" ) DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object@@" ) +#endif DEFINE_EXCEPTION_TYPE_INFO( exception, 0, NULL, NULL ) DEFINE_EXCEPTION_TYPE_INFO( bad_typeid, 1, &exception_cxx_type_info, NULL ) @@ -688,6 +701,9 @@ void msvcrt_init_exception(void *base) #ifdef __x86_64__ init_type_info_rtti(base); init_exception_rtti(base); +#if _MSVCR_VER >= 80 + init_exception_old_rtti(base); +#endif init_bad_typeid_rtti(base); init_bad_cast_rtti(base); init___non_rtti_object_rtti(base);

1 0