April 2016 - Wine-commits - list.winehq.org

Hans Leidekker : webservices/tests: Add service proxy tests.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: cdd2f163ca09be622e2d138f47b36888d712146b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd2f163ca09be622e2d138f4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 22 09:42:47 2016 +0200 webservices/tests: Add service proxy tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/Makefile.in | 1 + dlls/webservices/tests/proxy.c | 112 +++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/dlls/webservices/tests/Makefile.in b/dlls/webservices/tests/Makefile.in index 5f79fcb..66d82f8 100644 --- a/dlls/webservices/tests/Makefile.in +++ b/dlls/webservices/tests/Makefile.in @@ -3,5 +3,6 @@ IMPORTS = webservices C_SRCS = \ channel.c \ + proxy.c \ reader.c \ writer.c diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c new file mode 100644 index 0000000..ba0ecd3 --- /dev/null +++ b/dlls/webservices/tests/proxy.c @@ -0,0 +1,112 @@ +/* + * Copyright 2016 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#include "windows.h" +#include "webservices.h" +#include "wine/test.h" + +static void test_WsCreateServiceProxy(void) +{ + HRESULT hr; + WS_SERVICE_PROXY *proxy; + WS_SERVICE_PROXY_STATE state; + ULONG size, value; + + hr = WsCreateServiceProxy( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, NULL, + 0, NULL, 0, NULL, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + proxy = NULL; + hr = WsCreateServiceProxy( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, NULL, + 0, NULL, 0, &proxy, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + ok( proxy != NULL, "proxy not set\n" ); + + /* write-only property */ + value = 0xdeadbeef; + size = sizeof(value); + hr = WsGetServiceProxyProperty( proxy, WS_PROXY_PROPERTY_CALL_TIMEOUT, &value, size, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + state = 0xdeadbeef; + size = sizeof(state); + hr = WsGetServiceProxyProperty( proxy, WS_PROXY_PROPERTY_STATE, &state, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_SERVICE_PROXY_STATE_CREATED, "got %u\n", state ); + + WsFreeServiceProxy( proxy ); +} + +static void test_WsCreateServiceProxyFromTemplate(void) +{ + HRESULT hr; + WS_SERVICE_PROXY *proxy; + WS_HTTP_POLICY_DESCRIPTION policy; + + hr = WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE_REQUEST, NULL, 0, WS_HTTP_BINDING_TEMPLATE_TYPE, + NULL, 0, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE_REQUEST, NULL, 0, WS_HTTP_BINDING_TEMPLATE_TYPE, + NULL, 0, NULL, 0, &proxy, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + memset( &policy, 0, sizeof(policy) ); + proxy = NULL; + hr = WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE_REQUEST, NULL, 0, WS_HTTP_BINDING_TEMPLATE_TYPE, + NULL, 0, &policy, sizeof(policy), &proxy, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( proxy != NULL, "proxy not set\n" ); + + WsFreeServiceProxy( proxy ); +} + +static void test_WsOpenServiceProxy(void) +{ + WCHAR url[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t','/'}; + HRESULT hr; + WS_SERVICE_PROXY *proxy; + WS_HTTP_POLICY_DESCRIPTION policy; + WS_ENDPOINT_ADDRESS addr; + + memset( &policy, 0, sizeof(policy) ); + hr = WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE_REQUEST, NULL, 0, WS_HTTP_BINDING_TEMPLATE_TYPE, + NULL, 0, &policy, sizeof(policy), &proxy, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + addr.url.length = sizeof(url)/sizeof(url[0]); + addr.url.chars = url; + addr.headers = NULL; + addr.extensions = NULL; + addr.identity = NULL; + hr = WsOpenServiceProxy( proxy, &addr, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCloseServiceProxy( proxy , NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeServiceProxy( proxy ); +} + +START_TEST(proxy) +{ + test_WsCreateServiceProxy(); + test_WsCreateServiceProxyFromTemplate(); + test_WsOpenServiceProxy(); +}

1 0

Hugh McMaster : reg: Add initial 'query' support.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 3f62729b6ee128058c39be72ba215da48e0d8ed4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f62729b6ee128058c39be72b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 21 11:45:11 2016 +0000 reg: Add initial 'query' support. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index ea1ef19..f4fa28c 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -537,12 +537,33 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 0; } -static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, - BOOL subkey) +static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) { + WCHAR *p; + HKEY root; static const WCHAR stubW[] = {'S','T','U','B',' ','Q','U','E','R','Y',' ', '-',' ','%','1',' ','%','2',' ','%','3','!','d','!',' ','%','4','!','d','!','\n',0}; - output_string(stubW, key_name, value_name, value_empty, subkey); + + if (!sane_path(key_name)) + return 1; + + if (value_name && value_empty) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + + root = path_get_rootkey(key_name); + if (!root) + { + output_message(STRING_INVALID_KEY); + return 1; + } + + p = strchrW(key_name, '\\'); + if (p) p++; + + output_string(stubW, key_name, value_name, value_empty, recurse); return 1; } @@ -668,7 +689,7 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[1], queryW)) { WCHAR *key_name, *value_name = NULL; - BOOL value_empty = FALSE, subkey = FALSE; + BOOL value_empty = FALSE, recurse = FALSE; if (argc < 3) { @@ -696,9 +717,9 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashVEW)) value_empty = TRUE; else if (!lstrcmpiW(argvW[i], slashSW)) - subkey = TRUE; + recurse = TRUE; } - return reg_query(key_name, value_name, value_empty, subkey); + return reg_query(key_name, value_name, value_empty, recurse); } else {

1 0

Hugh McMaster : reg: Output value names when querying a registry key.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 3035599ad817474415a024e6b614f88ffecc94ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3035599ad817474415a024e6b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 21 11:45:21 2016 +0000 reg: Output value names when querying a registry key. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index f4fa28c..48e61bc 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -537,12 +537,60 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 0; } +static int query_all(HKEY key, WCHAR *path) +{ + LONG rc; + DWORD num_values, max_value_len, value_len; + DWORD i; + WCHAR fmt[] = {'%','1','\n',0}; + WCHAR fmt_value[] = {' ',' ',' ',' ','%','1',0}; + WCHAR *value_name; + WCHAR newlineW[] = {'\n',0}; + + rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, NULL, NULL, + &num_values, &max_value_len, NULL, NULL, NULL); + if (rc) + { + ERR("RegQueryInfoKey failed: %d\n", rc); + return 1; + } + + output_string(fmt, path); + + max_value_len++; + value_name = HeapAlloc(GetProcessHeap(), 0, max_value_len * sizeof(WCHAR)); + if (!value_name) + { + ERR("Failed to allocate memory for value_name\n"); + return 1; + } + + for (i = 0; i < num_values; i++) + { + value_len = max_value_len; + rc = RegEnumValueW(key, i, value_name, &value_len, NULL, NULL, NULL, NULL); + if (rc == ERROR_SUCCESS) + { + output_string(fmt_value, value_name); + output_string(newlineW); + } + } + + HeapFree(GetProcessHeap(), 0, value_name); + + if (num_values) + output_string(newlineW); + + return 0; +} + static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) { WCHAR *p; - HKEY root; + HKEY root, key; static const WCHAR stubW[] = {'S','T','U','B',' ','Q','U','E','R','Y',' ', '-',' ','%','1',' ','%','2',' ','%','3','!','d','!',' ','%','4','!','d','!','\n',0}; + int ret; if (!sane_path(key_name)) return 1; @@ -563,9 +611,23 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL p = strchrW(key_name, '\\'); if (p) p++; - output_string(stubW, key_name, value_name, value_empty, recurse); + if (RegOpenKeyExW(root, p, 0, KEY_READ, &key) != ERROR_SUCCESS) + { + output_message(STRING_CANNOT_FIND); + return 1; + } + + if (value_name || value_empty || recurse) + { + output_string(stubW, key_name, value_name, value_empty, recurse); + return 1; + } + + ret = query_all(key, key_name); + + RegCloseKey(key); - return 1; + return ret; } int wmain(int argc, WCHAR *argvW[])

