wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Andrew Eikum : kernel32: Support extended pathnames in GetShortPathName.
by Alexandre Julliard 06 May '15

06 May '15

Module: wine Branch: master Commit: 65f2690203089d55339cd2feca6e09b35dbc574a URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f2690203089d55339cd2fec… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 5 13:17:17 2015 -0500 kernel32: Support extended pathnames in GetShortPathName. --- dlls/kernel32/path.c | 28 +++++++++++++++++++++++----- dlls/kernel32/tests/path.c | 25 ++++++++++++++++++++----- 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index c2833b1..179c8e0 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -440,7 +440,7 @@ DWORD WINAPI GetLongPathNameA( LPCSTR shortpath, LPSTR longpath, DWORD longlen ) */ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortlen ) { - WCHAR tmpshortpath[MAX_PATHNAME_LEN]; + WCHAR *tmpshortpath; LPCWSTR p; DWORD sp = 0, lp = 0; DWORD tmplen; @@ -460,12 +460,28 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl return 0; } + /* code below only removes characters from string, never adds, so this is + * the largest buffer that tmpshortpath will need to have */ + tmpshortpath = HeapAlloc(GetProcessHeap(), 0, (strlenW(longpath) + 1) * sizeof(WCHAR)); + if (!tmpshortpath) + { + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + + if (longpath[0] == '\\' && longpath[1] == '\\' && longpath[2] == '?' && longpath[3] == '\\') + { + memcpy(tmpshortpath, longpath, 4 * sizeof(WCHAR)); + sp = lp = 4; + } + /* check for drive letter */ - if (longpath[0] != '/' && longpath[1] == ':' ) + if (longpath[lp] != '/' && longpath[lp + 1] == ':' ) { - tmpshortpath[0] = longpath[0]; - tmpshortpath[1] = ':'; - sp = lp = 2; + tmpshortpath[sp] = longpath[lp]; + tmpshortpath[sp + 1] = ':'; + sp += 2; + lp += 2; } while (longpath[lp]) @@ -522,9 +538,11 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl tmplen--; /* length without 0 */ } + HeapFree(GetProcessHeap(), 0, tmpshortpath); return tmplen; notfound: + HeapFree(GetProcessHeap(), 0, tmpshortpath); TRACE("not found!\n" ); SetLastError ( ERROR_FILE_NOT_FOUND ); return 0; diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index cdb565a..de6d92a 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1343,29 +1343,44 @@ static void test_GetLongPathNameW(void) static void test_GetShortPathNameW(void) { - WCHAR test_path[] = { 'L', 'o', 'n', 'g', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', 'N', 'a', 'm', 'e', 0 }; - WCHAR path[MAX_PATH]; + static const WCHAR extended_prefix[] = {'\\','\\','?','\\',0}; + static const WCHAR test_path[] = { 'L', 'o', 'n', 'g', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', 'N', 'a', 'm', 'e', 0 }; + static const WCHAR name[] = { 't', 'e', 's', 't', 0 }; + static const WCHAR backSlash[] = { '\\', 0 }; + WCHAR path[MAX_PATH], tmppath[MAX_PATH]; WCHAR short_path[MAX_PATH]; DWORD length; HANDLE file; int ret; - WCHAR name[] = { 't', 'e', 's', 't', 0 }; - WCHAR backSlash[] = { '\\', 0 }; SetLastError(0xdeadbeef); - GetTempPathW( MAX_PATH, path ); + GetTempPathW( MAX_PATH, tmppath ); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetTempPathW is not implemented\n"); return; } + lstrcpyW( path, tmppath ); lstrcatW( path, test_path ); lstrcatW( path, backSlash ); ret = CreateDirectoryW( path, NULL ); ok( ret, "Directory was not created. LastError = %d\n", GetLastError() ); /* Starting a main part of test */ + + /* extended path \\?\C:\path\ */ + lstrcpyW( path, extended_prefix ); + lstrcatW( path, tmppath ); + lstrcatW( path, test_path ); + lstrcatW( path, backSlash ); + short_path[0] = 0; + length = GetShortPathNameW( path, short_path, sizeof(short_path) / sizeof(*short_path) ); + ok( length, "GetShortPathNameW returned 0.\n" ); + + lstrcpyW( path, tmppath ); + lstrcatW( path, test_path ); + lstrcatW( path, backSlash ); length = GetShortPathNameW( path, short_path, 0 ); ok( length, "GetShortPathNameW returned 0.\n" ); ret = GetShortPathNameW( path, short_path, length );

1 0

Sebastian Lackner : ws2_32: Properly handle closing sockets during a select call.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 0d2817b161e7c363c1fab523b6645002e980597a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d2817b161e7c363c1fab523b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 30 05:43:26 2015 +0200 ws2_32: Properly handle closing sockets during a select call. Based on a patch by Bruno Jesus. --- dlls/ws2_32/socket.c | 13 ++++++++++++- dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ef43186..10bfd9d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4773,7 +4773,18 @@ static void release_poll_fds( const WS_fd_set *readfds, const WS_fd_set *writefd if (exceptfds) { for (i = 0; i < exceptfds->fd_count; i++, j++) - if (fds[j].fd != -1) release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); + { + if (fds[j].fd == -1) continue; + release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); + if (fds[j].revents & POLLHUP) + { + int fd = get_sock_fd( exceptfds->fd_array[i], 0, NULL ); + if (fd != -1) + release_sock_fd( exceptfds->fd_array[i], fd ); + else + fds[j].revents = 0; + } + } } } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f31539f..d67a47d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3834,7 +3834,6 @@ todo_wine FD_ZERO_ALL(); FD_SET_ALL(fdWrite); ret = select(0, &readfds, NULL, &exceptfds, &select_timeout); -todo_wine ok(ret == 1, "expected 1, got %d\n", ret); ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); WaitForSingleObject (thread_handle, 1000);

