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

Hugh McMaster : reg: Output the value name and type via a separate function.
by Alexandre Julliard April 22, 2016

April 22, 2016

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

Józef Kucia : dxgi: Trace requested feature levels.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 7402e8116c20496375a15506f56159a4b3b9edde URL: http://source.winehq.org/git/wine.git/?a=commit;h=7402e8116c20496375a15506f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 22 11:18:42 2016 +0200 dxgi: Trace requested feature levels. 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/dxgi/dxgi_main.c | 16 ++++++++++------ dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/utils.c | 15 +++++++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index a4c1362..8a39d93 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -128,8 +128,8 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I unsigned int flags, const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count, void **device) { struct layer_get_size_args get_size_args; - struct dxgi_device *dxgi_device; struct dxgi_device_layer d3d10_layer; + struct dxgi_device *dxgi_device; UINT device_size; DWORD count; HRESULT hr; @@ -137,18 +137,22 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I TRACE("d3d10core %p, factory %p, adapter %p, flags %#x, feature_levels %p, level_count %u, device %p.\n", d3d10core, factory, adapter, flags, feature_levels, level_count, device); - FIXME("Ignoring flags.\n"); + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + if (TRACE_ON(dxgi)) + dump_feature_levels(feature_levels, level_count); hr = register_d3d10core_layers(d3d10core); if (FAILED(hr)) { - ERR("Failed to register d3d10core layers, returning %#x\n", hr); + ERR("Failed to register d3d10core layers, returning %#x.\n", hr); return hr; } if (!get_layer(DXGI_DEVICE_LAYER_D3D10_DEVICE, &d3d10_layer)) { - ERR("Failed to get D3D10 device layer\n"); + ERR("Failed to get D3D10 device layer.\n"); return E_FAIL; } @@ -156,7 +160,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I hr = d3d10_layer.init(d3d10_layer.id, &count, NULL); if (FAILED(hr)) { - WARN("Failed to initialize D3D10 device layer\n"); + WARN("Failed to initialize D3D10 device layer.\n"); return E_FAIL; } @@ -176,7 +180,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I dxgi_device = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, device_size); if (!dxgi_device) { - ERR("Failed to allocate device memory\n"); + ERR("Failed to allocate device memory.\n"); return E_OUTOFMEMORY; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 129f6b4..804ae99 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -79,6 +79,7 @@ struct dxgi_device_layer /* TRACE helper functions */ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +void dump_feature_levels(const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index c0c1fcd..c01dd9b 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -364,6 +364,21 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) } } +void dump_feature_levels(const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) +{ + unsigned int i; + + if (!feature_levels || !level_count) + { + TRACE("Feature levels: (null).\n"); + return; + } + + TRACE("Feature levels (count = %u):\n", level_count); + for (i = 0; i < level_count; ++i) + TRACE(" [%u] = %s.\n", i, debug_feature_level(feature_levels[i])); +} + void dxgi_sample_desc_from_wined3d(DXGI_SAMPLE_DESC *desc, enum wined3d_multisample_type wined3d_type, unsigned int wined3d_quality) {

1 0

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

April 22, 2016