1 0

Hugh McMaster : reg: Output a list of subkeys when querying a registry key.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 2bd12424c9c8f1619c3b639ca552590a2daf4289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bd12424c9c8f1619c3b639ca… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 21 11:45:33 2016 +0000 reg: Output a list of subkeys when querying a registry key. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 48e61bc..13e3b77 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -540,14 +540,16 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, static int query_all(HKEY key, WCHAR *path) { LONG rc; + DWORD num_subkeys, max_subkey_len, subkey_len; DWORD num_values, max_value_len, value_len; DWORD i; WCHAR fmt[] = {'%','1','\n',0}; WCHAR fmt_value[] = {' ',' ',' ',' ','%','1',0}; - WCHAR *value_name; + WCHAR fmt_path[] = {'%','1','\\','%','2','\n',0}; + WCHAR *value_name, *subkey_name; WCHAR newlineW[] = {'\n',0}; - rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, NULL, NULL, + rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, &num_subkeys, &max_subkey_len, NULL, &num_values, &max_value_len, NULL, NULL, NULL); if (rc) { @@ -581,6 +583,27 @@ static int query_all(HKEY key, WCHAR *path) if (num_values) output_string(newlineW); + max_subkey_len++; + subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)); + if (!subkey_name) + { + ERR("Failed to allocate memory for subkey_name\n"); + return 1; + } + + for (i = 0; i < num_subkeys; i++) + { + subkey_len = max_subkey_len; + rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); + if (rc == ERROR_SUCCESS) + output_string(fmt_path, path, subkey_name); + } + + HeapFree(GetProcessHeap(), 0, subkey_name); + + if (num_subkeys) + output_string(newlineW); + return 0; }