1 0

Sebastian Lackner : wbemprox/tests: Fix memory leak when tests are skipped.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: a248418325bb4a4405a8a3c357052e7f5991af5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a248418325bb4a4405a8a3c35… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 17 07:58:06 2015 +0200 wbemprox/tests: Fix memory leak when tests are skipped. --- dlls/wbemprox/tests/query.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 8fd027e..56c97ff 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -158,7 +158,7 @@ static void test_Win32_Service( IWbemServices *services ) if (hr != S_OK) { win_skip( "Win32_Service not available\n" ); - return; + goto out; } type = 0xdeadbeef; VariantInit( &state ); @@ -232,6 +232,7 @@ static void test_Win32_Service( IWbemServices *services ) ok( hr == S_OK, "got %08x\n", hr ); if (service) IWbemClassObject_Release( service ); +out: SysFreeString( empty ); SysFreeString( class ); } @@ -373,14 +374,14 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) if (!compname[0] || !username[0]) { skip( "Failed to get user or computer name\n" ); - return; + goto out; } hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); if (hr != S_OK) { win_skip( "Win32_ComputerSystem not available\n" ); - return; + goto out; } hr = IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); @@ -406,6 +407,7 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) IWbemClassObject_Release( service ); IEnumWbemClassObject_Release( result ); +out: SysFreeString( query ); SysFreeString( wql ); }

1 0

Sebastian Lackner : wbemprox/tests: Actually test the return value of IEnumWbemClassObject_Next.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: a5414e8bed17fca54b25d14f291fd20b31513787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5414e8bed17fca54b25d14f2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 17 06:49:55 2015 +0200 wbemprox/tests: Actually test the return value of IEnumWbemClassObject_Next. --- dlls/wbemprox/tests/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index eb3bd58..8fd027e 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -383,7 +383,7 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) return; } - IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); + hr = IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); ok( hr == S_OK, "got %08x\n", hr ); type = 0xdeadbeef;

1 0