Module: wine Branch: master Commit: 896a62a28ac9848a9ed03c8a1e41fd12e0c2eac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896a62a28ac9848a9ed03c8a1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 19 09:26:12 2016 +0000 mimeole.idl: Add more OID values. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mimeole.idl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index dddfc26..8f8a524 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -139,12 +139,26 @@ cpp_quote("} MIMEPROPID;") cpp_quote("#define TYPEDID_MASK ((ULONG)0xffff)") cpp_quote("#define TYPEDID_TYPE(t) ((VARTYPE)((t) & TYPEDID_MASK))") +cpp_quote("#define OID_ALLOW_8BIT_HEADER (0x00010000 | VT_BOOL)") +cpp_quote("#define OID_CBMAX_HEADER_LINE (0x00020000 | VT_UI4)") +cpp_quote("#define OID_SAVE_FORMAT (0x00030000 | VT_UI4)") +cpp_quote("#define OID_WRAP_BODY_TEXT (0x00040000 | VT_BOOL)") +cpp_quote("#define OID_CBMAX_BODY_LINE (0x00050000 | VT_UI4)") +cpp_quote("#define OID_TRANSMIT_BODY_ENCODING (0x00060000 | VT_UI4)") +cpp_quote("#define OID_TRANSMIT_TEXT_ENCODING (0x00070000 | VT_UI4)") +cpp_quote("#define OID_GENERATE_MESSAGE_ID (0x00080000 | VT_BOOL)") cpp_quote("#define OID_HIDE_TNEF_ATTACHMENTS (0x000e0000 | VT_BOOL)") +cpp_quote("#define OID_CLEANUP_TREE_ON_SAVE (0x000f0000 | VT_BOOL)") +cpp_quote("#define OID_BODY_REMOVE_NBSP (0x00140000 | VT_BOOL)") +cpp_quote("#define OID_DEFAULT_BODY_CHARSET (0x00150000 | VT_UI4)") +cpp_quote("#define OID_DEFAULT_HEADER_CHARSET (0x00160000 | VT_UI4)") +cpp_quote("#define OID_DBCS_ESCAPE_IS_8BIT (0x00170000 | VT_BOOL)") cpp_quote("#define OID_SECURITY_TYPE (0x00180000 | VT_UI4)") cpp_quote("#define OID_SECURITY_HWND_OWNER (0x00320000 | VT_UI4)") cpp_quote("#define OID_HEADER_RELOAD_TYPE (0x00370000 | VT_UI4)") +cpp_quote("#define OID_CAN_INLINE_TEXT_BODIES (0x00380000 | VT_BOOL)") cpp_quote("#define OID_SHOW_MACBINARY (0x00390000 | VT_BOOL)") - +cpp_quote("#define OID_SAVEBODY_KEEPBOUNDARY (0x00400000 | VT_BOOL)") [ uuid(e4b28371-83b0-11d0-8259-00c04fd85ab4),

1 0

Alistair Leslie-Hughes : inetcomm: Implement MimeOleGetPropertySchema.
by Alexandre Julliard April 22, 2016

April 22, 2016

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

Hugh McMaster : reg: Output a list of subkeys when querying a registry key.
by Alexandre Julliard April 22, 2016

April 22, 2016

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

April 22, 2016

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

Hans Leidekker : webservices: Implement WsOpenServiceProxy and WsCloseServiceProxy.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: bd56d1a0f1bec8cc809f7fa9c4440edb7c6eecfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd56d1a0f1bec8cc809f7fa9c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 22 09:42:46 2016 +0200 webservices: Implement WsOpenServiceProxy and WsCloseServiceProxy. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/proxy.c | 29 +++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 4 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index 1563ac9..02ae96d 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -205,3 +205,32 @@ HRESULT WINAPI WsGetServiceProxyProperty( WS_SERVICE_PROXY *handle, WS_PROXY_PRO return prop_get( proxy->prop, proxy->prop_count, id, buf, size ); } + +/************************************************************************** + * WsOpenServiceProxy [webservices.@] + */ +HRESULT WINAPI WsOpenServiceProxy( WS_SERVICE_PROXY *handle, const WS_ENDPOINT_ADDRESS *endpoint, + const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct proxy *proxy = (struct proxy *)handle; + + TRACE( "%p %p %p %p\n", handle, endpoint, ctx, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); + + return open_channel( proxy->channel, endpoint ); +} + +/************************************************************************** + * WsCloseServiceProxy [webservices.@] + */ +HRESULT WINAPI WsCloseServiceProxy( WS_SERVICE_PROXY *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct proxy *proxy = (struct proxy *)handle; + + TRACE( "%p %p %p\n", handle, ctx, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); + + return close_channel( proxy->channel ); +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 95a8c1f..5ed9351 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -16,7 +16,7 @@ @ stdcall WsCloseChannel(ptr ptr ptr) @ stub WsCloseListener @ stub WsCloseServiceHost -@ stub WsCloseServiceProxy +@ stdcall WsCloseServiceProxy(ptr ptr ptr) @ stub WsCombineUrl @ stub WsCopyError @ stub WsCopyNode @@ -98,7 +98,7 @@ @ stdcall WsOpenChannel(ptr ptr ptr ptr) @ stub WsOpenListener @ stub WsOpenServiceHost -@ stub WsOpenServiceProxy +@ stdcall WsOpenServiceProxy(ptr ptr ptr ptr) @ stub WsPullBytes @ stub WsPushBytes @ stub WsReadArray

1 0

Francois Gouget : shell32/tests: Fix a spelling error in a shellpath comment.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 5d885360f4721d19272674ec6ca3efe5be50dbab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d885360f4721d19272674ec6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 22 00:38:00 2016 +0200 shell32/tests: Fix a spelling error in a shellpath comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 6b5ed76..2125092 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2278,7 +2278,7 @@ static void test_knownFolders(void) /* remove newly created directory */ RemoveDirectoryW(sSubFolder2Path); - /* verify sub folder. It still succeedes, so Windows does not check folder presence each time */ + /* verify subfolder. It still succeeds, so Windows does not check folder presence each time */ hr = IKnownFolder_GetPath(subFolder, 0, &folderPath); todo_wine ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr);

1 0

Jean-Christophe Cardot : winhlp32: Use debugstr_a() to trace.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 1dba777e69dba4e4e570b5f29f1c3e4c694c9942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dba777e69dba4e4e570b5f29… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Thu Apr 21 22:03:57 2016 +0200 winhlp32: Use debugstr_a() to trace. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/callback.c | 4 +- programs/winhlp32/hlpfile.c | 56 +++++++++---------- programs/winhlp32/macro.c | 122 +++++++++++++++++++++--------------------- programs/winhlp32/macro.lex.l | 14 ++--- programs/winhlp32/winhelp.c | 8 +-- 5 files changed, 102 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1dba777e69dba4e4e570b…

1 0

Stefan Dösinger : wined3d: Use wined3d_texture_prepare_location() in draw_primitive().
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: aa11dfa8fd2b131644ca4c1f9caf969013391c5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa11dfa8fd2b131644ca4c1f9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 21 17:05:10 2016 +0200 wined3d: Use wined3d_texture_prepare_location() in draw_primitive(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index bd62b68..c086491 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -415,6 +415,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s const struct wined3d_stream_info *stream_info; struct wined3d_event_query *ib_query = NULL; struct wined3d_stream_info si_emulated; + struct wined3d_rendertarget_view *dsv; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BOOL emulation = FALSE; @@ -448,21 +449,21 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s } else { - wined3d_surface_prepare(target, context, rtv->resource->draw_binding); + wined3d_texture_prepare_location(target->container, rtv->sub_resource_idx, + context, rtv->resource->draw_binding); } } } - if (fb->depth_stencil) + if ((dsv = fb->depth_stencil)) { /* Note that this depends on the context_acquire() call above to set * context->render_offscreen properly. We don't currently take the * Z-compare function into account, but we could skip loading the * depthstencil for D3DCMP_NEVER and D3DCMP_ALWAYS as well. Also note * that we never copy the stencil data.*/ - DWORD location = context->render_offscreen ? fb->depth_stencil->resource->draw_binding - : WINED3D_LOCATION_DRAWABLE; - struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(fb->depth_stencil); + DWORD location = context->render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; + struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(dsv); if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) { @@ -482,10 +483,10 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (!EqualRect(&r, &draw_rect)) surface_load_location(ds, context, location); else - wined3d_surface_prepare(ds, context, location); + wined3d_texture_prepare_location(ds->container, dsv->sub_resource_idx, context, location); } else - wined3d_surface_prepare(ds, context, location); + wined3d_texture_prepare_location(ds->container, dsv->sub_resource_idx, context, location); } if (!context_apply_draw_state(context, device, state))

1 0