1 0

Hugh McMaster : reg: Output the value type when querying a registry key.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: a9b76d00579ba0c60c4cde5d83a2c5b238077c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9b76d00579ba0c60c4cde5d8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 21 11:45:44 2016 +0000 reg: Output the value type when querying a registry key. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 13e3b77..c0afd60 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -537,12 +537,24 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 0; } +static const WCHAR *reg_type_to_wchar(DWORD type) +{ + int i, array_size = ARRAY_SIZE(type_rels); + + for (i = 0; i < array_size; i++) + { + if (type == type_rels[i].type) + return type_rels[i].name; + } + return NULL; +} + static int query_all(HKEY key, WCHAR *path) { LONG rc; DWORD num_subkeys, max_subkey_len, subkey_len; DWORD num_values, max_value_len, value_len; - DWORD i; + DWORD i, type; WCHAR fmt[] = {'%','1','\n',0}; WCHAR fmt_value[] = {' ',' ',' ',' ','%','1',0}; WCHAR fmt_path[] = {'%','1','\\','%','2','\n',0}; @@ -570,10 +582,11 @@ static int query_all(HKEY key, WCHAR *path) for (i = 0; i < num_values; i++) { value_len = max_value_len; - rc = RegEnumValueW(key, i, value_name, &value_len, NULL, NULL, NULL, NULL); + rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, NULL, NULL); if (rc == ERROR_SUCCESS) { output_string(fmt_value, value_name); + output_string(fmt_value, reg_type_to_wchar(type)); output_string(newlineW); } }

1 0

Hugh McMaster : reg: Output the value name and type via a separate function.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 904275976707f7c5b0720c9f55909a3f04f1ca65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=904275976707f7c5b0720c9f5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 21 11:45:54 2016 +0000 reg: Output the value name and type via a separate function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index c0afd60..99651f6 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -549,6 +549,16 @@ static const WCHAR *reg_type_to_wchar(DWORD type) return NULL; } +static void output_value(const WCHAR *value_name, DWORD type) +{ + WCHAR fmt[] = {' ',' ',' ',' ','%','1',0}; + WCHAR newlineW[] = {'\n',0}; + + output_string(fmt, value_name); + output_string(fmt, reg_type_to_wchar(type)); + output_string(newlineW); +} + static int query_all(HKEY key, WCHAR *path) { LONG rc; @@ -556,7 +566,6 @@ static int query_all(HKEY key, WCHAR *path) DWORD num_values, max_value_len, value_len; DWORD i, type; WCHAR fmt[] = {'%','1','\n',0}; - WCHAR fmt_value[] = {' ',' ',' ',' ','%','1',0}; WCHAR fmt_path[] = {'%','1','\\','%','2','\n',0}; WCHAR *value_name, *subkey_name; WCHAR newlineW[] = {'\n',0}; @@ -584,11 +593,7 @@ static int query_all(HKEY key, WCHAR *path) value_len = max_value_len; rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, NULL, NULL); if (rc == ERROR_SUCCESS) - { - output_string(fmt_value, value_name); - output_string(fmt_value, reg_type_to_wchar(type)); - output_string(newlineW); - } + output_value(value_name, type); } HeapFree(GetProcessHeap(), 0, value_name);

