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

Józef Kucia : wined3d: Add few missing enum values to debug_fbostatus().
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 4e38c3988e30b9b6ff08332133e4a079d081a644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e38c3988e30b9b6ff0833213… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 22 11:18:45 2016 +0200 wined3d: Add few missing enum values to debug_fbostatus(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 341e12b..c7bf5bb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4099,6 +4099,8 @@ const char *debug_fbostatus(GLenum status) { FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE); + FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS); + FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_UNSUPPORTED); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_UNDEFINED); #undef FBOSTATUS_TO_STR

1 0

Nikolay Sivov : d3dx10: Implement D3DX10GetFeatureLevel1().
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: ef36a25aec33670cd2099e4bce379bd6e2ac42a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef36a25aec33670cd2099e4bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 21 21:24:45 2016 +0300 d3dx10: Implement D3DX10GetFeatureLevel1(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/Makefile.in | 2 +- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 7 +++++++ include/d3dx10core.idl | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 6e67a6b..9338aca 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 -IMPORTS = d3d10_1 +IMPORTS = d3d10_1 dxguid C_SRCS = \ d3dx10_43_main.c diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 53059bf..7bfd9f3 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -48,7 +48,7 @@ @ stub D3DX10CreateTextureFromResourceA(ptr long str ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr) @ stub D3DX10FilterTexture(ptr long long) -@ stub D3DX10GetFeatureLevel1(ptr ptr) +@ stdcall D3DX10GetFeatureLevel1(ptr ptr) @ stub D3DX10GetImageInfoFromFileA(str ptr ptr ptr) @ stub D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr) @ stub D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 1b60fc5..b28d562 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -142,3 +142,10 @@ HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive return hr; } + +HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1) +{ + TRACE("device %p, device1 %p.\n", device, device1); + + return ID3D10Device_QueryInterface(device, &IID_ID3D10Device1, (void **)device1); +} diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index 6d9927e..524b9ee 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -68,3 +68,4 @@ interface ID3DX10ThreadPump : IUnknown cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);") cpp_quote("HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") cpp_quote(" HMODULE swrast, unsigned int flags, ID3D10Device **device);") +cpp_quote("HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1);")

1 0

Józef Kucia : wined3d: Print correct resource type in FIXME() message.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: cb66c6390dcea73be6118b9693cc94a09e310ed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb66c6390dcea73be6118b969… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 22 11:18:43 2016 +0200 wined3d: Print correct resource type in FIXME() message. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index cea5e5a..474cace 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1860,7 +1860,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont default: sampler_type = "unsupported_sampler"; - FIXME("Unhandled resource type %#x.\n", reg_maps->resource_info[i].type); + FIXME("Unhandled resource type %#x.\n", reg_maps->resource_info[entry->resource_idx].type); break; } shader_addline(buffer, "uniform %s%s %s_sampler%u;\n",

1 0

Hans Leidekker : webservices: Implement WsCreateServiceProxyFromTemplate.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: a04361f9bda55179a17c04bc46e989642fbfaa64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04361f9bda55179a17c04bc4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 22 09:42:44 2016 +0200 webservices: Implement WsCreateServiceProxyFromTemplate. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/proxy.c | 60 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index b0c09f5..1563ac9 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -122,6 +122,66 @@ HRESULT WINAPI WsCreateServiceProxy( const WS_CHANNEL_TYPE type, const WS_CHANNE } /************************************************************************** + * WsCreateServiceProxyFromTemplate [webservices.@] + */ +HRESULT WINAPI WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE channel_type, + const WS_PROXY_PROPERTY *properties, const ULONG count, + WS_BINDING_TEMPLATE_TYPE type, void *value, ULONG size, + const void *desc, ULONG desc_size, WS_SERVICE_PROXY **handle, + WS_ERROR *error ) +{ + const WS_CHANNEL_PROPERTY *channel_props = NULL; + ULONG channel_props_count = 0; + WS_CHANNEL_BINDING binding; + struct channel *channel; + HRESULT hr; + + TRACE( "%u %p %u %u %p %u %p %u %p %p\n", channel_type, properties, count, type, value, size, desc, + desc_size, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!desc || !handle) return E_INVALIDARG; + FIXME( "ignoring description\n" ); + + switch (type) + { + case WS_HTTP_BINDING_TEMPLATE_TYPE: + { + WS_HTTP_BINDING_TEMPLATE *http = value; + if (http) + { + channel_props = http->channelProperties.properties; + channel_props_count = http->channelProperties.propertyCount; + } + binding = WS_HTTP_CHANNEL_BINDING; + break; + } + case WS_HTTP_SSL_BINDING_TEMPLATE_TYPE: + { + WS_HTTP_SSL_BINDING_TEMPLATE *https = value; + if (https) + { + channel_props = https->channelProperties.properties; + channel_props_count = https->channelProperties.propertyCount; + } + binding = WS_HTTP_CHANNEL_BINDING; + break; + } + default: + FIXME( "template type %u not implemented\n", type ); + return E_NOTIMPL; + } + + if ((hr = create_channel( type, binding, channel_props, channel_props_count, &channel )) != S_OK) + return hr; + + if ((hr = create_proxy( channel, properties, count, handle )) != S_OK) + free_channel( channel ); + + return hr; +} + +/************************************************************************** * WsFreeServiceProxy [webservices.@] */ void WINAPI WsFreeServiceProxy( WS_SERVICE_PROXY *handle ) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 81c7c87..b39f715 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -33,7 +33,7 @@ @ stub WsCreateServiceEndpointFromTemplate @ stub WsCreateServiceHost @ stdcall WsCreateServiceProxy(long long ptr ptr long ptr long ptr ptr) -@ stub WsCreateServiceProxyFromTemplate +@ stdcall WsCreateServiceProxyFromTemplate(long ptr long long ptr long ptr long ptr ptr) @ stdcall WsCreateWriter(ptr long ptr ptr) @ stdcall WsCreateXmlBuffer(ptr ptr long ptr ptr) @ stub WsCreateXmlSecurityToken

