June 2017 - Wine-commits - list.winehq.org

Jacek Caban : wininet: Moved INTERNET_STATUS_REDIRECT notification to HTTP_HandleRedirect.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 61e28c01c60cfe27f13a957ef940c36ef827c9b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61e28c01c60cfe27f13a957ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 15:36:35 2017 +0200 wininet: Moved INTERNET_STATUS_REDIRECT notification to HTTP_HandleRedirect. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 17a1919..e0bc55d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4039,27 +4039,33 @@ static WCHAR *get_redirect_url(http_request_t *request) /*********************************************************************** * HTTP_HandleRedirect (internal) */ -static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) +static DWORD HTTP_HandleRedirect(http_request_t *request, WCHAR *url) { + URL_COMPONENTSW urlComponents = { sizeof(urlComponents) }; http_session_t *session = request->session; - WCHAR *path; + size_t url_len = strlenW(url); - if(lpszUrl[0]=='/') + if(url[0] == '/') { /* if it's an absolute path, keep the same session info */ - path = heap_strdupW(lpszUrl); + urlComponents.lpszUrlPath = url; + urlComponents.dwUrlPathLength = url_len; } else { - URL_COMPONENTSW urlComponents = { sizeof(urlComponents) }; - BOOL custom_port = FALSE; - substr_t host; - urlComponents.dwHostNameLength = 1; urlComponents.dwUserNameLength = 1; urlComponents.dwUrlPathLength = 1; - if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) + if(!InternetCrackUrlW(url, url_len, 0, &urlComponents)) return INTERNET_GetLastError(); + } + + INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, + url, (url_len + 1) * sizeof(WCHAR)); + + if(urlComponents.dwHostNameLength) { + BOOL custom_port = FALSE; + substr_t host; if(urlComponents.nScheme == INTERNET_SCHEME_HTTP) { if(request->hdr.dwFlags & INTERNET_FLAG_SECURE) { @@ -4106,23 +4112,25 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) HTTP_ProcessHeader(request, hostW, request->server->host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); else HTTP_ProcessHeader(request, hostW, request->server->name, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); - - path = heap_strndupW(urlComponents.lpszUrlPath, urlComponents.dwUrlPathLength); } + heap_free(request->path); request->path = NULL; - if (*path) + if(urlComponents.dwUrlPathLength) { DWORD needed = 1; HRESULT rc; WCHAR dummy = 0; + WCHAR *path; + path = heap_strndupW(urlComponents.lpszUrlPath, urlComponents.dwUrlPathLength); rc = UrlEscapeW(path, &dummy, &needed, URL_ESCAPE_SPACES_ONLY); if (rc != E_POINTER) ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); request->path = heap_alloc(needed*sizeof(WCHAR)); rc = UrlEscapeW(path, request->path, &needed, URL_ESCAPE_SPACES_ONLY); + heap_free(path); if (rc != S_OK) { ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); @@ -4130,8 +4138,6 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) } } - heap_free(path); - /* Remove custom content-type/length headers on redirects. */ remove_header(request, szContent_Type, TRUE); remove_header(request, szContent_Length, TRUE); @@ -5040,8 +5046,6 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, request->verb = heap_strdupW(szGET); } http_release_netconn(request, drain_content(request, FALSE)); - INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, - new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); res = HTTP_HandleRedirect(request, new_url); heap_free(new_url); if (res == ERROR_SUCCESS) { @@ -5238,8 +5242,6 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ request->verb = heap_strdupW(szGET); } http_release_netconn(request, drain_content(request, FALSE)); - INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, - new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); res = HTTP_HandleRedirect(request, new_url); heap_free(new_url); if (res == ERROR_SUCCESS)

1 0