1 0

Hugh McMaster : reg: Correctly output the default value name when querying the registry.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: bde6d0490e77a443dcff9a82286175cb5100d5f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde6d0490e77a443dcff9a822… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 21 11:46:05 2016 +0000 reg: Correctly output the default value name when querying the registry. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 99651f6..ff78e6c 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -554,7 +554,14 @@ static void output_value(const WCHAR *value_name, DWORD type) WCHAR fmt[] = {' ',' ',' ',' ','%','1',0}; WCHAR newlineW[] = {'\n',0}; - output_string(fmt, value_name); + if (value_name && value_name[0]) + output_string(fmt, value_name); + else + { + WCHAR defval[32]; + LoadStringW(GetModuleHandleW(NULL), STRING_DEFAULT_VALUE, defval, ARRAY_SIZE(defval)); + output_string(fmt, defval); + } output_string(fmt, reg_type_to_wchar(type)); output_string(newlineW); }

1 0

Hugh McMaster : reg: Output the data value when querying a registry key.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 6433fee87e761410c66a66d7644dba650e5356b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6433fee87e761410c66a66d76… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 21 11:46:15 2016 +0000 reg: Output the data value when querying a registry key. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 90 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index ff78e6c..6480f2c 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -537,6 +537,76 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 0; } +static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) +{ + WCHAR *buffer = NULL; + int i; + + switch (type) + { + case REG_SZ: + case REG_EXPAND_SZ: + buffer = HeapAlloc(GetProcessHeap(), 0, size_bytes); + strcpyW(buffer, (WCHAR *)src); + break; + case REG_NONE: + case REG_BINARY: + { + WCHAR *ptr; + WCHAR fmt[] = {'%','0','2','X',0}; + + buffer = HeapAlloc(GetProcessHeap(), 0, (size_bytes * 2 + 1) * sizeof(WCHAR)); + ptr = buffer; + for (i = 0; i < size_bytes; i++) + ptr += sprintfW(ptr, fmt, src[i]); + break; + } + case REG_DWORD: + /* case REG_DWORD_LITTLE_ENDIAN: */ + case REG_DWORD_BIG_ENDIAN: + { + const int zero_x_dword = 10; + WCHAR fmt[] = {'0','x','%','x',0}; + + buffer = HeapAlloc(GetProcessHeap(), 0, (zero_x_dword + 1) * sizeof(WCHAR)); + sprintfW(buffer, fmt, *(DWORD *)src); + break; + } + case REG_MULTI_SZ: + { + const int two_wchars = 2 * sizeof(WCHAR); + DWORD tmp_size; + const WCHAR *tmp = (const WCHAR *)src; + int len, destindex; + + if (size_bytes <= two_wchars) + { + buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)); + *buffer = 0; + return buffer; + } + + tmp_size = size_bytes - two_wchars; /* exclude both null terminators */ + buffer = HeapAlloc(GetProcessHeap(), 0, tmp_size * 2); + len = tmp_size / sizeof(WCHAR); + + for (i = 0, destindex = 0; i < len; i++, destindex++) + { + if (tmp[i]) + buffer[destindex] = tmp[i]; + else + { + buffer[destindex++] = '\\'; + buffer[destindex] = '0'; + } + } + buffer[destindex] = 0; + break; + } + } + return buffer; +} + static const WCHAR *reg_type_to_wchar(DWORD type) { int i, array_size = ARRAY_SIZE(type_rels); @@ -549,9 +619,10 @@ static const WCHAR *reg_type_to_wchar(DWORD type) return NULL; } -static void output_value(const WCHAR *value_name, DWORD type) +static void output_value(const WCHAR *value_name, DWORD type, BYTE *data, DWORD data_size) { WCHAR fmt[] = {' ',' ',' ',' ','%','1',0}; + WCHAR *reg_data; WCHAR newlineW[] = {'\n',0}; if (value_name && value_name[0]) @@ -563,6 +634,9 @@ static void output_value(const WCHAR *value_name, DWORD type) output_string(fmt, defval); } output_string(fmt, reg_type_to_wchar(type)); + reg_data = reg_data_to_wchar(type, data, data_size); + output_string(fmt, reg_data); + HeapFree(GetProcessHeap(), 0, reg_data); output_string(newlineW); } @@ -571,14 +645,16 @@ static int query_all(HKEY key, WCHAR *path) LONG rc; DWORD num_subkeys, max_subkey_len, subkey_len; DWORD num_values, max_value_len, value_len; + DWORD max_data_bytes, data_size; DWORD i, type; WCHAR fmt[] = {'%','1','\n',0}; WCHAR fmt_path[] = {'%','1','\\','%','2','\n',0}; WCHAR *value_name, *subkey_name; WCHAR newlineW[] = {'\n',0}; + BYTE *data; rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, &num_subkeys, &max_subkey_len, NULL, - &num_values, &max_value_len, NULL, NULL, NULL); + &num_values, &max_value_len, &max_data_bytes, NULL, NULL); if (rc) { ERR("RegQueryInfoKey failed: %d\n", rc); @@ -595,14 +671,24 @@ static int query_all(HKEY key, WCHAR *path) return 1; } + data = HeapAlloc(GetProcessHeap(), 0, max_data_bytes); + if (!data) + { + HeapFree(GetProcessHeap(), 0, value_name); + ERR("Failed to allocate memory for data\n"); + return 1; + } + for (i = 0; i < num_values; i++) { value_len = max_value_len; - rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, NULL, NULL); + data_size = max_data_bytes; + rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, data, &data_size); if (rc == ERROR_SUCCESS) - output_value(value_name, type); + output_value(value_name, type, data, data_size); } + HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, value_name); if (num_values)