Sebastian Lackner : ntdll: Return failure in NtProtectVirtualMemory when last argument is omitted.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: ee6a477cab209aa34787d4711123993eed380d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6a477cab209aa34787d4711… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:46:38 2015 +0200 ntdll: Return failure in NtProtectVirtualMemory when last argument is omitted. --- dlls/kernel32/tests/virtual.c | 5 ----- dlls/ntdll/virtual.c | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 2dea156..4f50df8 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2492,27 +2492,22 @@ static void test_VirtualProtect(void) SetLastError(0xdeadbeef); ret = VirtualProtect(base, si.dwPageSize, PAGE_READONLY, NULL); - todo_wine ok(!ret, "VirtualProtect should fail\n"); - todo_wine ok(GetLastError() == ERROR_NOACCESS, "expected ERROR_NOACCESS, got %d\n", GetLastError()); old_prot = 0xdeadbeef; ret = VirtualProtect(base, si.dwPageSize, PAGE_NOACCESS, &old_prot); ok(ret, "VirtualProtect failed %d\n", GetLastError()); - todo_wine ok(old_prot == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", old_prot); addr = base; size = si.dwPageSize; status = pNtProtectVirtualMemory(GetCurrentProcess(), &addr, &size, PAGE_READONLY, NULL); - todo_wine ok(status == STATUS_ACCESS_VIOLATION, "NtProtectVirtualMemory should fail, got %08x\n", status); addr = base; size = si.dwPageSize; old_prot = 0xdeadbeef; status = pNtProtectVirtualMemory(GetCurrentProcess(), &addr, &size, PAGE_NOACCESS, &old_prot); ok(status == STATUS_SUCCESS, "NtProtectVirtualMemory should succeed, got %08x\n", status); - todo_wine ok(old_prot == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", old_prot); for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9d29c33..0629816 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2164,6 +2164,9 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T TRACE("%p %p %08lx %08x\n", process, addr, size, new_prot ); + if (!old_prot) + return STATUS_ACCESS_VIOLATION; + if (process != NtCurrentProcess()) { apc_call_t call;

1 0

Nikolay Sivov : dwrite: Initial implementation of Draw().
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 38775875c7f165fae0f1daab54df281adbfe402b URL: http://source.winehq.org/git/wine.git/?a=commit;h=38775875c7f165fae0f1daab5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 5 15:23:17 2015 +0300 dwrite: Initial implementation of Draw(). --- dlls/dwrite/layout.c | 289 +++++++++++++++++++++++++++++++++++++++++---- dlls/dwrite/tests/layout.c | 1 - 2 files changed, 269 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38775875c7f165fae0f1d…

1 0

Nikolay Sivov : oleacc: Added proxies for oleacc.idl.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 40a311c8212edd979d563f7a74eeb4a3196b6d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=40a311c8212edd979d563f7a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 5 12:17:44 2015 +0300 oleacc: Added proxies for oleacc.idl. --- dlls/oleacc/Makefile.in | 4 +++- dlls/oleacc/main.c | 30 +++++++++++++++++++++++++----- dlls/oleacc/oleacc_classes.idl | 8 ++++++++ dlls/oleacc/oleacc_private.h | 3 ++- dlls/oleacc/propservice.c | 11 ++--------- 5 files changed, 40 insertions(+), 16 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index fda1b75..331229f 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -1,6 +1,6 @@ MODULE = oleacc.dll IMPORTLIB = oleacc -IMPORTS = uuid oleaut32 ole32 user32 +IMPORTS = uuid oleaut32 ole32 user32 rpcrt4 C_SRCS = \ client.c \ @@ -11,3 +11,5 @@ C_SRCS = \ IDL_SRCS = oleacc_classes.idl RC_SRCS = oleacc.rc + +dlldata_EXTRADEFS = -DENTRY_PREFIX=OLEACC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 4d9c55e..3cfe7c1 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -49,6 +49,11 @@ static const WCHAR richedit20wW[] = {'R','i','c','h','E','d','i','t','2','0','W' typedef HRESULT (WINAPI *accessible_create)(HWND, const IID*, void**); +extern HRESULT WINAPI OLEACC_DllGetClassObject(REFCLSID, REFIID, void**) DECLSPEC_HIDDEN; +extern BOOL WINAPI OLEACC_DllMain(HINSTANCE, DWORD, void*) DECLSPEC_HIDDEN; +extern HRESULT WINAPI OLEACC_DllRegisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT WINAPI OLEACC_DllUnregisterServer(void) DECLSPEC_HIDDEN; + static struct { const WCHAR *name; DWORD idx; @@ -406,19 +411,34 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, DisableThreadLibraryCalls(hinstDLL); break; } - return TRUE; + + return OLEACC_DllMain(hinstDLL, fdwReason, lpvReserved); } HRESULT WINAPI DllRegisterServer(void) { - TRACE("()\n"); - return __wine_register_resources(oleacc_handle); + return OLEACC_DllRegisterServer(); } HRESULT WINAPI DllUnregisterServer(void) { - TRACE("()\n"); - return __wine_unregister_resources(oleacc_handle); + return OLEACC_DllUnregisterServer(); +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, void **ppv) +{ + if(IsEqualGUID(&CLSID_CAccPropServices, rclsid)) { + TRACE("(CLSID_CAccPropServices %s %p)\n", debugstr_guid(iid), ppv); + return get_accpropservices_factory(iid, ppv); + } + + if(IsEqualGUID(&CLSID_PSFactoryBuffer, rclsid)) { + TRACE("(CLSID_PSFactoryBuffer %s %p)\n", debugstr_guid(iid), ppv); + return OLEACC_DllGetClassObject(rclsid, iid, ppv); + } + + FIXME("%s %s %p: stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + return E_NOTIMPL; } void WINAPI GetOleaccVersionInfo(DWORD* pVersion, DWORD* pBuild) diff --git a/dlls/oleacc/oleacc_classes.idl b/dlls/oleacc/oleacc_classes.idl index 44b0693..15eda9c 100644 --- a/dlls/oleacc/oleacc_classes.idl +++ b/dlls/oleacc/oleacc_classes.idl @@ -17,5 +17,13 @@ */ #pragma makedep regtypelib +#pragma makedep proxy +#pragma makedep register #include "oleacc.idl" + +[ + threading(both), + uuid(03022430-abc4-11d0-bde2-00aa001a1953) /* IAccessibleHandler */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h index 1bbb9f6..06e3ba6 100644 --- a/dlls/oleacc/oleacc_private.h +++ b/dlls/oleacc/oleacc_private.h @@ -16,10 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <oleacc.h> +#include "oleacc_classes.h" HRESULT create_client_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; HRESULT create_window_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; +HRESULT get_accpropservices_factory(REFIID, void**) DECLSPEC_HIDDEN; int convert_child_id(VARIANT *v) DECLSPEC_HIDDEN; diff --git a/dlls/oleacc/propservice.c b/dlls/oleacc/propservice.c index f27a8da..3ed1818 100644 --- a/dlls/oleacc/propservice.c +++ b/dlls/oleacc/propservice.c @@ -20,7 +20,6 @@ #include <stdarg.h> -#include "oleacc.h" #include "oleacc_private.h" #include "wine/debug.h" @@ -245,13 +244,7 @@ static const IClassFactoryVtbl CAccPropServicesFactoryVtbl = { static IClassFactory CAccPropServicesFactory = { &CAccPropServicesFactoryVtbl }; -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, void **ppv) +HRESULT get_accpropservices_factory(REFIID riid, void **ppv) { - if(IsEqualGUID(&CLSID_CAccPropServices, rclsid)) { - TRACE("(CLSID_CAccPropServices %s %p)\n", debugstr_guid(iid), ppv); - return IClassFactory_QueryInterface(&CAccPropServicesFactory, iid, ppv); - } - - FIXME("%s %s %p: stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); - return E_NOTIMPL; + return IClassFactory_QueryInterface(&CAccPropServicesFactory, riid, ppv); }

1 0

Nikolay Sivov : atl100/tests: Fixed some leaks (Valgrind).
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 7839aa22c3398a0efd0fd69461f3dfbef94f3908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7839aa22c3398a0efd0fd6946… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 5 10:34:19 2015 +0300 atl100/tests: Fixed some leaks (Valgrind). --- dlls/atl100/tests/atl.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index f6cc85b..d07a523 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -916,6 +916,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); container = NULL; @@ -926,6 +928,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); container = NULL; @@ -936,6 +940,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); container = NULL; @@ -946,6 +952,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); container = (IUnknown *)0xdeadbeef; @@ -976,6 +984,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); /* test file:// scheme */ @@ -989,6 +999,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); /* test file:// scheme on non-existent file. */ @@ -1002,6 +1014,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); }