Jacek Caban : wininet: Return an error on redirect with no host name specified.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: cee99826b62b62acb7a8cf1ff32d27633c078e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee99826b62b62acb7a8cf1ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 15:36:50 2017 +0200 wininet: Return an error on redirect with no host name specified. Inspired by Michael Müller's patch. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 3 +++ dlls/wininet/tests/http.c | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e0bc55d..02f6609 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4058,6 +4058,9 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, WCHAR *url) urlComponents.dwUrlPathLength = 1; if(!InternetCrackUrlW(url, url_len, 0, &urlComponents)) return INTERNET_GetLastError(); + + if(!urlComponents.dwHostNameLength) + return ERROR_INTERNET_INVALID_URL; } INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index a3a0980..a2890d3 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5269,6 +5269,31 @@ static void test_redirect(int port) close_connection(); close_async_handle(req.session, 2); + trace("Test redirect to http URL with no host name...\n"); + + open_socket_request(port, &req); + + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + server_send_string("HTTP/1.1 302 Found\r\n" + "Server: winetest\r\n" + "Location: http:///nohost\r\n" + "Connection: keep-alive\r\n" + "Content-Length: 0\r\n" + "\r\n"); + + WaitForSingleObject(complete_event, INFINITE); + + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error == ERROR_INTERNET_INVALID_URL, "expected ERROR_INTERNET_INVALID_URL, got %u\n", req_error); + + sprintf(expect_url, "http://localhost:%u/socket", port); + test_request_url(req.request, expect_url); + test_status_code(req.request, 302); + + close_connection(); + close_async_handle(req.session, 2); + skip_receive_notification_tests = FALSE; }

1 0

Hugh McMaster : regedit: Free the buffer and reset data information on error and after setting the value.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 758340a6e1bc045fa4a7ba06b6da8e94243ee871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=758340a6e1bc045fa4a7ba06b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:47:16 2017 +0000 regedit: Free the buffer and reset data information on error and after setting the value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index bc488d3..d6ea5c7 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -758,6 +758,9 @@ static WCHAR *string_data_state(struct parser *parser, WCHAR *pos) return line; invalid: + parser->data = NULL; + parser->data_size = 0; + set_state(parser, LINE_START); return line; } @@ -781,6 +784,7 @@ static WCHAR *dword_data_state(struct parser *parser, WCHAR *pos) invalid: HeapFree(GetProcessHeap(), 0, parser->data); parser->data = NULL; + parser->data_size = 0; set_state(parser, LINE_START); return line; @@ -807,6 +811,10 @@ static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos) return line; invalid: + HeapFree(GetProcessHeap(), 0, parser->data); + parser->data = NULL; + parser->data_size = 0; + set_state(parser, LINE_START); return line; } @@ -827,10 +835,10 @@ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) parser->data, parser->data_size); if (parser->parse_type == REG_DWORD || parser->parse_type == REG_BINARY) - { HeapFree(GetProcessHeap(), 0, parser->data); - parser->data = NULL; - } + + parser->data = NULL; + parser->data_size = 0; if (parser->reg_version == REG_VERSION_31) set_state(parser, PARSE_WIN31_LINE);

1 0

Hugh McMaster : reg/tests: Separate Unicode import tests from the combined import tests.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 22f57c788837df566d7563e915208c712ac43f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f57c788837df566d7563e91… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:47:42 2017 +0000 reg/tests: Separate Unicode import tests from the combined import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index ba36d54..e23586c 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1836,8 +1836,16 @@ static void test_import(void) err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); +} + +static void test_unicode_import(void) +{ + DWORD r, dword = 0x123, type, size; + HKEY hkey, subkey; + LONG err; + char buffer[8]; + BYTE hex[8]; - /* Test file contents - Unicode */ test_import_wstr("REGEDIT\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); @@ -2984,6 +2992,13 @@ static void test_import_with_whitespace(void) err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", err); +} + +static void test_unicode_import_with_whitespace(void) +{ + HKEY hkey; + DWORD r, dword; + LONG err; test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); @@ -3139,5 +3154,7 @@ START_TEST(reg) test_query(); test_v_flags(); test_import(); + test_unicode_import(); test_import_with_whitespace(); + test_unicode_import_with_whitespace(); }

1 0