1 0

Alistair Leslie-Hughes : inetcomm/tests: Add IMimeMessage SetOption tests.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 00558c29544167365936f55931bbe217189b4914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00558c29544167365936f5593… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 19 09:26:33 2016 +0000 inetcomm/tests: Add IMimeMessage SetOption tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 63 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 3b70685..bd90a80 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -332,6 +332,68 @@ static void test_CreateMessage(void) IStream_Release(stream); } +static void test_MessageOptions(void) +{ + static const char string[] = "XXXXX"; + static const char zero[] = "0"; + HRESULT hr; + IMimeMessage *msg; + PROPVARIANT prop; + + hr = MimeOleCreateMessage(NULL, &msg); + ok(hr == S_OK, "ret %08x\n", hr); + + PropVariantInit(&prop); + + prop.vt = VT_BOOL; + prop.u.boolVal = TRUE; + hr = IMimeMessage_SetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + PropVariantClear(&prop); + + hr = IMimeMessage_GetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); + todo_wine ok(hr == S_OK, "ret %08x\n", hr); + todo_wine ok(prop.vt == VT_BOOL, "vt %08x\n", prop.vt); + todo_wine ok(prop.u.boolVal == TRUE, "Hide Attachments got %d\n", prop.u.boolVal); + PropVariantClear(&prop); + + prop.vt = VT_LPSTR; + prop.u.pszVal = CoTaskMemAlloc(strlen(string)+1); + strcpy(prop.u.pszVal, string); + hr = IMimeMessage_SetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); + todo_wine ok(hr == S_OK, "ret %08x\n", hr); + PropVariantClear(&prop); + + hr = IMimeMessage_GetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); + todo_wine ok(hr == S_OK, "ret %08x\n", hr); + todo_wine ok(prop.vt == VT_BOOL, "vt %08x\n", prop.vt); + todo_wine ok(prop.u.boolVal == TRUE, "Hide Attachments got %d\n", prop.u.boolVal); + PropVariantClear(&prop); + + /* Invalid property type doesn't change the value */ + prop.vt = VT_LPSTR; + prop.u.pszVal = CoTaskMemAlloc(strlen(zero)+1); + strcpy(prop.u.pszVal, zero); + hr = IMimeMessage_SetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); + todo_wine ok(hr == S_OK, "ret %08x\n", hr); + PropVariantClear(&prop); + + hr = IMimeMessage_GetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); + todo_wine ok(hr == S_OK, "ret %08x\n", hr); + todo_wine ok(prop.vt == VT_BOOL, "vt %08x\n", prop.vt); + todo_wine ok(prop.u.boolVal == TRUE, "Hide Attachments got %d\n", prop.u.boolVal); + PropVariantClear(&prop); + + /* Invalid OID */ + prop.vt = VT_BOOL; + prop.u.boolVal = TRUE; + hr = IMimeMessage_SetOption(msg, 0xff00000a, &prop); + todo_wine ok(hr == MIME_E_INVALID_OPTION_ID, "ret %08x\n", hr); + PropVariantClear(&prop); + + IMimeMessage_Release(msg); +} + void test_BindToObject(void) { HRESULT hr; @@ -372,6 +434,7 @@ START_TEST(mimeole) test_CreateBody(); test_Allocator(); test_CreateMessage(); + test_MessageOptions(); test_BindToObject(); test_MimeOleGetPropertySchema(); OleUninitialize();

1 0

Alistair Leslie-Hughes : mimeole.idl: Add more MIME_E defines.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 84cf8ca09625a4e7c829083f9dddfde001d654ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=84cf8ca09625a4e7c829083f9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 19 09:26:22 2016 +0000 mimeole.idl: Add more MIME_E defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mimeole.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/mimeole.idl b/include/mimeole.idl index 8f8a524..bc1f3ac 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -48,6 +48,23 @@ cpp_quote("#define MIME_E_INVALID_HANDLE 0x800cce09") cpp_quote("#define MIME_E_CHARSET_TRANSLATE 0x800cce0a") cpp_quote("#define MIME_E_NOT_INITIALIZED 0x800cce0b") +cpp_quote("#define MIME_E_INVALID_OPTION_VALUE 0x800cce1f") +cpp_quote("#define MIME_E_INVALID_OPTION_ID 0x800cce20") +cpp_quote("#define MIME_E_INVALID_HEADER_NAME 0x800cce21") +cpp_quote("#define MIME_E_NOT_BOUND 0x800cce22") +cpp_quote("#define MIME_E_MAX_SIZE_TOO_SMALL 0x800cce23") +cpp_quote("#define MIME_E_MULTIPART_HAS_CHILDREN 0x800cce25") +cpp_quote("#define MIME_E_INVALID_PROP_FLAGS 0x800cce26") +cpp_quote("#define MIME_E_INVALID_ADDRESS_TYPE 0x800cce27") +cpp_quote("#define MIME_E_INVALID_OBJECT_IID 0x800cce28") +cpp_quote("#define MIME_E_MLANG_DLL_NOT_FOUND 0x800cce29") +cpp_quote("#define MIME_E_ROOT_NOT_EMPTY 0x800cce2a") +cpp_quote("#define MIME_E_MLANG_BAD_DLL 0x800cce2b") +cpp_quote("#define MIME_E_REG_OPEN_KEY 0x800cce2c") +cpp_quote("#define MIME_E_INVALID_INET_DATE 0x800cce2d") +cpp_quote("#define MIME_E_INVALID_BODYTYPE 0x800cce2e") +cpp_quote("#define MIME_E_INVALID_DELETE_TYPE 0x800cce2f") +cpp_quote("#define MIME_E_OPTION_HAS_NO_VALUE 0x800cce30") cpp_quote("#define MIME_E_INVALID_CHARSET_TYPE 0x800cce31") cpp_quote("#define MIME_E_INVALID_TEXT_TYPE 0x800cce38")

1 0

Hugh McMaster : reg: Output the data value when querying a registry key.
by Alexandre Julliard April 22, 2016

April 22, 2016

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

Hugh McMaster : reg: Correctly output the default value name when querying the registry.
by Alexandre Julliard April 22, 2016

April 22, 2016

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 value type when querying a registry key.
by Alexandre Julliard April 22, 2016

April 22, 2016

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

Hans Leidekker : webservices/tests: Add service proxy tests.
by Alexandre Julliard April 22, 2016

April 22, 2016

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