1 0

Sebastian Lackner : wininet: Remove unused 'sync' argument from HTTPREQ_Read.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 076189c762a9c2b6c20d1bf55edb6e7a39fec984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=076189c762a9c2b6c20d1bf55… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 21 08:05:26 2016 +0200 wininet: Remove unused 'sync' argument from HTTPREQ_Read. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 143dc75..bdc659d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3036,7 +3036,7 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD } /* read data from the http connection (the read section must be held) */ -static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD *read, BOOL sync) +static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD *read) { DWORD current_read = 0, ret_read = 0; blocking_mode_t blocking_mode; @@ -3090,7 +3090,7 @@ static BOOL drain_content(http_request_t *req, BOOL blocking) DWORD bytes_read, res; BYTE buf[4096]; - res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read, TRUE); + res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read); if(res != ERROR_SUCCESS) { ret = FALSE; break; @@ -3114,7 +3114,7 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW if(hdr->dwError == INTERNET_HANDLE_IN_USE) hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; - res = HTTPREQ_Read(req, buffer, size, read, TRUE); + res = HTTPREQ_Read(req, buffer, size, read); if(res == ERROR_SUCCESS) res = hdr->dwError; LeaveCriticalSection( &req->read_section ); @@ -3137,7 +3137,7 @@ static void AsyncReadFileExProc(task_header_t *hdr) TRACE("INTERNETREADFILEEXW %p\n", task->hdr.hdr); - res = HTTPREQ_Read(req, task->buf, task->size, task->ret_read, TRUE); + res = HTTPREQ_Read(req, task->buf, task->size, task->ret_read); send_request_complete(req, res == ERROR_SUCCESS, res); } @@ -3161,7 +3161,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO { if (get_avail_data(req)) { - res = HTTPREQ_Read(req, buf, size, &read, FALSE); + res = HTTPREQ_Read(req, buf, size, &read); LeaveCriticalSection( &req->read_section ); goto done; } @@ -3187,7 +3187,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; while(1) { - res = HTTPREQ_Read(req, (char*)buf+read, size-read, &cread, !(flags & IRF_NO_WAIT)); + res = HTTPREQ_Read(req, (char*)buf+read, size-read, &cread); if(res != ERROR_SUCCESS) break;

1 0

Alistair Leslie-Hughes : inetcomm: Implement MimeOleGetPropertySchema.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 8599014c2dd2ad58b8d51e023ccfd71f4001e3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8599014c2dd2ad58b8d51e023… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 19 09:26:02 2016 +0000 inetcomm: Implement MimeOleGetPropertySchema. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 125 +++++++++++++++++++++++++++++++++++++++++- dlls/inetcomm/tests/mimeole.c | 12 ++++ 2 files changed, 135 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 8aebb38..7a0b5bf 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -115,6 +115,17 @@ static inline MimeBody *impl_from_IMimeBody(IMimeBody *iface) return CONTAINING_RECORD(iface, MimeBody, IMimeBody_iface); } +typedef struct propschema +{ + IMimePropertySchema IMimePropertySchema_iface; + LONG ref; +} propschema; + +static inline propschema *impl_from_IMimePropertySchema(IMimePropertySchema *iface) +{ + return CONTAINING_RECORD(iface, propschema, IMimePropertySchema_iface); +} + static LPSTR strdupA(LPCSTR str) { char *ret; @@ -3032,8 +3043,118 @@ HRESULT VirtualStream_create(IUnknown *outer, void **obj) return MimeOleCreateVirtualStream((IStream **)obj); } -HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema **schema) +/* IMimePropertySchema Interface */ +static HRESULT WINAPI propschema_QueryInterface(IMimePropertySchema *iface, REFIID riid, void **out) +{ + propschema *This = impl_from_IMimePropertySchema(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), out); + + *out = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IMimePropertySchema)) + { + *out = iface; + } + else + { + FIXME("no interface for %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IMimePropertySchema_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI propschema_AddRef(IMimePropertySchema *iface) +{ + propschema *This = impl_from_IMimePropertySchema(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI propschema_Release(IMimePropertySchema *iface) +{ + propschema *This = impl_from_IMimePropertySchema(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI propschema_RegisterProperty(IMimePropertySchema *iface, const char *name, DWORD flags, + DWORD rownumber, VARTYPE vtdefault, DWORD *propid) +{ + propschema *This = impl_from_IMimePropertySchema(iface); + FIXME("(%p)->(%s, %x, %d, %d, %p) stub\n", This, debugstr_a(name), flags, rownumber, vtdefault, propid); + return E_NOTIMPL; +} + +static HRESULT WINAPI propschema_ModifyProperty(IMimePropertySchema *iface, const char *name, DWORD flags, + DWORD rownumber, VARTYPE vtdefault) +{ + propschema *This = impl_from_IMimePropertySchema(iface); + FIXME("(%p)->(%s, %x, %d, %d) stub\n", This, debugstr_a(name), flags, rownumber, vtdefault); + return E_NOTIMPL; +} + +static HRESULT WINAPI propschema_GetPropertyId(IMimePropertySchema *iface, const char *name, DWORD *propid) +{ + propschema *This = impl_from_IMimePropertySchema(iface); + FIXME("(%p)->(%s, %p) stub\n", This, debugstr_a(name), propid); + return E_NOTIMPL; +} + +static HRESULT WINAPI propschema_GetPropertyName(IMimePropertySchema *iface, DWORD propid, char **name) +{ + propschema *This = impl_from_IMimePropertySchema(iface); + FIXME("(%p)->(%d, %p) stub\n", This, propid, name); + return E_NOTIMPL; +} + +static HRESULT WINAPI propschema_RegisterAddressType(IMimePropertySchema *iface, const char *name, DWORD *adrtype) { - FIXME("(%p) stub\n", schema); + propschema *This = impl_from_IMimePropertySchema(iface); + FIXME("(%p)->(%s, %p) stub\n", This, debugstr_a(name), adrtype); return E_NOTIMPL; } + +static IMimePropertySchemaVtbl prop_schema_vtbl = +{ + propschema_QueryInterface, + propschema_AddRef, + propschema_Release, + propschema_RegisterProperty, + propschema_ModifyProperty, + propschema_GetPropertyId, + propschema_GetPropertyName, + propschema_RegisterAddressType +}; + + +HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema **schema) +{ + propschema *This; + + TRACE("(%p) stub\n", schema); + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + + This->IMimePropertySchema_iface.lpVtbl = &prop_schema_vtbl; + This->ref = 1; + + *schema = &This->IMimePropertySchema_iface; + + return S_OK; +} diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 2b6dee2..3b70685 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -353,6 +353,17 @@ void test_BindToObject(void) IMimeMessage_Release(msg); } +static void test_MimeOleGetPropertySchema(void) +{ + HRESULT hr; + IMimePropertySchema *schema = NULL; + + hr = MimeOleGetPropertySchema(&schema); + ok(hr == S_OK, "ret %08x\n", hr); + + IMimePropertySchema_Release(schema); +} + START_TEST(mimeole) { OleInitialize(NULL); @@ -362,5 +373,6 @@ START_TEST(mimeole) test_Allocator(); test_CreateMessage(); test_BindToObject(); + test_MimeOleGetPropertySchema(); OleUninitialize(); }

1 0