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

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

09 May '14

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

1 0

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

09 May '14

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

1 0

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

09 May '14

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

1 0

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

09 May '14

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

1 0

Huw Davies : imagehlp/tests: Don' t assume the certificate chain is originally empty.
by Alexandre Julliard 09 May '14

09 May '14

Module: wine Branch: master Commit: 38483f1efe5850131455754e3d08a9ccf06a0065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38483f1efe5850131455754e3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 9 11:12:24 2014 +0100 imagehlp/tests: Don't assume the certificate chain is originally empty. --- dlls/imagehlp/tests/integrity.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index eb1eb58..3fa359f 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -135,7 +135,7 @@ static DWORD get_file_size(void) return filesize; } -static void test_add_certificate(const char *cert_data, int len) +static DWORD test_add_certificate(const char *cert_data, int len) { HANDLE hFile; LPWIN_CERTIFICATE cert; @@ -148,7 +148,7 @@ static void test_add_certificate(const char *cert_data, int len) if (hFile == INVALID_HANDLE_VALUE) { skip("Unable to open %s, skipping test\n", test_dll_path); - return; + return ~0; } cert_len = sizeof(WIN_CERTIFICATE) + len; @@ -158,7 +158,7 @@ static void test_add_certificate(const char *cert_data, int len) { skip("Unable to allocate memory, skipping test\n"); CloseHandle(hFile); - return; + return ~0; } cert->dwLength = cert_len; @@ -168,9 +168,11 @@ static void test_add_certificate(const char *cert_data, int len) ret = pImageAddCertificate(hFile, cert, &index); ok(ret, "Unable to add certificate to image, error %x\n", GetLastError()); + trace("added cert index %d\n", index); HeapFree(GetProcessHeap(), 0, cert); CloseHandle(hFile); + return index; } static void test_get_certificate(const char *cert_data, int index) @@ -239,7 +241,7 @@ static void test_remove_certificate(int index) START_TEST(integrity) { - DWORD file_size, file_size_orig; + DWORD file_size, file_size_orig, first, second; hImageHlp = LoadLibraryA("imagehlp.dll"); @@ -272,25 +274,27 @@ START_TEST(integrity) pImageGetCertificateHeader = (void *) GetProcAddress(hImageHlp, "ImageGetCertificateHeader"); pImageRemoveCertificate = (void *) GetProcAddress(hImageHlp, "ImageRemoveCertificate"); - test_add_certificate(test_cert_data, sizeof(test_cert_data)); - test_get_certificate(test_cert_data, 0); - test_remove_certificate(0); + first = test_add_certificate(test_cert_data, sizeof(test_cert_data)); + test_get_certificate(test_cert_data, first); + test_remove_certificate(first); file_size = get_file_size(); ok(file_size == file_size_orig, "File size different after add and remove (old: %d; new: %d)\n", file_size_orig, file_size); /* Try adding multiple certificates */ - test_add_certificate(test_cert_data, sizeof(test_cert_data)); - test_add_certificate(test_cert_data_2, sizeof(test_cert_data_2)); + first = test_add_certificate(test_cert_data, sizeof(test_cert_data)); + second = test_add_certificate(test_cert_data_2, sizeof(test_cert_data_2)); + ok(second == first + 1, "got %d %d\n", first, second); - test_get_certificate(test_cert_data, 0); - test_get_certificate(test_cert_data_2, 1); + test_get_certificate(test_cert_data, first); + test_get_certificate(test_cert_data_2, second); /* Remove the first one and verify the second certificate is intact */ - test_remove_certificate(0); - test_get_certificate(test_cert_data_2, 0); + test_remove_certificate(first); + second--; + test_get_certificate(test_cert_data_2, second); - test_remove_certificate(0); + test_remove_certificate(second); file_size = get_file_size(); ok(file_size == file_size_orig, "File size different after add and remove (old: %d; new: %d)\n", file_size_orig, file_size);

1 0

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

08 May '14

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

1 0

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

08 May '14

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

1 0

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

08 May '14

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

Bruno Jesus : ws2_32: Avoid using WS_ prefix on unix sockaddr struct.
by Alexandre Julliard 08 May '14

08 May '14

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

Shuai Meng : vbscript: Fixed CBool handling.
by Alexandre Julliard 08 May '14

08 May '14

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