November 2014 - Wine-Commits

Jonas Maebe : wined3d: Add NVIDIA Geforce GT 750M to supported device list.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 3a7bf90f6633ebd297ab427ea124b38cd5bbc9d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7bf90f6633ebd297ab427ea… Author: Jonas Maebe <jonas.maebe(a)elis.ugent.be> Date: Thu Nov 13 22:47:32 2014 +0100 wined3d: Add NVIDIA Geforce GT 750M to supported device list. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5327949..abb25a1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1284,6 +1284,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT750M, "NVIDIA GeForce GT 750M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750, "NVIDIA GeForce GTX 750", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750TI, "NVIDIA GeForce GTX 750 Ti", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX760, "NVIDIA Geforce GTX 760", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1727,6 +1728,7 @@ cards_nvidia_binary[] = {"GTX 760", CARD_NVIDIA_GEFORCE_GTX760}, /* Geforce 700 - midend high */ {"GTX 750 Ti", CARD_NVIDIA_GEFORCE_GTX750TI}, /* Geforce 700 - midend */ {"GTX 750", CARD_NVIDIA_GEFORCE_GTX750}, /* Geforce 700 - midend */ + {"GT 750M", CARD_NVIDIA_GEFORCE_GT750M}, /* Geforce 700 - midend mobile */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0f302c4..4210d26 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1514,6 +1514,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GT750M = 0x0fe9, CARD_NVIDIA_GEFORCE_GTX750 = 0x1381, CARD_NVIDIA_GEFORCE_GTX750TI = 0x1380, CARD_NVIDIA_GEFORCE_GTX760 = 0x1187,

1 0

Alexandre Julliard : Release 1.7.31.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 6d6dd3c42b96bb813d5366b97fbff80441e75918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6dd3c42b96bb813d5366b97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 14 22:28:17 2014 +0900 Release 1.7.31. --- ANNOUNCE | 567 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 318 insertions(+), 271 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d6dd3c42b96bb813d536…

1 0

Michael Stefaniuc : fusion/tests: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 159192cdb477eec88e8fffab09ffe06d1dcdda18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=159192cdb477eec88e8fffab0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 14 11:05:00 2014 +0100 fusion/tests: Simplify the check for an empty string (PVS-Studio). --- dlls/fusion/tests/asmname.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index ac5b27b..a075288 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -425,7 +425,7 @@ static void test_CreateAssemblyNameObject(void) str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(lstrlenW(str) == 0, "Expected empty name\n"); + ok(!str[0], "Expected empty name\n"); ok(size == 0, "Expected 0, got %d\n", size); hi = 0xbeefcace; @@ -461,7 +461,7 @@ static void test_CreateAssemblyNameObject(void) str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(lstrlenW(str) == 0, "Expected empty name\n"); + ok(!str[0], "Expected empty name\n"); ok(size == 1, "Expected 1, got %d\n", size); hi = 0xbeefcace;

1 0

