December 2018 - Wine-devel - list.winehq.org

[PATCH] wininet: Return proper cache path from GetUrlCacheConfigInfo.
by Dmitry Timoshkov 29 Dec '18

29 Dec '18

This patch makes an application with built-in internet shop work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/tests/urlcache.c | 53 ++++++++++++++++ dlls/wininet/urlcache.c | 113 +++++++++++++++++++++++++++++++--- 2 files changed, 158 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 3799500489..4794cb0b6e 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -1100,6 +1103,55 @@ static void test_trailing_slash(void) DeleteFileA(filename); } +static void test_GetUrlCacheConfigInfo(void) +{ + INTERNET_CACHE_CONFIG_INFOA info; + struct + { + INTERNET_CACHE_CONFIG_INFOA *info; + DWORD dwStructSize; + DWORD flags; + BOOL ret; + DWORD error; + } td[] = + { +#if 0 /* crashes under Vista */ + { NULL, 0, 0, FALSE, ERROR_INVALID_PARAMETER }, +#endif + { &info, 0, 0, TRUE }, + { &info, sizeof(info) - 1, 0, TRUE }, + { &info, sizeof(info) + 1, 0, TRUE }, + { &info, 0, CACHE_CONFIG_CONTENT_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_CONTENT_PATHS_FC, TRUE }, + { &info, 0, CACHE_CONFIG_COOKIES_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_COOKIES_PATHS_FC, TRUE }, + { &info, 0, CACHE_CONFIG_HISTORY_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_HISTORY_PATHS_FC, TRUE }, + }; + int i; + BOOL ret; + + for (i = 0; i < ARRAY_SIZE(td); i++) + { + if (td[i].info) + { + memset(&info, 0, sizeof(*td[i].info)); + info.dwStructSize = td[i].dwStructSize; + } + + SetLastError(0xdeadbeef); + ret = GetUrlCacheConfigInfoA(td[i].info, NULL, td[i].flags); + ok(ret == td[i].ret, "%d: expected %d, got %d\n", i, td[i].ret, ret); + if (!ret) + ok(GetLastError() == td[i].error, "%d: expected %u, got %u\n", i, td[i].error, GetLastError()); + else + { + ok(info.dwStructSize == td[i].dwStructSize, "got %u\n", info.dwStructSize); + ok(info.u.s.CachePath[0], "%d: got empty path\n", i); + } + } +} + START_TEST(urlcache) { HMODULE hdll; @@ -1124,4 +1176,5 @@ START_TEST(urlcache) test_FindCloseUrlCache(); test_GetDiskInfoA(); test_trailing_slash(); + test_GetUrlCacheConfigInfo(); } diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f26fa3468d..c8d141e3d9 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -23,6 +23,7 @@ */ #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ws2tcpip.h" @@ -3764,21 +3765,117 @@ BOOL WINAPI SetUrlCacheEntryGroupW(LPCWSTR lpszUrlName, DWORD dwFlags, /*********************************************************************** * GetUrlCacheConfigInfoW (WININET.@) */ -BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW CacheInfo, LPDWORD size, DWORD bitmask) +BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD size, DWORD flags) { - FIXME("(%p, %p, %x)\n", CacheInfo, size, bitmask); - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + cache_container *container; + + FIXME("(%p, %p, %x): semi-stub\n", info, size, flags); + + if (!info) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + info->dwContainer = 0; + info->dwQuota = 0x3e800; + info->dwReserved4 = 0; + info->fPerUser = TRUE; + info->dwSyncMode = 0; + info->dwNumCachePaths = 1; + info->dwNormalUsage = 0; + info->dwExemptUsage = 0; + + info->u.s.CachePath[0] = 0; + info->u.s.dwCacheSize = 0x3e800; /* FIXME */ + + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) + { + switch (flags & (CACHE_CONFIG_CONTENT_PATHS_FC | CACHE_CONFIG_COOKIES_PATHS_FC | CACHE_CONFIG_HISTORY_PATHS_FC)) + { + case 0: + case CACHE_CONFIG_CONTENT_PATHS_FC: + if (container->default_entry_type == NORMAL_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + case CACHE_CONFIG_COOKIES_PATHS_FC: + if (container->default_entry_type == COOKIE_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + case CACHE_CONFIG_HISTORY_PATHS_FC: + if (container->default_entry_type == URLHISTORY_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + default: + FIXME("flags %08x not handled\n", flags); + break; + } + } + + TRACE("CachePath %s\n", debugstr_w(info->u.s.CachePath)); + + return TRUE; } /*********************************************************************** * GetUrlCacheConfigInfoA (WININET.@) */ -BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA CacheInfo, LPDWORD size, DWORD bitmask) +BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA info, LPDWORD size, DWORD flags) { - FIXME("(%p, %p, %x)\n", CacheInfo, size, bitmask); - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + cache_container *container; + + FIXME("(%p, %p, %x): semi-stub\n", info, size, flags); + + if (!info) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + info->dwContainer = 0; + info->dwQuota = 0x3e800; + info->dwReserved4 = 0; + info->fPerUser = TRUE; + info->dwSyncMode = 0; + info->dwNumCachePaths = 1; + info->dwNormalUsage = 0; + info->dwExemptUsage = 0; + + info->u.s.CachePath[0] = 0; + info->u.s.dwCacheSize = 0x3e800; /* FIXME */ + + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) + { + switch (flags & (CACHE_CONFIG_CONTENT_PATHS_FC | CACHE_CONFIG_COOKIES_PATHS_FC | CACHE_CONFIG_HISTORY_PATHS_FC)) + { + case 0: + case CACHE_CONFIG_CONTENT_PATHS_FC: + if (container->default_entry_type == NORMAL_CACHE_ENTRY) + WideCharToMultiByte(CP_ACP, 0, container->path, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL); + break; + + case CACHE_CONFIG_COOKIES_PATHS_FC: + if (container->default_entry_type == COOKIE_CACHE_ENTRY) + WideCharToMultiByte(CP_ACP, 0, container->path, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL); + break; + + case CACHE_CONFIG_HISTORY_PATHS_FC: + if (container->default_entry_type == URLHISTORY_CACHE_ENTRY) + WideCharToMultiByte(CP_ACP, 0, container->path, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL); + break; + + default: + FIXME("flags %08x not handled\n", flags); + break; + } + } + + TRACE("CachePath %s\n", debugstr_a(info->u.s.CachePath)); + + return TRUE; } BOOL WINAPI GetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttributes, -- 2.19.2

1 0

[PATCH] kernel32: CreateDirectory shouldn't return ERROR_ACCESS_DENIED for the root of the drive.
by Dmitry Timoshkov 29 Dec '18

29 Dec '18

According to the testbot results CreateDirectory("C:\\", NULL) fails with ERROR_ACCESS_DENIED for not administrators. However with UAC enabled and not and administrator account I get ERROR_ALREADY_EXISTS in that case with Windows 7 64-bit running on real hardware. Moreover, Wine doesn't really perform any access checks in that case and blindly assumes that returning STATUS_ACCESS_DENIED is correct behaviour for the drive's root: dlls/ntdll/directory.c,lookup_unix_name(). This patch fixes an application that can't find its data files because after it receives ERROR_ACCESS_DENIED it stops further directory traversing. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/directory.c | 43 +++++++++++++++++++++++++++++++++ dlls/ntdll/directory.c | 3 +-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c index 512dc6d22a..de78c61681 100644 --- a/dlls/kernel32/tests/directory.c +++ b/dlls/kernel32/tests/directory.c @@ -541,10 +541,53 @@ static void test_SetCurrentDirectoryA(void) ok( GetLastError() == ERROR_PATH_NOT_FOUND, "wrong error %d\n", GetLastError() ); } +static void test_CreateDirectory_root(void) +{ + static const WCHAR drive_c_root[] = { 'C',':','\\',0 }; + static const WCHAR drive_c[] = { 'C',':',0 }; + char curdir[MAX_PATH]; + BOOL ret; + + GetCurrentDirectoryA(sizeof(curdir), curdir); + + ret = SetCurrentDirectoryA("C:\\"); + ok(ret, "SetCurrentDirectory error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryA("C:\\", NULL); + ok(!ret, "CreateDirectory should fail\n"); + if (GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("not an administrator\n"); + SetCurrentDirectoryA(curdir); + return; + } + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryA("C:", NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryW(drive_c_root, NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryW(drive_c, NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetCurrentDirectoryA(curdir); +} + START_TEST(directory) { init(); + test_CreateDirectory_root(); + test_GetWindowsDirectoryA(); test_GetWindowsDirectoryW(); diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index c48b9e97ea..2719958f67 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2650,9 +2650,8 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer { if (!stat( unix_name, &st )) { - /* creation fails with STATUS_ACCESS_DENIED for the root of the drive */ if (disposition == FILE_CREATE) - return name_len ? STATUS_OBJECT_NAME_COLLISION : STATUS_ACCESS_DENIED; + return STATUS_OBJECT_NAME_COLLISION; return STATUS_SUCCESS; } } -- 2.19.2

3 13

[PATCH v2] user32/tests: Add some tests for implicit stretch mode in CopyImage().
by Paul Gofman 29 Dec '18

29 Dec '18

The test is related to bug https://bugs.winehq.org/show_bug.cgi?id=46375. The values of the colored test result suggest that halftone filter is used for shrinking: each pixel of output 2x2 image has the color value averaged over 4 pixels from input 4x4 image. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: Fixed some typos. dlls/user32/tests/cursoricon.c | 125 +++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 323db82bc3..c598b232a0 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2751,6 +2751,130 @@ static void test_monochrome_icon(void) HeapFree(GetProcessHeap(), 0, icon_data); } +static COLORREF get_color_from_bits(const unsigned char *bits, const BITMAPINFO *bmi, + unsigned int row, unsigned int column) +{ + const BITMAPINFOHEADER *h = &bmi->bmiHeader; + const unsigned char *data; + unsigned int stride; + RGBQUAD color; + + ok(h->biBitCount == 1 || h->biBitCount >= 24, "Unsupported bit count %u.\n", h->biBitCount); + stride = ((h->biBitCount * h->biWidth + 7) / 8 + 3) & ~3; + data = bits + row * stride + column * h->biBitCount / 8; + if (h->biBitCount >= 24) + return RGB(data[2], data[1], data[0]); + + color = bmi->bmiColors[!!(data[0] & (1u << (7 - (column % 8))))]; + return RGB(color.rgbRed, color.rgbGreen, color.rgbBlue); +} + +static void test_CopyImage_StretchMode(void) +{ + static const unsigned char test_bits_24[] = + { + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, + 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x00, + 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, + }; + static const unsigned char expected_bits_24[] = + { + 0x3f, 0xff, 0x00, 0x3f, 0xff, 0x3f, 0x00, 0x00, + 0x3f, 0xff, 0x7f, 0x00, 0xff, 0x3f, 0x00, 0x00, + }; + static const unsigned char test_bits_1[] = + { + 0x30, 0x0, 0x0, 0x0, + 0x30, 0x0, 0x0, 0x0, + 0x40, 0x0, 0x0, 0x0, + 0xc0, 0x0, 0x0, 0x0, + }; + static const unsigned char expected_bits_1[] = + { + 0x40, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, + }; + + static const struct + { + LONG width, height, output_width, output_height; + WORD bit_count; + const unsigned char *test_bits, *expected_bits; + size_t test_bits_size, result_bits_size; + BOOL todo; + } + tests[] = + { + {4, 4, 2, 2, 24, test_bits_24, expected_bits_24, + sizeof(test_bits_24), sizeof(expected_bits_24), TRUE}, + {4, 4, 2, 2, 1, test_bits_1, expected_bits_1, + sizeof(test_bits_1), sizeof(expected_bits_1), FALSE}, + }; + + HBITMAP bitmap, bitmap_copy; + unsigned char *result_bits; + unsigned int row, column; + unsigned int test_index; + unsigned char *bits; + BITMAPINFO *bmi; + HDC hdc; + int ret; + + bmi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + bmi->bmiColors[1].rgbRed = 0xff; + bmi->bmiColors[1].rgbGreen = 0xff; + bmi->bmiColors[1].rgbBlue = 0xff; + + hdc = GetDC(NULL); + + for (test_index = 0; test_index < ARRAY_SIZE(tests); ++test_index) + { + bmi->bmiHeader.biWidth = tests[test_index].width; + bmi->bmiHeader.biHeight = tests[test_index].height; + bmi->bmiHeader.biBitCount = tests[test_index].bit_count; + + bitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, (void **)&bits, NULL, 0); + ok(bitmap && bits, "CreateDIBSection() failed, result %u.\n", GetLastError()); + memcpy(bits, tests[test_index].test_bits, tests[test_index].test_bits_size); + + bitmap_copy = CopyImage(bitmap, IMAGE_BITMAP, tests[test_index].output_width, + tests[test_index].output_height, LR_CREATEDIBSECTION); + ok(!!bitmap_copy, "CopyImage() failed, result %u.\n", GetLastError()); + + result_bits = HeapAlloc(GetProcessHeap(), 0, tests[test_index].result_bits_size); + + bmi->bmiHeader.biWidth = tests[test_index].output_width; + bmi->bmiHeader.biHeight = tests[test_index].output_height; + ret = GetDIBits(hdc, bitmap_copy, 0, tests[test_index].output_height, + result_bits, bmi, DIB_RGB_COLORS); + ok(ret == tests[test_index].output_height, "Unexpected GetDIBits result %d, GetLastError() %u.\n", + ret, GetLastError()); + + for (row = 0; row < tests[test_index].output_height; ++row) + for (column = 0; column < tests[test_index].output_width; ++column) + { + COLORREF result, expected; + + result = get_color_from_bits(result_bits, bmi, row, column); + expected = get_color_from_bits(tests[test_index].expected_bits, bmi, row, column); + + todo_wine_if(tests[test_index].todo) + ok(result == expected, "Colors do not match, " + "got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", + result, expected, test_index, row, column); + } + DeleteObject(bitmap); + DeleteObject(bitmap_copy); + HeapFree(GetProcessHeap(), 0, result_bits); + } + ReleaseDC(0, hdc); + HeapFree(GetProcessHeap(), 0, bmi); +} + START_TEST(cursoricon) { pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); @@ -2778,6 +2902,7 @@ START_TEST(cursoricon) test_CopyImage_Bitmap(16); test_CopyImage_Bitmap(24); test_CopyImage_Bitmap(32); + test_CopyImage_StretchMode(); test_initial_cursor(); test_CreateIcon(); test_LoadImage(); -- 2.19.2

1 0

[PATCH] user32/tests: Add some tests for implicit stretch mode in CopyImage().
by Paul Gofman 29 Dec '18

29 Dec '18

The test is related to bug https://bugs.winehq.org/show_bug.cgi?id=46375. The values of the colored test result suggest that halftone filter is used for shrinking: each pixel of output 2x2 image has the color value averaged over 4 pixels from input 4x4 image. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/user32/tests/cursoricon.c | 125 +++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 323db82bc3..2f830cac6e 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2751,6 +2751,130 @@ static void test_monochrome_icon(void) HeapFree(GetProcessHeap(), 0, icon_data); } +static COLORREF get_color_from_bits(const unsigned char *bits, const BITMAPINFO *bmi, + unsigned int row, unsigned int column) +{ + const BITMAPINFOHEADER *h = &bmi->bmiHeader; + const unsigned char *data; + unsigned int stride; + RGBQUAD color; + + ok(h->biBitCount == 1 || h->biBitCount >= 24, "Unsupported bit count %u.\n", h->biBitCount); + stride = ((h->biBitCount * h->biWidth + 7) / 8 + 3) & ~3; + data = bits + row * stride + column * h->biBitCount / 8; + if (h->biBitCount >= 24) + return RGB(data[2], data[1], data[0]); + + color = bmi->bmiColors[!!(data[0] & (1u << (7 - (column % 8))))]; + return RGB(color.rgbRed, color.rgbGreen, color.rgbBlue); +} + +static void test_CopyImage_StretchMode(void) +{ + static const unsigned char test_bits_24[] = + { + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, + 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x00, + 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, + }; + static const unsigned char expected_bits_24[] = + { + 0x3f, 0xff, 0x00, 0x3f, 0xff, 0x3f, 0x00, 0x00, + 0x3f, 0xff, 0x7f, 0x00, 0xff, 0x3f, 0x00, 0x00, + }; + static const unsigned char test_bits_1[] = + { + 0x30, 0x0, 0x0, 0x0, + 0x30, 0x0, 0x0, 0x0, + 0x40, 0x0, 0x0, 0x0, + 0xc0, 0x0, 0x0, 0x0, + }; + static const unsigned char expected_bits_1[] = + { + 0x40, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, + }; + + static const struct + { + LONG width, height, output_width, output_height; + WORD bit_count; + const unsigned char *test_bits, *expected_bits; + size_t test_bits_size, result_bits_size; + BOOL todo; + } + tests[] = + { + {4, 4, 2, 2, 24, test_bits_24, expected_bits_24, + sizeof(test_bits_24), sizeof(expected_bits_24), TRUE}, + {4, 4, 2, 2, 1, test_bits_1, expected_bits_1, + sizeof(test_bits_1), sizeof(expected_bits_1), FALSE}, + }; + + HBITMAP bitmap, bitmap_copy; + unsigned char *result_bits; + unsigned int row, column; + unsigned int test_index; + unsigned char *bits; + BITMAPINFO *bmi; + HDC hdc; + int ret; + + bmi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + bmi->bmiColors[1].rgbRed = 0xff; + bmi->bmiColors[1].rgbGreen = 0xff; + bmi->bmiColors[1].rgbBlue = 0xff; + + hdc = GetDC(NULL); + + for (test_index = 0; test_index < ARRAY_SIZE(tests); ++test_index) + { + bmi->bmiHeader.biWidth = tests[test_index].width; + bmi->bmiHeader.biHeight = tests[test_index].width; + bmi->bmiHeader.biBitCount = tests[test_index].bit_count; + + bitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, (void **)&bits, NULL, 0); + ok(bitmap && bits, "CreateDIBSection() failed, result %u.\n", GetLastError()); + memcpy(bits, tests[test_index].test_bits, tests[test_index].test_bits_size); + + bitmap_copy = CopyImage(bitmap, IMAGE_BITMAP, tests[test_index].output_width, + tests[test_index].output_height, LR_CREATEDIBSECTION); + ok(!!bitmap_copy, "CopyImage() failed, result %u.\n", GetLastError()); + + result_bits = HeapAlloc(GetProcessHeap(), 0, tests[test_index].result_bits_size); + + bmi->bmiHeader.biWidth = tests[test_index].output_width; + bmi->bmiHeader.biHeight = tests[test_index].output_height; + ret = GetDIBits(hdc, bitmap_copy, 0, tests[test_index].output_height, + result_bits, bmi, DIB_RGB_COLORS); + ok(ret == tests[test_index].output_height, "Unexpected GetDIBits result %d, GetLastError() %u.\n", + ret, GetLastError()); + + for (row = 0; row < tests[test_index].output_width; ++row) + for (column = 0; column < tests[test_index].output_height; ++column) + { + COLORREF result, expected; + + result = get_color_from_bits(result_bits, bmi, row, column); + expected = get_color_from_bits(tests[test_index].expected_bits, bmi, row, column); + + todo_wine_if(tests[test_index].todo) + ok(result == expected, "Colors do not match, " + "got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", + result, expected, test_index, row, column); + } + DeleteObject(bitmap); + DeleteObject(bitmap_copy); + HeapFree(GetProcessHeap(), 0, result_bits); + } + ReleaseDC(0, hdc); + HeapFree(GetProcessHeap(), 0, bmi); +} + START_TEST(cursoricon) { pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); @@ -2778,6 +2902,7 @@ START_TEST(cursoricon) test_CopyImage_Bitmap(16); test_CopyImage_Bitmap(24); test_CopyImage_Bitmap(32); + test_CopyImage_StretchMode(); test_initial_cursor(); test_CreateIcon(); test_LoadImage(); -- 2.19.2

1 0

[PATCH 05/11] mfplat: Implement IMFattributes::{SetUInt32,SetUInt64,GetUInt32,GetUInt64}.
by Jactry Zeng 29 Dec '18

29 Dec '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 39 ++++++++++++++++++++++++++++++-------- dlls/mfplat/tests/mfplat.c | 28 +++++++++++++++++++++++++-- 3 files changed, 58 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index 76843f5f25..9a4e41c430 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplat.dll IMPORTLIB = mfplat -IMPORTS = advapi32 ole32 +IMPORTS = advapi32 ole32 propsys C_SRCS = \ main.c diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6e056b3609..1d8b110a09 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -31,6 +31,7 @@ #include "mfapi.h" #include "mfidl.h" #include "mferror.h" +#include "propvarutil.h" #include "wine/heap.h" #include "wine/debug.h" @@ -589,19 +590,33 @@ static HRESULT WINAPI mfattributes_Compare(IMFAttributes *iface, IMFAttributes * static HRESULT WINAPI mfattributes_GetUINT32(IMFAttributes *iface, REFGUID key, UINT32 *value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hres; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_UINT32; + hres = mfattributes_getitem(This, key, &attrval, TRUE); + if(SUCCEEDED(hres)) + hres = PropVariantToUInt32(&attrval, value); + return hres; } static HRESULT WINAPI mfattributes_GetUINT64(IMFAttributes *iface, REFGUID key, UINT64 *value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hres; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_UINT64; + hres = mfattributes_getitem(This, key, &attrval, TRUE); + if(SUCCEEDED(hres)) + hres = PropVariantToUInt64(&attrval, value); + return hres; } static HRESULT WINAPI mfattributes_GetDouble(IMFAttributes *iface, REFGUID key, double *value) @@ -776,19 +791,27 @@ static HRESULT WINAPI mfattributes_DeleteAllItems(IMFAttributes *iface) static HRESULT WINAPI mfattributes_SetUINT32(IMFAttributes *iface, REFGUID key, UINT32 value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %d\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %d)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = VT_UI4; + attrval.ulVal = value; + return mfattribute_setitem(This, key, &attrval); } static HRESULT WINAPI mfattributes_SetUINT64(IMFAttributes *iface, REFGUID key, UINT64 value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %s\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); + FIXME("(%p, %s, %s)\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_UINT64; + attrval.uhVal.QuadPart = value; + return mfattribute_setitem(This, key, &attrval); } static HRESULT WINAPI mfattributes_SetDouble(IMFAttributes *iface, REFGUID key, double value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index fff424e798..7ae87c2fc1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -413,6 +413,8 @@ static void test_MFCreateAttributes(void) IMFAttributes *attributes; HRESULT hr; UINT32 count; + UINT32 uint32_value; + UINT64 uint64_value; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -422,13 +424,35 @@ static void test_MFCreateAttributes(void) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(count == 0, "got %d\n", count); - hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 123); + ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: 0x%08x.\n", hr); hr = IMFAttributes_GetCount(attributes, &count); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(count == 1, "got %d\n", count); + uint32_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); + ok(hr == S_OK, "IMFAttributes_GetUINT32 failed: 0x%08x.\n", hr); + ok(uint32_value == 123, "got wrong value: %d, expected: 123.\n", uint32_value); + + uint64_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUINT64 should fail: 0x%08x.\n", hr); + ok(uint64_value == 0xdeadbeef, "got wrong value: %lld, expected: 0xdeadbeef.\n", uint64_value); + + hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); + ok(hr == S_OK, "IMFAttributes_SetUINT64 failed: 0x%08x.\n", hr); + + hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); + ok(hr == S_OK, "IMFAttributes_GetUINT64 failed: 0x%08x.\n", hr); + ok(uint64_value == 65536, "got wrong value: %lld, expected: 65536.\n", uint64_value); + + uint32_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUINT32 should fail: 0x%08x.\n", hr); + ok(uint32_value == 0xdeadbeef, "got wrong value: %d, expected: 0xdeadbeef.\n", uint32_value); + IMFAttributes_Release(attributes); } -- 2.19.2

2 1

[PATCH 11/11] mfplat: Implement IMFattributes::{SetUnknown,GetUnknown}.
by Jactry Zeng 28 Dec '18

28 Dec '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 20 ++++++++--- dlls/mfplat/tests/mfplat.c | 74 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7a6d8d5475..c1f0188a0f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -731,10 +731,18 @@ static HRESULT WINAPI mfattributes_GetAllocatedBlob(IMFAttributes *iface, REFGUI static HRESULT WINAPI mfattributes_GetUnknown(IMFAttributes *iface, REFGUID key, REFIID riid, void **ppv) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hres; - FIXME("%p, %s, %s, %p\n", This, debugstr_guid(key), debugstr_guid(riid), ppv); + TRACE("(%p, %s, %s, %p)\n", This, debugstr_guid(key), debugstr_guid(riid), ppv); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_IUNKNOWN; + hres = mfattributes_getitem(This, key, &attrval, TRUE); + if(SUCCEEDED(hres)) + hres = IUnknown_QueryInterface(attrval.punkVal, riid, ppv); + PropVariantClear(&attrval); + return hres; } static HRESULT mfattribute_setitem(mfattributes *object, REFGUID key, REFPROPVARIANT value) @@ -901,10 +909,14 @@ static HRESULT WINAPI mfattributes_SetBlob(IMFAttributes *iface, REFGUID key, co static HRESULT WINAPI mfattributes_SetUnknown(IMFAttributes *iface, REFGUID key, IUnknown *unknown) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), unknown); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), unknown); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = VT_UNKNOWN; + attrval.punkVal = unknown; + return mfattribute_setitem(This, key, &attrval); } static HRESULT WINAPI mfattributes_LockStore(IMFAttributes *iface) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 975b40a5f3..c7f8fe6e51 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -53,6 +53,7 @@ DEFINE_GUID(MFT_CATEGORY_OTHER, 0x90175d57,0xb7ea,0x4901,0xae,0xb3,0x93,0x3a,0x8 DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +DEFINE_GUID(DUMMY_GUID3, 0x12345678,0x1234,0x1234,0x23,0x23,0x23,0x23,0x23,0x23,0x23,0x23); static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; @@ -419,6 +420,50 @@ static void _check_count(IMFAttributes* obj, ULONG expected, int line) ok_(__FILE__,line)(count == expected, "got %d, expected %d.\n", count, expected); } +struct unk_impl +{ + IUnknown IUnknown_iface; + LONG ref; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_QueryInterface()\n"); + *ppv = &This->IUnknown_iface; + IUnknown_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_AddRef()\n"); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_Release()\n"); + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + static void test_MFCreateAttributes(void) { IMFAttributes *attributes; @@ -429,6 +474,9 @@ static void test_MFCreateAttributes(void) const static WCHAR stringW[] = {'W','i','n','e',0}; WCHAR bufferW[256] = {0}; WCHAR *allacted_string = NULL; + IUnknown *unk_value = NULL, *unk = NULL; + struct unk_impl unk_obj = {{&unk_vtbl}, 1}; + struct unk_impl unk_obj2 = {{&unk_vtbl}, 22}; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -507,6 +555,32 @@ static void test_MFCreateAttributes(void) ok(hr == E_INVALIDARG, "IMFAttributes_SetString should fail: 0x%08x.\n", hr); CHECK_COUNT(attributes, 3); + hr = IMFAttributes_SetUnknown(attributes, &DUMMY_GUID2, &unk_obj.IUnknown_iface); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: 0x%08x\n", hr); + CHECK_COUNT(attributes, 4); + ok(unk_obj.ref == 2, "got wrong refcount: %d.\n", unk_obj.ref); + hr = IMFAttributes_GetUnknown(attributes, &DUMMY_GUID2, &IID_IUnknown, (void **)&unk_value); + ok(hr == S_OK, "IMFAttributes_GetUnknown failed: 0x%08x\n", hr); + ok(unk_obj.ref == 3, "got wrong refcount: %d.\n", unk_obj.ref); + + hr = IMFAttributes_SetUnknown(attributes, &DUMMY_GUID2, &unk_obj2.IUnknown_iface); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: 0x%08x\n", hr); + CHECK_COUNT(attributes, 4); + ok(unk_obj.ref == 2, "got wrong refcount: %d.\n", unk_obj.ref); + ok(unk_obj2.ref == 23, "got wrong refcount: %d.\n", unk_obj.ref); + unk_value = NULL; + hr = IMFAttributes_GetUnknown(attributes, &DUMMY_GUID2, &IID_IUnknown, (void **)&unk_value); + ok(hr == S_OK, "IMFAttributes_GetUnknown failed: 0x%08x\n", hr); + ok(unk_obj.ref == 2, "got wrong refcount: %d.\n", unk_obj.ref); + ok(unk_obj2.ref == 24, "got wrong refcount: %d.\n", unk_obj2.ref); + + hr = IMFAttributes_SetUnknown(attributes, &DUMMY_GUID3, unk); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: 0x%08x\n", hr); + CHECK_COUNT(attributes, 5); + unk_value = NULL; + hr = IMFAttributes_GetUnknown(attributes, &DUMMY_GUID3, &IID_IUnknown, (void **)&unk_value); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUnknown failed: 0x%08x\n", hr); + IMFAttributes_Release(attributes); } -- 2.19.2

1 0

[PATCH 08/11] mfplat: Implement IMFattributes::{SetDouble, GetDouble}.
by Jactry Zeng 28 Dec '18

28 Dec '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 19 +++++++++++++++---- dlls/mfplat/tests/mfplat.c | 10 ++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index bc3b385b14..0b86843c2f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -622,10 +622,17 @@ static HRESULT WINAPI mfattributes_GetUINT64(IMFAttributes *iface, REFGUID key, static HRESULT WINAPI mfattributes_GetDouble(IMFAttributes *iface, REFGUID key, double *value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hres; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_DOUBLE; + hres = mfattributes_getitem(This, key, &attrval, TRUE); + if(SUCCEEDED(hres)) + hres = PropVariantToDouble(&attrval, value); + return hres; } static HRESULT WINAPI mfattributes_GetGUID(IMFAttributes *iface, REFGUID key, GUID *value) @@ -817,10 +824,14 @@ static HRESULT WINAPI mfattributes_SetUINT64(IMFAttributes *iface, REFGUID key, static HRESULT WINAPI mfattributes_SetDouble(IMFAttributes *iface, REFGUID key, double value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %f\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %f)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_DOUBLE; + attrval.dblVal = value; + return mfattribute_setitem(This, key, &attrval); } static HRESULT WINAPI mfattributes_SetGUID(IMFAttributes *iface, REFGUID key, REFGUID value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 01cb1a3377..2e463d36ae 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -424,6 +424,7 @@ static void test_MFCreateAttributes(void) HRESULT hr; UINT32 uint32_value; UINT64 uint64_value; + double double_value; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -456,6 +457,15 @@ static void test_MFCreateAttributes(void) ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUINT32 should fail: 0x%08x.\n", hr); ok(uint32_value == 0xdeadbeef, "got wrong value: %d, expected: 0xdeadbeef.\n", uint32_value); + hr = IMFAttributes_SetDouble(attributes, &GUID_NULL, 22.0); + ok(hr == S_OK, "IMFAttributes_SetDouble failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 2); + + double_value = 0xdeadbeef; + hr = IMFAttributes_GetDouble(attributes, &GUID_NULL, &double_value); + ok(hr == S_OK, "IMFAttributes_GetDouble failed: 0x%08x.\n", hr); + ok(double_value == 22.0, "got wrong value: %f, expected: 22.0.\n", double_value); + IMFAttributes_Release(attributes); } -- 2.19.2

1 0

[PATCH 09/11] propsys: Partially implement PropVariantToString().
by Jactry Zeng 28 Dec '18

28 Dec '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 38 ++++++++++++++++ dlls/propsys/tests/propsys.c | 87 ++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 127 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 9193f3664d..d9347e27ae 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -133,7 +133,7 @@ @ stub PropVariantToInt64VectorAlloc @ stub PropVariantToInt64WithDefault @ stub PropVariantToStrRet -@ stub PropVariantToString +@ stdcall PropVariantToString(ptr ptr long) @ stdcall PropVariantToStringAlloc(ptr ptr) @ stub PropVariantToStringVector @ stub PropVariantToStringVectorAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 0edf4621b3..22ea3251f8 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -34,6 +34,7 @@ #include "winuser.h" #include "shlobj.h" #include "propvarutil.h" +#include "strsafe.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -305,6 +306,43 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret) return hr; } +HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch) +{ + HRESULT hr = S_OK; + + TRACE("(%p, %p, %d): semi-stub\n", propvarIn, ret, cch); + + ret[0] = '\0'; + + if(!cch) + return E_INVALIDARG; + + switch(propvarIn->vt) + { + case VT_NULL: + case VT_EMPTY: + break; + case VT_BSTR: + case VT_LPWSTR: + if(lstrlenW(propvarIn->u.pwszVal) > cch) + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + else + lstrcpyW(ret, propvarIn->u.pwszVal); + break; + case VT_LPSTR: + if(strlen(propvarIn->u.pszVal) > cch) + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + else + MultiByteToWideChar(CP_ACP, 0, propvarIn->u.pszVal, -1, ret, cch); + break; + default: + FIXME("Unsupported conversion (%d)\n", propvarIn->vt); + hr = E_FAIL; + break; + } + return hr; +} + HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) { WCHAR *res = NULL; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index a9c0a7730b..6d64afa355 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -32,6 +32,7 @@ #include "initguid.h" #include "propsys.h" #include "propvarutil.h" +#include "strsafe.h" #include "wine/test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -1304,6 +1305,91 @@ static void test_PropVariantToDouble(void) ok(value == 8.0, "Unexpected value: %f.\n", value); } +static void test_PropVariantToString(void) +{ + PROPVARIANT propvar; + static CHAR string[] = {'T','e','s','t',0}; + static WCHAR stringW[] = {'W','i','n','e',0}; + WCHAR bufferW[256] = {0}; + HRESULT hr; + + PropVariantInit(&propvar); + propvar.vt = VT_EMPTY; + U(propvar).pwszVal = stringW; + bufferW[0] = 65; + hr = PropVariantToString(&propvar, bufferW, 0); + ok(hr == E_INVALIDARG, "PropVariantToString should fail: 0x%08x.\n", hr); + ok(!bufferW[0], "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_EMPTY; + U(propvar).pwszVal = stringW; + bufferW[0] = 65; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!bufferW[0], "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_NULL; + U(propvar).pwszVal = stringW; + bufferW[0] = 65; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!bufferW[0], "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 22; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + todo_wine ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + todo_wine ok(!strcmp_wa(bufferW, "22"), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_LPWSTR; + U(propvar).pwszVal = stringW; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!lstrcmpW(bufferW, stringW), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_LPSTR; + U(propvar).pszVal = string; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!strcmp_wa(bufferW, string), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_LPWSTR; + U(propvar).pwszVal = stringW; + hr = PropVariantToString(&propvar, bufferW, 1); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "PropVariantToString should fail: 0x%08x.\n", hr); + ok(!bufferW[0], "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(stringW); + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!lstrcmpW(bufferW, stringW), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + SysFreeString(propvar.u.bstrVal); + PropVariantClear(&propvar); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -1320,4 +1406,5 @@ START_TEST(propsys) test_PropVariantToStringWithDefault(); test_InitPropVariantFromCLSID(); test_PropVariantToDouble(); + test_PropVariantToString(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index 80f081cbc3..4fb12d87eb 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -79,6 +79,7 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); +HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); -- 2.19.2

1 0

[PATCH 06/11] mfplat: Implement IMFattributes::GetCount().
by Jactry Zeng 28 Dec '18

28 Dec '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 10 +++++++--- dlls/mfplat/tests/mfplat.c | 23 +++++++++++++---------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1d8b110a09..bc3b385b14 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -881,12 +881,16 @@ static HRESULT WINAPI mfattributes_GetCount(IMFAttributes *iface, UINT32 *items) { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %p\n", This, items); + TRACE("(%p, %p)\n", This, items); + EnterCriticalSection(&This->lock); + if(items) - *items = 0; + *items = list_count(&This->attributes); + + LeaveCriticalSection(&This->lock); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI mfattributes_GetItemByIndex(IMFAttributes *iface, UINT32 index, GUID *key, PROPVARIANT *value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7ae87c2fc1..01cb1a3377 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -408,28 +408,30 @@ static void test_MFCreateMediaEvent(void) IMFMediaEvent_Release(mediaevent); } +#define CHECK_COUNT(obj,expected) _check_count(obj, expected, __LINE__) +static void _check_count(IMFAttributes* obj, ULONG expected, int line) +{ + UINT32 count = 9999; + HRESULT hr; + hr = IMFAttributes_GetCount(obj, &count); + ok_(__FILE__,line)(hr == S_OK, "IMFAttributes_GetCount failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(count == expected, "got %d, expected %d.\n", count, expected); +} + static void test_MFCreateAttributes(void) { IMFAttributes *attributes; HRESULT hr; - UINT32 count; UINT32 uint32_value; UINT64 uint64_value; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); - - count = 88; - hr = IMFAttributes_GetCount(attributes, &count); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count == 0, "got %d\n", count); + CHECK_COUNT(attributes, 0); hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 123); ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: 0x%08x.\n", hr); - - hr = IMFAttributes_GetCount(attributes, &count); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(count == 1, "got %d\n", count); + CHECK_COUNT(attributes, 1); uint32_value = 0xdeadbeef; hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); @@ -443,6 +445,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); ok(hr == S_OK, "IMFAttributes_SetUINT64 failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 1); hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); ok(hr == S_OK, "IMFAttributes_GetUINT64 failed: 0x%08x.\n", hr); -- 2.19.2

1 0

[PATCH 03/11] propsys/tests: Add tests of IPropertyStore interface.
by Jactry Zeng 28 Dec '18

28 Dec '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/tests/propstore.c | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index a24d3e762b..e87787e947 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -34,6 +34,7 @@ #include "initguid.h" DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); +DEFINE_GUID(DUMMY_GUID1, 0x12345678, 0x1234,0x1234, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19); #define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) static void _expect_ref(IUnknown *obj, ULONG ref, int line) @@ -299,6 +300,64 @@ static void test_PSCreateMemoryPropertyStore(void) IPropertyStoreCache_Release(propstorecache); } +static void test_propertystore(void) +{ + IPropertyStore *propstore; + HRESULT hr; + PROPVARIANT propvar, ret_propvar; + PROPERTYKEY propkey; + DWORD count = 0; + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(!count, "got wrong property count: %d, expected 0.\n", count); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 123; + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + ret_propvar.vt = VT_I4; + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_I4, "got wrong property type: %x.\n", ret_propvar.vt); + ok(U(ret_propvar).lVal == 123, "got wrong value: %d, expected 123.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + PropVariantInit(&propvar); + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_EMPTY, "got wrong property type: %x.\n", ret_propvar.vt); + ok(!U(ret_propvar).lVal, "got wrong value: %d, expected 0.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + IPropertyStore_Release(propstore); +} + START_TEST(propstore) { CoInitialize(NULL); @@ -306,6 +365,7 @@ START_TEST(propstore) test_inmemorystore(); test_persistserialized(); test_PSCreateMemoryPropertyStore(); + test_propertystore(); CoUninitialize(); } -- 2.19.2

1 0