Hugh McMaster : reg/tests: Use verify_key() for consistency with the verify_reg*() functions.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: ceebbfc1ca75f002973c94bf955555f312efef65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceebbfc1ca75f002973c94bf9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:47:52 2017 +0000 reg/tests: Use verify_key() for consistency with the verify_reg*() functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e23586c..1161914 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -91,8 +91,8 @@ static void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) (value && *value) ? value : "(Default)", err); } -#define verify_key_exist(k,s) verify_key_exist_(__LINE__,k,s) -static void verify_key_exist_(unsigned line, HKEY key_base, const char *subkey) +#define verify_key(k,s) verify_key_(__LINE__,k,s) +static void verify_key_(unsigned line, HKEY key_base, const char *subkey) { HKEY hkey; LONG err; @@ -1643,14 +1643,14 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey1c "); + todo_wine verify_key(hkey, "Subkey1c "); err = RegDeleteKeyA(hkey, "Subkey1c "); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey1d\t"); + todo_wine verify_key(hkey, "Subkey1d\t"); err = RegDeleteKeyA(hkey, "Subkey1d\t"); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -1659,28 +1659,28 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_str("REGEDIT4\n\n" "[ -HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2a"); test_import_str("REGEDIT4\n\n" "[\t-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_str("REGEDIT4\n\n" "[- HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2a"); test_import_str("REGEDIT4\n\n" "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_str("REGEDIT4\n\n" "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" @@ -1694,8 +1694,8 @@ static void test_import(void) "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey3a"); - todo_wine verify_key_exist(hkey, "Subkey3b"); + todo_wine verify_key(hkey, "Subkey3a"); + todo_wine verify_key(hkey, "Subkey3b"); test_import_str("REGEDIT4\n\n" "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" @@ -2649,14 +2649,14 @@ static void test_unicode_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey1c "); + todo_wine verify_key(hkey, "Subkey1c "); todo_wine err = RegDeleteKeyA(hkey, "Subkey1c "); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey1d\t"); + todo_wine verify_key(hkey, "Subkey1d\t"); todo_wine err = RegDeleteKeyA(hkey, "Subkey1d\t"); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2665,28 +2665,28 @@ static void test_unicode_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[ -HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2a"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[\t-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[- HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2a"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" @@ -2700,8 +2700,8 @@ static void test_unicode_import(void) "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey3a"); - todo_wine verify_key_exist(hkey, "Subkey3b"); + todo_wine verify_key(hkey, "Subkey3a"); + todo_wine verify_key(hkey, "Subkey3b"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n"

1 0

Hugh McMaster : reg/tests: Use the verify_key*() functions where possible.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: e8b260f02a6ced08dbb63b3b1d30171b82d1895d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b260f02a6ced08dbb63b3b1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:48:01 2017 +0000 reg/tests: Use the verify_key*() functions where possible. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 1161914..6262635 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -120,7 +120,7 @@ static void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subke static void test_add(void) { - HKEY hkey, subkey; + HKEY hkey; LONG err; DWORD r, dword, type, size; char buffer[22]; @@ -134,8 +134,7 @@ static void test_add(void) err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -167,18 +166,14 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest3\\ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3", 0, KEY_READ, &subkey); - ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); - RegCloseKey(subkey); - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3"); + verify_key(hkey, "keytest3"); + err = RegDeleteKeyA(hkey, "keytest3"); ok(err == ERROR_SUCCESS, "got exit code %d\n", err); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest4 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4", 0, KEY_READ, &subkey); - ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); - RegCloseKey(subkey); - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4"); + verify_key(hkey, "keytest4"); + err = RegDeleteKeyA(hkey, "keytest4"); ok(err == ERROR_SUCCESS, "got exit code %d\n", err); /* REG_NONE */ @@ -545,15 +540,13 @@ static void test_delete(void) run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg_nonexist(hkey, "foo"); - err = RegOpenKeyExA(hkey, "subkey", 0, KEY_READ, &hsubkey); - ok(err == ERROR_SUCCESS, "got %d\n", err); - RegCloseKey(hsubkey); + verify_key(hkey, "subkey"); + RegCloseKey(hkey); run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); @@ -1435,15 +1428,13 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\\n" "Subkey1]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(hkey, "Subkey1", 0, KEY_READ, &subkey); - todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + todo_wine verify_key_nonexist(hkey, "Subkey1"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\n" "\\Subkey2]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(hkey, "Subkey2", 0, KEY_READ, &subkey); - todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + todo_wine verify_key_nonexist(hkey, "Subkey2"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2441,15 +2432,13 @@ static void test_unicode_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\\n" "Subkey1]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(hkey, "Subkey1", 0, KEY_READ, &subkey); - todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + todo_wine verify_key_nonexist(hkey, "Subkey1"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\n" "\\Subkey2]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(hkey, "Subkey2", 0, KEY_READ, &subkey); - todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + todo_wine verify_key_nonexist(hkey, "Subkey2"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : regedit/tests: Use verify_key() for consistency with the verify_reg*() functions.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: f0e21863c9811407ce85d0ce99c155678f0d7933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e21863c9811407ce85d0ce9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:48:10 2017 +0000 regedit/tests: Use verify_key() for consistency with the verify_reg*() functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 0cb2959..bc2fe46 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -160,8 +160,8 @@ static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *value_nam (value_name && *value_name) ? value_name : "(Default)", lr); } -#define verify_key_exist(k,s) verify_key_exist_(__LINE__,k,s) -static void verify_key_exist_(unsigned line, HKEY key_base, const char *subkey) +#define verify_key(k,s) verify_key_(__LINE__,k,s) +static void verify_key_(unsigned line, HKEY key_base, const char *subkey) { HKEY hkey; LONG lr; @@ -1256,13 +1256,13 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n"); - verify_key_exist(hkey, "Subkey1c "); + verify_key(hkey, "Subkey1c "); lr = RegDeleteKeyA(hkey, "Subkey1c "); ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n"); - verify_key_exist(hkey, "Subkey1d\t"); + verify_key(hkey, "Subkey1d\t"); lr = RegDeleteKeyA(hkey, "Subkey1d\t"); ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); @@ -1270,24 +1270,24 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n"); - verify_key_exist(hkey, "Subkey2a"); - verify_key_exist(hkey, "Subkey2b"); + verify_key(hkey, "Subkey2a"); + verify_key(hkey, "Subkey2b"); exec_import_str("REGEDIT4\n\n" "[ -HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n"); - verify_key_exist(hkey, "Subkey2a"); + verify_key(hkey, "Subkey2a"); exec_import_str("REGEDIT4\n\n" "[\t-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n"); - verify_key_exist(hkey, "Subkey2b"); + verify_key(hkey, "Subkey2b"); exec_import_str("REGEDIT4\n\n" "[- HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n"); - verify_key_exist(hkey, "Subkey2a"); + verify_key(hkey, "Subkey2a"); exec_import_str("REGEDIT4\n\n" "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n"); - verify_key_exist(hkey, "Subkey2b"); + verify_key(hkey, "Subkey2b"); exec_import_str("REGEDIT4\n\n" "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" @@ -1299,8 +1299,8 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n"); - verify_key_exist(hkey, "Subkey3a"); - verify_key_exist(hkey, "Subkey3b"); + verify_key(hkey, "Subkey3a"); + verify_key(hkey, "Subkey3b"); exec_import_str("REGEDIT4\n\n" "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n"