Michael Stefaniuc : appwiz.cpl: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: bbff30f30e44fafbad4ebbac62d1d420c4fde8dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbff30f30e44fafbad4ebbac6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 14 10:51:38 2014 +0100 appwiz.cpl: Simplify the check for an empty string (PVS-Studio). --- dlls/appwiz.cpl/appwiz.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index cd76f51..9d53e79 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -567,7 +567,7 @@ static void SetInfoDialogText(HKEY hKey, LPCWSTR lpKeyName, LPCWSTR lpAltMessage /* if hKey is null, lpKeyName contains the string we want to check */ if (hKey == NULL) { - if ((lpKeyName) && (lstrlenW(lpKeyName) > 0)) + if (lpKeyName && lpKeyName[0]) SetWindowTextW(hWndDlgItem, lpKeyName); else SetWindowTextW(hWndDlgItem, lpAltMessage); @@ -577,7 +577,7 @@ static void SetInfoDialogText(HKEY hKey, LPCWSTR lpKeyName, LPCWSTR lpAltMessage buflen = MAX_STRING_LEN; if ((RegQueryValueExW(hKey, lpKeyName, 0, 0, (LPBYTE) buf, &buflen) == - ERROR_SUCCESS) && (lstrlenW(buf) > 0)) + ERROR_SUCCESS) && buf[0]) SetWindowTextW(hWndDlgItem, buf); else SetWindowTextW(hWndDlgItem, lpAltMessage);

1 0

Sebastian Lackner : psapi/tests: Add tests for GetPerformanceInfo function.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 4297046d013c9e941221d850728fefd285108181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4297046d013c9e941221d8507… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Nov 14 06:47:13 2014 +0100 psapi/tests: Add tests for GetPerformanceInfo function. --- dlls/psapi/tests/psapi_main.c | 137 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 1 deletion(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 62d4f5c..7220da9 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -53,14 +53,16 @@ static DWORD (WINAPI *pGetModuleFileNameExW)(HANDLE, HMODULE, LPWSTR, DWORD); static BOOL (WINAPI *pGetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD); static DWORD (WINAPI *pGetMappedFileNameA)(HANDLE, LPVOID, LPSTR, DWORD); static DWORD (WINAPI *pGetMappedFileNameW)(HANDLE, LPVOID, LPWSTR, DWORD); +static BOOL (WINAPI *pGetPerformanceInfo)(PPERFORMANCE_INFORMATION, DWORD); static DWORD (WINAPI *pGetProcessImageFileNameA)(HANDLE, LPSTR, DWORD); static DWORD (WINAPI *pGetProcessImageFileNameW)(HANDLE, LPWSTR, DWORD); static BOOL (WINAPI *pGetProcessMemoryInfo)(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD); static BOOL (WINAPI *pGetWsChanges)(HANDLE, PPSAPI_WS_WATCH_INFORMATION, DWORD); static BOOL (WINAPI *pInitializeProcessForWsWatch)(HANDLE); static BOOL (WINAPI *pQueryWorkingSet)(HANDLE, PVOID, DWORD); +static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, ULONG, PVOID, SIZE_T, SIZE_T *); - + static BOOL InitFunctionPtrs(HMODULE hpsapi) { PSAPI_GET_PROC(EmptyWorkingSet); @@ -77,10 +79,13 @@ static BOOL InitFunctionPtrs(HMODULE hpsapi) PSAPI_GET_PROC(InitializeProcessForWsWatch); PSAPI_GET_PROC(QueryWorkingSet); /* GetProcessImageFileName is not exported on NT4 */ + pGetPerformanceInfo = + (void *)GetProcAddress(hpsapi, "GetPerformanceInfo"); pGetProcessImageFileNameA = (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameA"); pGetProcessImageFileNameW = (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameW"); + pNtQuerySystemInformation = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQuerySystemInformation"); pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQueryVirtualMemory"); return TRUE; } @@ -184,6 +189,135 @@ static void test_GetModuleInformation(void) ok(info.lpBaseOfDll == hMod, "lpBaseOfDll=%p hMod=%p\n", info.lpBaseOfDll, hMod); } +static void test_GetPerformanceInfo(void) +{ + PERFORMANCE_INFORMATION info; + NTSTATUS status; + DWORD size; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = pGetPerformanceInfo(&info, sizeof(info)-1); + ok(!ret, "GetPerformanceInfo unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_BAD_LENGTH, "expected error=ERROR_BAD_LENGTH but got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetPerformanceInfo(&info, sizeof(info)); + todo_wine + ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError()); + todo_wine + ok(info.cb == sizeof(PERFORMANCE_INFORMATION), "got %d\n", info.cb); + + if (!pNtQuerySystemInformation) + win_skip("NtQuerySystemInformation not found, skipping tests\n"); + else + { + char performance_buffer[sizeof(SYSTEM_PERFORMANCE_INFORMATION) + 16]; /* larger on w2k8/win7 */ + SYSTEM_PERFORMANCE_INFORMATION *sys_performance_info = (SYSTEM_PERFORMANCE_INFORMATION *)performance_buffer; + SYSTEM_PROCESS_INFORMATION *sys_process_info = NULL, *spi; + SYSTEM_BASIC_INFORMATION sys_basic_info; + DWORD process_count, handle_count, thread_count; + + /* compare with values from SYSTEM_PERFORMANCE_INFORMATION */ + size = 0; + status = pNtQuerySystemInformation(SystemPerformanceInformation, sys_performance_info, sizeof(performance_buffer), &size); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(size >= sizeof(SYSTEM_PERFORMANCE_INFORMATION), "incorrect length %d\n", size); + + todo_wine + ok(info.CommitTotal == sys_performance_info->TotalCommittedPages, + "expected info.CommitTotal=%u but got %u\n", + sys_performance_info->TotalCommittedPages, (ULONG)info.CommitTotal); + + todo_wine + ok(info.CommitLimit == sys_performance_info->TotalCommitLimit, + "expected info.CommitLimit=%u but got %u\n", + sys_performance_info->TotalCommitLimit, (ULONG)info.CommitLimit); + + todo_wine + ok(info.CommitPeak == sys_performance_info->PeakCommitment, + "expected info.CommitPeak=%u but got %u\n", + sys_performance_info->PeakCommitment, (ULONG)info.CommitPeak); + + todo_wine + ok(info.PhysicalAvailable >= max(sys_performance_info->AvailablePages, 25) - 25 && + info.PhysicalAvailable <= sys_performance_info->AvailablePages + 25, + "expected approximately info.PhysicalAvailable=%u but got %u\n", + sys_performance_info->AvailablePages, (ULONG)info.PhysicalAvailable); + + /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ + + todo_wine + ok(info.KernelTotal == sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, + "expected info.KernelTotal=%u but got %u\n", + sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelTotal); + + todo_wine + ok(info.KernelPaged == sys_performance_info->PagedPoolUsage, + "expected info.KernelPaged=%u but got %u\n", + sys_performance_info->PagedPoolUsage, (ULONG)info.KernelPaged); + + todo_wine + ok(info.KernelNonpaged == sys_performance_info->NonPagedPoolUsage, + "expected info.KernelNonpaged=%u but got %u\n", + sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelNonpaged); + + /* compare with values from SYSTEM_BASIC_INFORMATION */ + size = 0; + status = pNtQuerySystemInformation(SystemBasicInformation, &sys_basic_info, sizeof(sys_basic_info), &size); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + ok(size >= sizeof(SYSTEM_BASIC_INFORMATION), "incorrect length %d\n", size); + + todo_wine + ok(info.PhysicalTotal == sys_basic_info.MmNumberOfPhysicalPages, + "expected info.PhysicalTotal=%u but got %u\n", + sys_basic_info.MmNumberOfPhysicalPages, (ULONG)info.PhysicalTotal); + + todo_wine + ok(info.PageSize == sys_basic_info.PageSize, + "expected info.PageSize=%u but got %u\n", + sys_basic_info.PageSize, (ULONG)info.PageSize); + + /* compare with values from SYSTEM_PROCESS_INFORMATION */ + size = 0; + status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_LENGTH_MISMATCH, got %08x\n", status); + ok(size > 0, "incorrect length %d\n", size); + while (status == STATUS_INFO_LENGTH_MISMATCH) + { + sys_process_info = HeapAlloc(GetProcessHeap(), 0, size); + ok(sys_process_info != NULL, "failed to allocate memory\n"); + status = pNtQuerySystemInformation(SystemProcessInformation, sys_process_info, size, &size); + if (status == STATUS_SUCCESS) break; + HeapFree(GetProcessHeap(), 0, sys_process_info); + } + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + + process_count = handle_count = thread_count = 0; + for (spi = sys_process_info;; spi = (SYSTEM_PROCESS_INFORMATION *)(((char *)spi) + spi->NextEntryOffset)) + { + process_count++; + handle_count += spi->HandleCount; + thread_count += spi->dwThreadCount; + if (spi->NextEntryOffset == 0) break; + } + HeapFree(GetProcessHeap(), 0, sys_process_info); + + todo_wine + ok(info.HandleCount == handle_count, + "expected info.HandleCount=%u but got %u\n", handle_count, info.HandleCount); + + todo_wine + ok(info.ProcessCount == process_count, + "expected info.ProcessCount=%u but got %u\n", process_count, info.ProcessCount); + + todo_wine + ok(info.ThreadCount == thread_count, + "expected info.ThreadCount=%u but got %u\n", thread_count, info.ThreadCount); + } +} + + static void test_GetProcessMemoryInfo(void) { PROCESS_MEMORY_COUNTERS pmc; @@ -677,6 +811,7 @@ START_TEST(psapi_main) test_EnumProcesses(); test_EnumProcessModules(); test_GetModuleInformation(); + test_GetPerformanceInfo(); test_GetProcessMemoryInfo(); test_GetMappedFileName(); test_GetProcessImageFileName();

1 0

Alexandre Julliard : configure: Don't require libXext for Xrender.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 60fcafcf048fe426e4bc3e830712be08d1828729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fcafcf048fe426e4bc3e830… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 14 15:36:38 2014 +0900 configure: Don't require libXext for Xrender. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b469858..909b622 100755 --- a/configure +++ b/configure @@ -9818,7 +9818,7 @@ This is an error since --with-xxf86vm was requested." "$LINENO" 5 ;; esac fi - if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" -a "x$ac_cv_lib_soname_Xext" != "x" + if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lXrender" >&5 $as_echo_n "checking for -lXrender... " >&6; } diff --git a/configure.ac b/configure.ac index 398d60b..4ee8133 100644 --- a/configure.ac +++ b/configure.ac @@ -1161,7 +1161,7 @@ then [libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported.]) dnl *** Check for Transform functions in Xrender - if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" -a "x$ac_cv_lib_soname_Xext" != "x" + if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" then WINE_CHECK_SONAME(Xrender,XRenderQueryExtension, [AC_CHECK_LIB(Xrender,XRenderSetPictureTransform,

1 0

Bruno Jesus : ole32: Avoid a possible null dereference.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 959ca6ac0264e5a285d1360598cb813b1956a4cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=959ca6ac0264e5a285d136059… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Nov 13 22:13:40 2014 -0200 ole32: Avoid a possible null dereference. --- dlls/ole32/clipboard.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 6404f36..0c3be3b 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -210,13 +210,11 @@ UINT ole_private_data_clipboard_format = 0; static UINT wine_marshal_clipboard_format; -static inline char *dump_fmtetc(FORMATETC *fmt) +static inline const char *dump_fmtetc(FORMATETC *fmt) { - static char buf[100]; - - snprintf(buf, sizeof(buf), "cf %04x ptd %p aspect %x lindex %d tymed %x", - fmt->cfFormat, fmt->ptd, fmt->dwAspect, fmt->lindex, fmt->tymed); - return buf; + if (!fmt) return "(null)"; + return wine_dbg_sprintf("cf %04x ptd %p aspect %x lindex %d tymed %x", + fmt->cfFormat, fmt->ptd, fmt->dwAspect, fmt->lindex, fmt->tymed); } /*---------------------------------------------------------------------*

1 0

Vincent Povirk : windowscodecs: Add fallback to unknown metadata reader.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: fa455f594bceb085562ae847ad1bcdcca40ecb8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa455f594bceb085562ae847a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 12 16:00:55 2014 -0600 windowscodecs: Add fallback to unknown metadata reader. --- dlls/windowscodecs/imgfactory.c | 25 ++++++++++++++++++++++++- dlls/windowscodecs/tests/metadata.c | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 444f2e4..42b4e59 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -1050,7 +1050,30 @@ start: IEnumUnknown_Release(enumreaders); if (!*reader && !(options & WICMetadataCreationFailUnknown)) - FIXME("create unknown metadata reader\n"); + { + hr = IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + if (SUCCEEDED(hr)) + hr = UnknownMetadataReader_CreateInstance(&IID_IWICMetadataReader, (void**)reader); + + if (SUCCEEDED(hr)) + { + hr = IWICMetadataReader_QueryInterface(*reader, &IID_IWICPersistStream, (void**)&wicpersiststream); + + if (SUCCEEDED(hr)) + { + hr = IWICPersistStream_LoadEx(wicpersiststream, stream, NULL, options & WICPersistOptionsMask); + + IWICPersistStream_Release(wicpersiststream); + } + + if (FAILED(hr)) + { + IWICMetadataReader_Release(*reader); + *reader = NULL; + } + } + } if (*reader) return S_OK; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 2dc6049..fa9d701 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -876,7 +876,7 @@ static void test_create_reader(void) hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory, &GUID_ContainerFormatWmp, NULL, WICPersistOptionsDefault, stream, &reader); - todo_wine ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); + ok(hr == S_OK, "CreateMetadataReaderFromContainer failed, hr=%x\n", hr); if (SUCCEEDED(hr)) {

1 0

Sebastian Lackner : kernel32: Fix implementation of K32GetPerformanceInfo.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: 4032eef90fc9cb6dcd09310a9ed5372e234e7653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4032eef90fc9cb6dcd09310a9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Nov 14 08:07:34 2014 +0100 kernel32: Fix implementation of K32GetPerformanceInfo. --- dlls/kernel32/cpu.c | 64 ++++++++++++++++++++++++++++++++++++++++++- dlls/psapi/tests/psapi_main.c | 14 ---------- 2 files changed, 63 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 0ebf8f3..f48fcf0 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -216,12 +216,74 @@ BOOL WINAPI IsProcessorFeaturePresent ( */ BOOL WINAPI K32GetPerformanceInfo(PPERFORMANCE_INFORMATION info, DWORD size) { + union + { + SYSTEM_PERFORMANCE_INFORMATION performance; + SYSTEM_PROCESS_INFORMATION process; + SYSTEM_BASIC_INFORMATION basic; + } *sysinfo; + SYSTEM_PROCESS_INFORMATION *spi; + DWORD process_info_size; NTSTATUS status; TRACE( "(%p, %d)\n", info, size ); - status = NtQuerySystemInformation( SystemPerformanceInformation, info, size, NULL ); + if (size < sizeof(*info)) + { + SetLastError( ERROR_BAD_LENGTH ); + return FALSE; + } + + memset( info, 0, sizeof(*info) ); + info->cb = sizeof(*info); + + /* fields from SYSTEM_PROCESS_INFORMATION */ + NtQuerySystemInformation( SystemProcessInformation, NULL, 0, &process_info_size ); + for (;;) + { + sysinfo = HeapAlloc( GetProcessHeap(), 0, max(process_info_size, sizeof(*sysinfo)) ); + if (!sysinfo) + { + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } + status = NtQuerySystemInformation( SystemProcessInformation, &sysinfo->process, + process_info_size, &process_info_size ); + if (!status) break; + if (status != STATUS_INFO_LENGTH_MISMATCH) + goto err; + HeapFree( GetProcessHeap(), 0, sysinfo ); + } + for (spi = &sysinfo->process;; spi = (SYSTEM_PROCESS_INFORMATION *)(((PCHAR)spi) + spi->NextEntryOffset)) + { + info->ProcessCount++; + info->HandleCount += spi->HandleCount; + info->ThreadCount += spi->dwThreadCount; + if (spi->NextEntryOffset == 0) break; + } + + /* fields from SYSTEM_PERFORMANCE_INFORMATION */ + status = NtQuerySystemInformation( SystemPerformanceInformation, &sysinfo->performance, + sizeof(sysinfo->performance), NULL ); + if (status) goto err; + info->CommitTotal = sysinfo->performance.TotalCommittedPages; + info->CommitLimit = sysinfo->performance.TotalCommitLimit; + info->CommitPeak = sysinfo->performance.PeakCommitment; + info->PhysicalAvailable = sysinfo->performance.AvailablePages; + info->KernelTotal = sysinfo->performance.PagedPoolUsage + + sysinfo->performance.NonPagedPoolUsage; + info->KernelPaged = sysinfo->performance.PagedPoolUsage; + info->KernelNonpaged = sysinfo->performance.NonPagedPoolUsage; + + /* fields from SYSTEM_BASIC_INFORMATION */ + status = NtQuerySystemInformation( SystemBasicInformation, &sysinfo->basic, + sizeof(sysinfo->basic), NULL ); + if (status) goto err; + info->PhysicalTotal = sysinfo->basic.MmNumberOfPhysicalPages; + info->PageSize = sysinfo->basic.PageSize; +err: + HeapFree( GetProcessHeap(), 0, sysinfo ); if (status) { SetLastError( RtlNtStatusToDosError( status ) ); diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 7220da9..890b4ac 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -203,9 +203,7 @@ static void test_GetPerformanceInfo(void) SetLastError(0xdeadbeef); ret = pGetPerformanceInfo(&info, sizeof(info)); - todo_wine ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError()); - todo_wine ok(info.cb == sizeof(PERFORMANCE_INFORMATION), "got %d\n", info.cb); if (!pNtQuerySystemInformation) @@ -224,22 +222,18 @@ static void test_GetPerformanceInfo(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); ok(size >= sizeof(SYSTEM_PERFORMANCE_INFORMATION), "incorrect length %d\n", size); - todo_wine ok(info.CommitTotal == sys_performance_info->TotalCommittedPages, "expected info.CommitTotal=%u but got %u\n", sys_performance_info->TotalCommittedPages, (ULONG)info.CommitTotal); - todo_wine ok(info.CommitLimit == sys_performance_info->TotalCommitLimit, "expected info.CommitLimit=%u but got %u\n", sys_performance_info->TotalCommitLimit, (ULONG)info.CommitLimit); - todo_wine ok(info.CommitPeak == sys_performance_info->PeakCommitment, "expected info.CommitPeak=%u but got %u\n", sys_performance_info->PeakCommitment, (ULONG)info.CommitPeak); - todo_wine ok(info.PhysicalAvailable >= max(sys_performance_info->AvailablePages, 25) - 25 && info.PhysicalAvailable <= sys_performance_info->AvailablePages + 25, "expected approximately info.PhysicalAvailable=%u but got %u\n", @@ -247,17 +241,14 @@ static void test_GetPerformanceInfo(void) /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ - todo_wine ok(info.KernelTotal == sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, "expected info.KernelTotal=%u but got %u\n", sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelTotal); - todo_wine ok(info.KernelPaged == sys_performance_info->PagedPoolUsage, "expected info.KernelPaged=%u but got %u\n", sys_performance_info->PagedPoolUsage, (ULONG)info.KernelPaged); - todo_wine ok(info.KernelNonpaged == sys_performance_info->NonPagedPoolUsage, "expected info.KernelNonpaged=%u but got %u\n", sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelNonpaged); @@ -268,12 +259,10 @@ static void test_GetPerformanceInfo(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); ok(size >= sizeof(SYSTEM_BASIC_INFORMATION), "incorrect length %d\n", size); - todo_wine ok(info.PhysicalTotal == sys_basic_info.MmNumberOfPhysicalPages, "expected info.PhysicalTotal=%u but got %u\n", sys_basic_info.MmNumberOfPhysicalPages, (ULONG)info.PhysicalTotal); - todo_wine ok(info.PageSize == sys_basic_info.PageSize, "expected info.PageSize=%u but got %u\n", sys_basic_info.PageSize, (ULONG)info.PageSize); @@ -303,15 +292,12 @@ static void test_GetPerformanceInfo(void) } HeapFree(GetProcessHeap(), 0, sys_process_info); - todo_wine ok(info.HandleCount == handle_count, "expected info.HandleCount=%u but got %u\n", handle_count, info.HandleCount); - todo_wine ok(info.ProcessCount == process_count, "expected info.ProcessCount=%u but got %u\n", process_count, info.ProcessCount); - todo_wine ok(info.ThreadCount == thread_count, "expected info.ThreadCount=%u but got %u\n", thread_count, info.ThreadCount); }

1 0

Sebastian Lackner : d3dx9_36: Allow NULL pointer for optional arguments of D3DXIntersectTri.
by Alexandre Julliard Nov. 14, 2014

Nov. 14, 2014

Module: wine Branch: master Commit: b69038e3d96bd4eee19be6d6c6de7d4abb03460d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69038e3d96bd4eee19be6d6c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 8 19:29:53 2014 +0100 d3dx9_36: Allow NULL pointer for optional arguments of D3DXIntersectTri. --- dlls/d3dx9_36/mesh.c | 6 +++--- dlls/d3dx9_36/tests/mesh.c | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 9aece61..6f268f2 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2407,9 +2407,9 @@ BOOL WINAPI D3DXIntersectTri(const D3DXVECTOR3 *p0, const D3DXVECTOR3 *p1, const D3DXVec4Transform(&vec, &vec, &m); if ( (vec.x >= 0.0f) && (vec.y >= 0.0f) && (vec.x + vec.y <= 1.0f) && (vec.z >= 0.0f) ) { - *pu = vec.x; - *pv = vec.y; - *pdist = fabsf( vec.z ); + if (pu) *pu = vec.x; + if (pv) *pv = vec.y; + if (pdist) *pdist = fabsf( vec.z ); return TRUE; } } diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 870f62a..dac0f60 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1104,6 +1104,9 @@ static void D3DXIntersectTriTest(void) ok( compare(exp_v,got_v), "Expected v = %f, got %f\n",exp_v,got_v); ok( compare(exp_dist,got_dist), "Expected distance = %f, got %f\n",exp_dist,got_dist); + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, NULL, NULL, NULL); + ok(got_res == exp_res, "Expected result = %d, got %d\n", exp_res, got_res); + /*Only positive ray is taken in account*/ vertex[0].x = 1.0f; vertex[0].y = 0.0f; vertex[0].z = 0.0f; @@ -1119,6 +1122,9 @@ static void D3DXIntersectTriTest(void) got_res = D3DXIntersectTri(&vertex[0],&vertex[1],&vertex[2],&position,&ray,&got_u,&got_v,&got_dist); ok( got_res == exp_res, "Expected result = %d, got %d\n",exp_res,got_res); + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, NULL, NULL, NULL); + ok(got_res == exp_res, "Expected result = %d, got %d\n", exp_res, got_res); + /*Intersection between ray and triangle in a same plane is considered as empty*/ vertex[0].x = 4.0f; vertex[0].y = 0.0f; vertex[0].z = 0.0f; @@ -1133,6 +1139,9 @@ static void D3DXIntersectTriTest(void) got_res = D3DXIntersectTri(&vertex[0],&vertex[1],&vertex[2],&position,&ray,&got_u,&got_v,&got_dist); ok( got_res == exp_res, "Expected result = %d, got %d\n",exp_res,got_res); + + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, NULL, NULL, NULL); + ok(got_res == exp_res, "Expected result = %d, got %d\n", exp_res, got_res); } static void D3DXCreateMeshTest(void)

1 0