1 0

Matteo Bruni : wined3d: Fix the TIMESTAMP_DISJOINT query.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 4b35cf730f12f993176be85aa9aabf9b532aed6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b35cf730f12f993176be85aa… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 4 23:16:15 2015 +0200 wined3d: Fix the TIMESTAMP_DISJOINT query. Spotted by Patrick Rudolph. --- dlls/wined3d/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 0ec578d..9e6f21a 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -650,7 +650,7 @@ static HRESULT wined3d_timestamp_disjoint_query_ops_get_data(struct wined3d_quer if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT) { - static const struct wined3d_query_data_timestamp_disjoint disjoint_data = {FALSE, 1000 * 1000 * 1000}; + static const struct wined3d_query_data_timestamp_disjoint disjoint_data = {1000 * 1000 * 1000, FALSE}; if (query->state == QUERY_BUILDING) {

1 0

Matteo Bruni : ddraw/tests: Add a ddraw2 specular lighting test.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 0cc7daebd84cc8cad79b4dd16a829cb5a3457418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc7daebd84cc8cad79b4dd16… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 4 23:16:14 2015 +0200 ddraw/tests: Add a ddraw2 specular lighting test. --- dlls/ddraw/tests/ddraw2.c | 284 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 283 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0cc7daebd84cc8cad79b4…

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2015