1 0

Hugh McMaster : regedit/tests: Use the verify_key*() functions where possible.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 73af2479c7107f6157cabdd24dc1e0fe47fbbb1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=73af2479c7107f6157cabdd24… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:48:19 2017 +0000 regedit/tests: Use the verify_key*() functions where possible. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index bc2fe46..83fe725 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -550,7 +550,7 @@ static void test_basic_import_31(void) static void test_invalid_import(void) { LONG lr; - HKEY hkey, subkey; + HKEY hkey; lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); @@ -725,14 +725,12 @@ static void test_invalid_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\\n" "Subkey1]\n"); - lr = RegOpenKeyExA(hkey, "Subkey1", 0, KEY_READ, &subkey); - ok(lr == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", lr); + verify_key_nonexist(hkey, "Subkey1"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\n" "\\Subkey2]\n"); - lr = RegOpenKeyExA(hkey, "Subkey2", 0, KEY_READ, &subkey); - ok(lr == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", lr); + verify_key_nonexist(hkey, "Subkey2"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Dmitry Timoshkov : windowscodecs: Use PropVariantCompareEx to compare metadata items.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 3059668de3ded265ab8919702cd2b8eb1e42049d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3059668de3ded265ab8919702… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 22 11:38:51 2017 +0800 windowscodecs: Use PropVariantCompareEx to compare metadata items. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 2 +- dlls/windowscodecs/metadatahandler.c | 67 +++--------------------------------- 2 files changed, 5 insertions(+), 64 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 78e2059..3505e80 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -1,6 +1,6 @@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs -IMPORTS = uuid ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32 +IMPORTS = uuid ole32 oleaut32 propsys rpcrt4 shlwapi user32 gdi32 advapi32 EXTRAINCL = $(JPEG_CFLAGS) $(PNG_CFLAGS) $(TIFF_CFLAGS) EXTRALIBS = $(APPLICATIONSERVICES_LIBS) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 10f9f06..cdd7420 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "winternl.h" #include "objbase.h" +#include "propvarutil.h" #include "wincodecs_private.h" @@ -211,66 +212,6 @@ static HRESULT WINAPI MetadataHandler_GetValueByIndex(IWICMetadataWriter *iface, return hr; } -static BOOL get_int_value(const PROPVARIANT *pv, LONGLONG *value) -{ - switch (pv->vt) - { - case VT_NULL: - case VT_EMPTY: - *value = 0; - break; - case VT_I1: - *value = pv->u.cVal; - break; - case VT_UI1: - *value = pv->u.bVal; - break; - case VT_I2: - *value = pv->u.iVal; - break; - case VT_UI2: - *value = pv->u.uiVal; - break; - case VT_I4: - *value = pv->u.lVal; - break; - case VT_UI4: - *value = pv->u.ulVal; - break; - case VT_I8: - case VT_UI8: - *value = pv->u.hVal.QuadPart; - break; - default: - FIXME("not supported variant type %d\n", pv->vt); - return FALSE; - } - return TRUE; -} - -/* FiXME: Use propsys.PropVariantCompareEx once it's implemented */ -static int propvar_cmp(const PROPVARIANT *v1, const PROPVARIANT *v2) -{ - LONGLONG value1, value2; - - if (v1->vt == VT_LPSTR && v2->vt == VT_LPSTR) - { - return lstrcmpA(v1->u.pszVal, v2->u.pszVal); - } - - if (v1->vt == VT_LPWSTR && v2->vt == VT_LPWSTR) - { - return lstrcmpiW(v1->u.pwszVal, v2->u.pwszVal); - } - - if (!get_int_value(v1, &value1)) return -1; - if (!get_int_value(v2, &value2)) return -1; - - value1 -= value2; - if (value1) return value1 < 0 ? -1 : 1; - return 0; -} - static HRESULT WINAPI MetadataHandler_GetValue(IWICMetadataWriter *iface, const PROPVARIANT *schema, const PROPVARIANT *id, PROPVARIANT *value) { @@ -278,7 +219,7 @@ static HRESULT WINAPI MetadataHandler_GetValue(IWICMetadataWriter *iface, HRESULT hr = WINCODEC_ERR_PROPERTYNOTFOUND; MetadataHandler *This = impl_from_IWICMetadataWriter(iface); - TRACE("(%p,%p,%p,%p)\n", iface, schema, id, value); + TRACE("(%p,%s,%s,%p)\n", iface, wine_dbgstr_variant((const VARIANT *)schema), wine_dbgstr_variant((const VARIANT *)id), value); if (!id) return E_INVALIDARG; @@ -288,10 +229,10 @@ static HRESULT WINAPI MetadataHandler_GetValue(IWICMetadataWriter *iface, { if (schema && This->items[i].schema.vt != VT_EMPTY) { - if (propvar_cmp(schema, &This->items[i].schema) != 0) continue; + if (PropVariantCompareEx(schema, &This->items[i].schema, 0, PVCF_USESTRCMPI) != 0) continue; } - if (propvar_cmp(id, &This->items[i].id) != 0) continue; + if (PropVariantCompareEx(id, &This->items[i].id, 0, PVCF_USESTRCMPI) != 0) continue; hr = value ? PropVariantCopy(value, &This->items[i].value) : S_OK; break;

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICMetadataQueryReader:: GetLocation.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: c94bf3cf277969ed61170234b9d48ea7e86645d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94bf3cf277969ed61170234b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 22 11:38:56 2017 +0800 windowscodecs: Implement IWICMetadataQueryReader::GetLocation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/gifformat.c | 2 +- dlls/windowscodecs/imgfactory.c | 2 +- dlls/windowscodecs/jpegformat.c | 2 +- dlls/windowscodecs/metadataquery.c | 35 +++++++++++++++++++++++++++------- dlls/windowscodecs/pngformat.c | 2 +- dlls/windowscodecs/tiffformat.c | 2 +- dlls/windowscodecs/wincodecs_private.h | 15 ++++++++++++--- 7 files changed, 45 insertions(+), 15 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index d24db25..01ef089 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -821,7 +821,7 @@ static HRESULT WINAPI GifFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDecod if (!ppIMetadataQueryReader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI GifFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index bf63494..e1bcc89 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -1101,7 +1101,7 @@ static HRESULT WINAPI ComponentFactory_CreateQueryReaderFromBlockReader(IWICComp if (!block_reader || !query_reader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(block_reader, query_reader); + return MetadataQueryReader_CreateInstance(block_reader, NULL, query_reader); } static HRESULT WINAPI ComponentFactory_CreateQueryWriterFromBlockWriter(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index b7998be..acc262e 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -695,7 +695,7 @@ static HRESULT WINAPI JpegDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDe if (!ppIMetadataQueryReader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI JpegDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 29df42e..0b7eb6c 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -35,10 +35,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct { IWICMetadataQueryReader IWICMetadataQueryReader_iface; - LONG ref; - IWICMetadataBlockReader *block; + WCHAR *root; } QueryReader; static inline QueryReader *impl_from_IWICMetadataQueryReader(IWICMetadataQueryReader *iface) @@ -84,6 +83,7 @@ static ULONG WINAPI mqr_Release(IWICMetadataQueryReader *iface) if (!ref) { IWICMetadataBlockReader_Release(This->block); + HeapFree(GetProcessHeap(), 0, This->root); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -98,12 +98,31 @@ static HRESULT WINAPI mqr_GetContainerFormat(IWICMetadataQueryReader *iface, GUI return IWICMetadataBlockReader_GetContainerFormat(This->block, format); } -static HRESULT WINAPI mqr_GetLocation(IWICMetadataQueryReader *iface, - UINT cchMaxLength, WCHAR *wzNamespace, UINT *pcchActualLength) +static HRESULT WINAPI mqr_GetLocation(IWICMetadataQueryReader *iface, UINT len, WCHAR *location, UINT *ret_len) { + static const WCHAR rootW[] = { '/',0 }; QueryReader *This = impl_from_IWICMetadataQueryReader(iface); - FIXME("(%p,%u,%p,%p)\n", This, cchMaxLength, wzNamespace, pcchActualLength); - return E_NOTIMPL; + const WCHAR *root; + UINT actual_len; + + TRACE("(%p,%u,%p,%p)\n", This, len, location, ret_len); + + if (!ret_len) return E_INVALIDARG; + + root = This->root ? This->root : rootW; + actual_len = lstrlenW(root) + 1; + + if (location) + { + if (len < actual_len) + return WINCODEC_ERR_INSUFFICIENTBUFFER; + + memcpy(location, root, actual_len * sizeof(WCHAR)); + } + + *ret_len = actual_len; + + return S_OK; } static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, @@ -132,7 +151,7 @@ static IWICMetadataQueryReaderVtbl mqr_vtbl = { mqr_GetEnumerator }; -HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, IWICMetadataQueryReader **out) +HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, const WCHAR *root, IWICMetadataQueryReader **out) { QueryReader *obj; @@ -146,6 +165,8 @@ HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, IWICMet IWICMetadataBlockReader_AddRef(mbr); obj->block = mbr; + obj->root = root ? heap_strdupW(root) : NULL; + *out = &obj->IWICMetadataQueryReader_iface; return S_OK; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index c98a6a7..e8325c7 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1105,7 +1105,7 @@ static HRESULT WINAPI PngDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDec if (!ppIMetadataQueryReader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index b39bcac..b613409 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1172,7 +1172,7 @@ static HRESULT WINAPI TiffFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDeco if (!ppIMetadataQueryReader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI TiffFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index a8af0d6..2249c13 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -21,6 +21,7 @@ #include "wincodec.h" #include "wincodecsdk.h" +#include "wine/unicode.h" DEFINE_GUID(CLSID_WineTgaDecoder, 0xb11fc79a,0x67cc,0x43e6,0xa9,0xce,0xe3,0xd5,0x49,0x45,0xd3,0x04); @@ -162,9 +163,17 @@ extern HRESULT IMDReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT GCEReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT APEReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT GifCommentReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; - -extern HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, IWICMetadataQueryReader **out) DECLSPEC_HIDDEN; - +extern HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *, const WCHAR *, IWICMetadataQueryReader **) DECLSPEC_HIDDEN; extern HRESULT stream_initialize_from_filehandle(IWICStream *iface, HANDLE hfile) DECLSPEC_HIDDEN; +static inline WCHAR *heap_strdupW(const WCHAR *src) +{ + WCHAR *dst; + SIZE_T len; + if (!src) return NULL; + len = (strlenW(src) + 1) * sizeof(WCHAR); + if ((dst = HeapAlloc(GetProcessHeap(), 0, len))) memcpy(dst, src, len); + return dst; +} + #endif /* WINCODECS_PRIVATE_H */

1 0