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

Henri Verbeet : wined3d: Implement cpu_blit_blit_surface().
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: f2459e5527c9d2b1bf6b11d6fcae915925371ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2459e5527c9d2b1bf6b11d6f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 3 07:39:47 2017 +0200 wined3d: Implement cpu_blit_blit_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5031fcb..9d82dcb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2712,10 +2712,19 @@ static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { - if (blit_op == WINED3D_BLIT_OP_COLOR_FILL || blit_op == WINED3D_BLIT_OP_DEPTH_FILL) - return TRUE; + switch (blit_op) + { + case WINED3D_BLIT_OP_COLOR_BLIT: + case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: + case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: + case WINED3D_BLIT_OP_COLOR_FILL: + case WINED3D_BLIT_OP_DEPTH_FILL: + case WINED3D_BLIT_OP_DEPTH_BLIT: + return TRUE; - return FALSE; + default: + return FALSE; + } } static HRESULT surface_cpu_blt_compressed(const BYTE *src_data, BYTE *dst_data, @@ -3378,8 +3387,30 @@ static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl const RECT *src_rect, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { - /* FIXME: Remove error returns from surface_blt_cpu. */ - ERR("Blit method not implemented by cpu_blit.\n"); + struct wined3d_box dst_box = {dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, 0, 1}; + struct wined3d_box src_box = {src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1}; + unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); + unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); + struct wined3d_texture *dst_texture = dst_surface->container; + struct wined3d_texture *src_texture = src_surface->container; + struct wined3d_blt_fx fx; + DWORD flags = 0; + + memset(&fx, 0, sizeof(fx)); + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + { + flags |= WINED3D_BLT_ALPHA_TEST; + } + else if (op == WINED3D_BLIT_OP_COLOR_BLIT_CKEY) + { + flags |= WINED3D_BLT_SRC_CKEY_OVERRIDE | WINED3D_BLT_FX; + fx.src_color_key = *color_key; + } + + if (FAILED(surface_cpu_blt(dst_texture, dst_sub_resource_idx, &dst_box, + src_texture, src_sub_resource_idx, &src_box, flags, &fx, filter))) + ERR("Failed to blit.\n"); + wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); } const struct wined3d_blitter_ops cpu_blit =

1 0

Francois Gouget : odbccp32/tests: Make test_SQLInstallDriverEx() static.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: ec3d34a5a67375c1b9e5f3b5f91364d186c7b2d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3d34a5a67375c1b9e5f3b5f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 1 14:36:34 2017 +0200 odbccp32/tests: Make test_SQLInstallDriverEx() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 4fdf584..35b9f35 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -412,7 +412,7 @@ static void test_SQLGetPrivateProfileStringW(void) } } -void test_SQLInstallDriverEx(void) +static void test_SQLInstallDriverEx(void) { char path[MAX_PATH]; char syspath[MAX_PATH];

1 0

Owen Rudge : wsdapi: Add stub DLL.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 4a3bb0acc58ff081940d8e9bd8269bab3086602c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3bb0acc58ff081940d8e9bd… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Mar 29 22:51:44 2017 +0100 wsdapi: Add stub DLL. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/wsdapi/Makefile.in | 6 ++++++ dlls/wsdapi/main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/wsdapi.spec | 45 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+) diff --git a/configure b/configure index f032b1a..9e46fbc 100755 --- a/configure +++ b/configure @@ -1496,6 +1496,7 @@ enable_wnaspi32 enable_wpc enable_wpcap enable_ws2_32 +enable_wsdapi enable_wshom_ocx enable_wsnmp32 enable_wsock32 @@ -18479,6 +18480,7 @@ wine_fn_config_test dlls/wpc/tests wpc_test wine_fn_config_dll wpcap enable_wpcap wine_fn_config_dll ws2_32 enable_ws2_32 implib wine_fn_config_test dlls/ws2_32/tests ws2_32_test +wine_fn_config_dll wsdapi enable_wsdapi implib wine_fn_config_dll wshom.ocx enable_wshom_ocx clean wine_fn_config_test dlls/wshom.ocx/tests wshom.ocx_test clean wine_fn_config_dll wsnmp32 enable_wsnmp32 implib diff --git a/configure.ac b/configure.ac index 7e3f643..ac6ecbb 100644 --- a/configure.ac +++ b/configure.ac @@ -3527,6 +3527,7 @@ WINE_CONFIG_TEST(dlls/wpc/tests) WINE_CONFIG_DLL(wpcap) WINE_CONFIG_DLL(ws2_32,,[implib]) WINE_CONFIG_TEST(dlls/ws2_32/tests) +WINE_CONFIG_DLL(wsdapi,,[implib]) WINE_CONFIG_DLL(wshom.ocx,,[clean]) WINE_CONFIG_TEST(dlls/wshom.ocx/tests,[clean]) WINE_CONFIG_DLL(wsnmp32,,[implib]) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in new file mode 100644 index 0000000..134bb18 --- /dev/null +++ b/dlls/wsdapi/Makefile.in @@ -0,0 +1,6 @@ +MODULE = wsdapi.dll +IMPORTLIB = wsdapi +IMPORTS = kernel32 + +C_SRCS = \ + main.c diff --git a/dlls/wsdapi/main.c b/dlls/wsdapi/main.c new file mode 100644 index 0000000..ea0fef3 --- /dev/null +++ b/dlls/wsdapi/main.c @@ -0,0 +1,43 @@ +/* + * Web Services on Devices + * + * Copyright 2017 Owen Rudge 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec new file mode 100644 index 0000000..7771b7b --- /dev/null +++ b/dlls/wsdapi/wsdapi.spec @@ -0,0 +1,45 @@ +@ stub WSDAddFirewallCheck +@ stub WSDCancelNetworkChangeNotify +@ stub WSDCopyNameList +@ stub WSDNotifyNetworkChange +@ stub WSDRemoveFirewallCheck +@ stub WSDXMLCompareNames +@ stub WSDAllocateLinkedMemory +@ stub WSDAttachLinkedMemory +@ stub WSDCompareEndpoints +@ stub WSDCopyEndpoint +@ stub WSDCreateDeviceHost2 +@ stub WSDCreateDeviceHost +@ stub WSDCreateDeviceHostAdvanced +@ stub WSDCreateDeviceProxy2 +@ stub WSDCreateDeviceProxy +@ stub WSDCreateDeviceProxyAdvanced +@ stub WSDCreateDiscoveryProvider2 +@ stub WSDCreateDiscoveryProvider +@ stub WSDCreateDiscoveryPublisher2 +@ stub WSDCreateDiscoveryPublisher +@ stub WSDCreateHttpAddress +@ stub WSDCreateHttpMessageParameters +@ stub WSDCreateHttpTransport +@ stub WSDCreateMetadataAgent +@ stub WSDCreateOutboundAttachment +@ stub WSDCreateUdpAddress +@ stub WSDCreateUdpMessageParameters +@ stub WSDCreateUdpTransport +@ stub WSDDetachLinkedMemory +@ stub WSDFreeLinkedMemory +@ stub WSDGenerateFault +@ stub WSDGenerateFaultEx +@ stub WSDGenerateRandomDelay +@ stub WSDGetConfigurationOption +@ stub WSDProcessFault +@ stub WSDSetConfigurationOption +@ stub WSDUriDecode +@ stub WSDUriEncode +@ stub WSDXMLAddChild +@ stub WSDXMLAddSibling +@ stub WSDXMLBuildAnyForSingleElement +@ stub WSDXMLCleanupElement +@ stub WSDXMLCreateContext +@ stub WSDXMLGetNameFromBuiltinNamespace +@ stub WSDXMLGetValueFromAny

1 0

Owen Rudge : include: Add partial wsdxmldom.h.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 604f36dd043b54f6cbba09d7d97be5d1edd44bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604f36dd043b54f6cbba09d7d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Mar 29 22:52:39 2017 +0100 include: Add partial wsdxmldom.h. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wsdxmldom.h | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9ee3d52..10fea7e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -686,6 +686,7 @@ HEADER_SRCS = \ ws2ipdef.h \ ws2spi.h \ ws2tcpip.h \ + wsdxmldom.h \ wshisotp.h \ wsipx.h \ wsnwlink.h \ diff --git a/include/wsdxmldom.h b/include/wsdxmldom.h new file mode 100644 index 0000000..59e481c --- /dev/null +++ b/include/wsdxmldom.h @@ -0,0 +1,87 @@ +/* + * Copyright 2017 Owen Rudge 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 + */ + +#ifndef __WSDXMLDOM_H__ +#define __WSDXMLDOM_H__ + +typedef struct _WSDXML_TYPE WSDXML_TYPE; +typedef struct _WSDXML_NAMESPACE WSDXML_NAMESPACE; +typedef struct _WSDXML_NAME WSDXML_NAME; +typedef struct _WSDXML_PREFIX_MAPPING WSDXML_PREFIX_MAPPING; +typedef struct _WSDXML_ATTRIBUTE WSDXML_ATTRIBUTE; +typedef struct _WSDXML_NODE WSDXML_NODE; +typedef struct _WSDXML_ELEMENT WSDXML_ELEMENT; + +struct _WSDXML_TYPE +{ + const WCHAR *Uri; + const BYTE *Table; +}; + +struct _WSDXML_NAMESPACE +{ + const WCHAR *Uri; + const WCHAR *PreferredPrefix; + WSDXML_NAME *Names; + WORD NamesCount; + WORD Encoding; +}; + +struct _WSDXML_NAME +{ + WSDXML_NAMESPACE *Space; + WCHAR *LocalName; +}; + +struct _WSDXML_PREFIX_MAPPING +{ + DWORD Refs; + WSDXML_PREFIX_MAPPING *Next; + WSDXML_NAMESPACE *Space; + WCHAR *Prefix; +}; + +struct _WSDXML_ATTRIBUTE +{ + WSDXML_ELEMENT *Element; + WSDXML_ATTRIBUTE *Next; + WSDXML_NAME *Name; + WCHAR *Value; +}; + +struct _WSDXML_NODE +{ + enum + { + ElementType, + TextType + } Type; + WSDXML_ELEMENT *Parent; + WSDXML_NODE *Next; +}; + +struct _WSDXML_ELEMENT +{ + WSDXML_NODE Node; + WSDXML_NAME *Name; + WSDXML_ATTRIBUTE *FirstAttribute; + WSDXML_NODE *FirstChild; + WSDXML_PREFIX_MAPPING *PrefixMappings; +}; + +#endif /* __WSDXMLDOM_H__ */

1 0

Owen Rudge : include: Add partial wsdtypes.h.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 4d8f5dc9bd65671667bd5dcc6c43094750fa2d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8f5dc9bd65671667bd5dcc6… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Mar 29 22:52:45 2017 +0100 include: Add partial wsdtypes.h. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wsdtypes.h | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 10fea7e..fa32beb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -686,6 +686,7 @@ HEADER_SRCS = \ ws2ipdef.h \ ws2spi.h \ ws2tcpip.h \ + wsdtypes.h \ wsdxmldom.h \ wshisotp.h \ wsipx.h \ diff --git a/include/wsdtypes.h b/include/wsdtypes.h new file mode 100644 index 0000000..387b6c3 --- /dev/null +++ b/include/wsdtypes.h @@ -0,0 +1,99 @@ +/* + * Copyright 2017 Owen Rudge 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 + */ + +#ifndef WSDTYPES_H +#define WSDTYPES_H + +interface IWSDMessageParameters; + +typedef struct _WSD_APP_SEQUENCE WSD_APP_SEQUENCE; +typedef struct _WSD_HEADER_RELATESTO WSD_HEADER_RELATESTO; +typedef struct _WSD_SOAP_HEADER WSD_SOAP_HEADER; +typedef struct _WSD_SOAP_MESSAGE WSD_SOAP_MESSAGE; +typedef struct _WSD_NAME_LIST WSD_NAME_LIST; +typedef struct _WSD_REFERENCE_PARAMETERS WSD_REFERENCE_PARAMETERS; +typedef struct _WSD_REFERENCE_PROPERTIES WSD_REFERENCE_PROPERTIES; +typedef struct _WSD_ENDPOINT_REFERENCE WSD_ENDPOINT_REFERENCE; +typedef struct _WSD_URI_LIST WSD_URI_LIST; + +struct _WSD_APP_SEQUENCE +{ + ULONGLONG InstanceId; + const WCHAR *SequenceId; + ULONGLONG MessageNumber; +}; + +struct _WSD_NAME_LIST +{ + WSD_NAME_LIST *Next; + WSDXML_NAME *Element; +}; + +struct _WSD_REFERENCE_PARAMETERS +{ + WSDXML_ELEMENT *Any; +}; + +struct _WSD_REFERENCE_PROPERTIES +{ + WSDXML_ELEMENT *Any; +}; + +struct _WSD_ENDPOINT_REFERENCE +{ + const WCHAR *Address; + WSD_REFERENCE_PROPERTIES ReferenceProperties; + WSD_REFERENCE_PARAMETERS ReferenceParameters; + WSDXML_NAME *PortType; + WSDXML_NAME *ServiceName; + WSDXML_ELEMENT *Any; +}; + +struct _WSD_URI_LIST +{ + WSD_URI_LIST *Next; + const WCHAR *Element; +}; + +struct _WSD_HEADER_RELATESTO +{ + WSDXML_NAME *RelationshipType; + const WCHAR *MessageID; +}; + +struct _WSD_SOAP_HEADER +{ + const WCHAR *To; + const WCHAR *Action; + const WCHAR *MessageID; + WSD_HEADER_RELATESTO RelatesTo; + WSD_ENDPOINT_REFERENCE *ReplyTo; + WSD_ENDPOINT_REFERENCE *From; + WSD_ENDPOINT_REFERENCE *FaultTo; + WSD_APP_SEQUENCE *AppSequence; + WSDXML_ELEMENT *AnyHeaders; +}; + +struct _WSD_SOAP_MESSAGE +{ + WSD_SOAP_HEADER Header; + void *Body; + WSDXML_TYPE *BodyType; +}; + +#endif

1 0

Owen Rudge : include: Add partial wsdbase.idl.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 5a9db522e6367ece0f63d111e5f387f98dc42fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9db522e6367ece0f63d111e… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Mar 29 22:53:33 2017 +0100 include: Add partial wsdbase.idl. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wsdbase.idl | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index fa32beb..c3267fa 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -181,6 +181,7 @@ IDL_SRCS = \ wmsbuffer.idl \ wmsdkidl.idl \ wpcapi.idl \ + wsdbase.idl \ wtypes.idl \ wuapi.idl \ xapo.idl \ diff --git a/include/wsdbase.idl b/include/wsdbase.idl new file mode 100644 index 0000000..35db5b9 --- /dev/null +++ b/include/wsdbase.idl @@ -0,0 +1,46 @@ +/* + * Copyright 2017 Owen Rudge 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 + */ + +import "objidl.idl"; + +interface IWSDAddress; +interface IWSDMessageParameters; + +[ +uuid(b9574c6c-12a6-4f74-93a1-3318ff605759), +object, +local +] +interface IWSDAddress : IUnknown +{ + HRESULT Serialize([out, size_is(cchLength)] LPWSTR pszBuffer, [in] DWORD cchLength, [in] BOOL fSafe); + HRESULT Deserialize([in] LPCWSTR pszBuffer); +} + +[ +uuid(1fafe8a2-e6fc-4b80-b6cf-b7d45c416d7c), +object +] +interface IWSDMessageParameters : IUnknown +{ + HRESULT GetLocalAddress([out] IWSDAddress** ppAddress); + HRESULT SetLocalAddress([in] IWSDAddress* pAddress); + HRESULT GetRemoteAddress([out] IWSDAddress** ppAddress); + HRESULT SetRemoteAddress([in] IWSDAddress* pAddress); + HRESULT GetLowerParameters([out] IWSDMessageParameters** ppTxParams); +}

1 0

Owen Rudge : include: Add partial wsdxml.idl.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: f08f3c87dc4d0fbe914d58b9a88fb12dea3a8829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08f3c87dc4d0fbe914d58b9a… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Mar 29 22:53:40 2017 +0100 include: Add partial wsdxml.idl. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wsdxml.idl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c3267fa..a6f5feb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -182,6 +182,7 @@ IDL_SRCS = \ wmsdkidl.idl \ wpcapi.idl \ wsdbase.idl \ + wsdxml.idl \ wtypes.idl \ wuapi.idl \ xapo.idl \ diff --git a/include/wsdxml.idl b/include/wsdxml.idl new file mode 100644 index 0000000..0a63ffb --- /dev/null +++ b/include/wsdxml.idl @@ -0,0 +1,48 @@ +/* + * Copyright 2017 Owen Rudge 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 + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +typedef struct _WSDXML_NAMESPACE WSDXML_NAMESPACE; +typedef struct _WSDXML_NAME WSDXML_NAME; +typedef struct _WSDXML_TYPE WSDXML_TYPE; +typedef struct _WSDXML_ELEMENT WSDXML_ELEMENT; + +typedef const WSDXML_NAMESPACE *PCWSDXML_NAMESPACE; +typedef const WSDXML_TYPE *PCWSDXML_TYPE; + +interface IWSDXMLContext; + +[ +uuid(75d8f3ee-3e5a-43b4-a15a-bcf6887460c0), +object, +local, +restricted, +pointer_default(unique) +] +interface IWSDXMLContext : IUnknown +{ + HRESULT AddNamespace([in] LPCWSTR pszUri, [in] LPCWSTR pszSuggestedPrefix, [out] WSDXML_NAMESPACE** ppNamespace); + + HRESULT AddNameToNamespace([in] LPCWSTR pszUri, [in] LPCWSTR pszName, [out] WSDXML_NAME** ppName); + + HRESULT SetNamespaces([in, size_is(wNamespacesCount)] const PCWSDXML_NAMESPACE* pNamespaces, [in] WORD wNamespacesCount, [in] BYTE bLayerNumber); + + HRESULT SetTypes([in, size_is(dwTypesCount)] const PCWSDXML_TYPE* pTypes, [in] DWORD dwTypesCount, [in] BYTE bLayerNumber); +};

1 0

Owen Rudge : include: Add partial wsddisco.idl.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: 2ba3cc0fe343ea0257b2821cef06e931ec339867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba3cc0fe343ea0257b2821ce… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Mar 29 22:53:53 2017 +0100 include: Add partial wsddisco.idl. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wsddisco.idl | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index a6f5feb..7b3b72f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -182,6 +182,7 @@ IDL_SRCS = \ wmsdkidl.idl \ wpcapi.idl \ wsdbase.idl \ + wsddisco.idl \ wsdxml.idl \ wtypes.idl \ wuapi.idl \ diff --git a/include/wsddisco.idl b/include/wsddisco.idl new file mode 100644 index 0000000..50d2198 --- /dev/null +++ b/include/wsddisco.idl @@ -0,0 +1,107 @@ +/* + * Copyright 2017 Owen Rudge 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 + */ + +import "objidl.idl"; +import "wsdxmldom.h"; +import "wsdtypes.h"; + +interface IWSDScopeMatchingRule; +interface IWSDiscoveryPublisherNotify; +interface IWSDiscoveryPublisher; +interface IWSDXMLContext; + +[ +uuid(fcafe424-fef5-481a-bd9f-33ce0574256f), +object, +local, +restricted, +pointer_default(unique) +] +interface IWSDScopeMatchingRule : IUnknown +{ + HRESULT GetScopeRule([out] LPCWSTR *ppszScopeMatchingRule); + HRESULT MatchScopes([in] LPCWSTR pszScope1, [in] LPCWSTR pszScope2, [out] BOOL *pfMatch); +} + +[ +uuid(e67651b0-337a-4b3c-9758-733388568251), +object, +local, +restricted, +pointer_default(unique) +] +interface IWSDiscoveryPublisherNotify : IUnknown +{ + HRESULT ProbeHandler([in] const WSD_SOAP_MESSAGE *pSoap, [in] IWSDMessageParameters *pMessageParameters); + HRESULT ResolveHandler([in] const WSD_SOAP_MESSAGE *pSoap, [in] IWSDMessageParameters *pMessageParameters); +} + +[ +uuid(AE01E1A8-3ff9-4148-8116-057cc616fe13), +object, +local, +restricted, +pointer_default(unique) +] +interface IWSDiscoveryPublisher : IUnknown +{ + HRESULT SetAddressFamily([in] DWORD dwAddressFamily); + HRESULT RegisterNotificationSink([in] IWSDiscoveryPublisherNotify *pSink); + HRESULT UnRegisterNotificationSink([in] IWSDiscoveryPublisherNotify *pSink); + + HRESULT Publish([in] LPCWSTR pszId, [in] ULONGLONG ullMetadataVersion, [in] ULONGLONG ullInstanceId, [in] ULONGLONG ullMessageNumber, + [in, optional] LPCWSTR pszSessionId, [in, optional] const WSD_NAME_LIST *pTypesList, [in, optional] const WSD_URI_LIST *pScopesList, + [in, optional] const WSD_URI_LIST *pXAddrsList); + + HRESULT UnPublish([in] LPCWSTR pszId, [in] ULONGLONG ullInstanceId, [in] ULONGLONG ullMessageNumber, [in, optional] LPCWSTR pszSessionId, + [in, optional] const WSDXML_ELEMENT *pAny); + + HRESULT MatchProbe([in] const WSD_SOAP_MESSAGE *pProbeMessage, [in] IWSDMessageParameters *pMessageParameters, [in] LPCWSTR pszId, + [in] ULONGLONG ullMetadataVersion, [in] ULONGLONG ullInstanceId, [in] ULONGLONG ullMessageNumber, [in, optional] LPCWSTR pszSessionId, + [in, optional] const WSD_NAME_LIST *pTypesList, [in, optional] const WSD_URI_LIST *pScopesList, [in, optional] const WSD_URI_LIST *pXAddrsList); + + HRESULT MatchResolve([in] const WSD_SOAP_MESSAGE *pResolveMessage, [in] IWSDMessageParameters *pMessageParameters, [in] LPCWSTR pszId, + [in] ULONGLONG ullMetadataVersion, [in] ULONGLONG ullInstanceId, [in] ULONGLONG ullMessageNumber, [in, optional] LPCWSTR pszSessionId, + [in, optional] const WSD_NAME_LIST *pTypesList, [in, optional] const WSD_URI_LIST *pScopesList, [in, optional] const WSD_URI_LIST *pXAddrsList); + + HRESULT PublishEx([in] LPCWSTR pszId, [in] ULONGLONG ullMetadataVersion, [in] ULONGLONG ullInstanceId, [in] ULONGLONG ullMessageNumber, + [in, optional] LPCWSTR pszSessionId, [in, optional] const WSD_NAME_LIST *pTypesList, [in, optional] const WSD_URI_LIST *pScopesList, + [in, optional] const WSD_URI_LIST *pXAddrsList, [in, optional] const WSDXML_ELEMENT *pHeaderAny, + [in, optional] const WSDXML_ELEMENT *pReferenceParameterAny, [in, optional] const WSDXML_ELEMENT *pPolicyAny, + [in, optional] const WSDXML_ELEMENT *pEndpointReferenceAny, [in, optional] const WSDXML_ELEMENT *pAny); + + HRESULT MatchProbeEx([in] const WSD_SOAP_MESSAGE *pProbeMessage, [in] IWSDMessageParameters *pMessageParameters, [in] LPCWSTR pszId, + [in] ULONGLONG ullMetadataVersion, [in] ULONGLONG ullInstanceId, [in] ULONGLONG ullMessageNumber, [in, optional] LPCWSTR pszSessionId, + [in, optional] const WSD_NAME_LIST *pTypesList, [in, optional] const WSD_URI_LIST *pScopesList, [in, optional] const WSD_URI_LIST *pXAddrsList, + [in, optional] const WSDXML_ELEMENT *pHeaderAny, [in, optional] const WSDXML_ELEMENT *pReferenceParameterAny, + [in, optional] const WSDXML_ELEMENT *pPolicyAny, [in, optional] const WSDXML_ELEMENT *pEndpointReferenceAny, + [in, optional] const WSDXML_ELEMENT *pAny); + + HRESULT MatchResolveEx([in] const WSD_SOAP_MESSAGE *pResolveMessage, [in] IWSDMessageParameters *pMessageParameters, [in] LPCWSTR pszId, + [in] ULONGLONG ullMetadataVersion, [in] ULONGLONG ullInstanceId, [in] ULONGLONG ullMessageNumber, [in, optional] LPCWSTR pszSessionId, + [in, optional] const WSD_NAME_LIST *pTypesList, [in, optional] const WSD_URI_LIST *pScopesList, [in, optional] const WSD_URI_LIST *pXAddrsList, + [in, optional] const WSDXML_ELEMENT *pHeaderAny, [in, optional] const WSDXML_ELEMENT *pReferenceParameterAny, + [in, optional] const WSDXML_ELEMENT *pPolicyAny, [in, optional] const WSDXML_ELEMENT *pEndpointReferenceAny, + [in, optional] const WSDXML_ELEMENT *pAny); + + HRESULT RegisterScopeMatchingRule([in] IWSDScopeMatchingRule *pScopeMatchingRule); + HRESULT UnRegisterScopeMatchingRule([in] IWSDScopeMatchingRule *pScopeMatchingRule); + HRESULT GetXMLContext([out] IWSDXMLContext **ppContext); +} + +cpp_quote("HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext* pContext, IWSDiscoveryPublisher **ppPublisher);")

1 0

Owen Rudge : include: Add partial wsdapi.h.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: db680113317911feda2a1009755f37b288885230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db680113317911feda2a10097… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Mar 29 22:54:01 2017 +0100 include: Add partial wsdapi.h. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/wsdapi.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 7b3b72f..2384c93 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -689,6 +689,7 @@ HEADER_SRCS = \ ws2ipdef.h \ ws2spi.h \ ws2tcpip.h \ + wsdapi.h \ wsdtypes.h \ wsdxmldom.h \ wshisotp.h \ diff --git a/include/wsdapi.h b/include/wsdapi.h new file mode 100644 index 0000000..8deb377 --- /dev/null +++ b/include/wsdapi.h @@ -0,0 +1,49 @@ +/* + * Copyright 2017 Owen Rudge 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 + */ + +#ifndef WSDAPI_H +#define WSDAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct IWSDMessageParameters IWSDMessageParameters; + +typedef struct _WSD_URI_LIST WSD_URI_LIST; +typedef struct _WSD_NAME_LIST WSD_NAME_LIST; + +typedef struct _WSDXML_NAME WSDXML_NAME; +typedef struct _WSDXML_ELEMENT WSDXML_ELEMENT; +typedef struct _WSDXML_NODE WSDXML_NODE; +typedef struct _WSDXML_ATTRIBUTE WSDXML_ATTRIBUTE; +typedef struct _WSDXML_PREFIX_MAPPING WSDXML_PREFIX_MAPPING; +typedef struct _WSDXML_ELEMENT_LIST WSDXML_ELEMENT_LIST; +typedef struct _WSDXML_TYPE WSDXML_TYPE; + +#ifdef __cplusplus +} +#endif + +#include <wsdtypes.h> +#include <wsdbase.h> +#include <wsdxmldom.h> +#include <wsdxml.h> +#include <wsddisco.h> + +#endif

1 0

Huw Davies : wbemdisp: Add missing methods to the ISWbemObjectVtbl.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: c1242a227d17b54b8acd0899403982027076720d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1242a227d17b54b8acd08994… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 3 09:57:28 2017 +0100 wbemdisp: Add missing methods to the ISWbemObjectVtbl. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 285 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 284 insertions(+), 1 deletion(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 4a67942..9f1c7f4 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -319,6 +319,265 @@ static HRESULT WINAPI object_Put_( return E_NOTIMPL; } +static HRESULT WINAPI object_PutAsync_( + ISWbemObject *iface, + IDispatch *objWbemSink, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_Delete_( + ISWbemObject *iface, + LONG iFlags, + IDispatch *objWbemNamedValueSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_DeleteAsync_( + ISWbemObject *iface, + IDispatch *objWbemSink, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_Instances_( + ISWbemObject *iface, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectSet **objWbemObjectSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_InstancesAsync_( + ISWbemObject *iface, + IDispatch *objWbemSink, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_Subclasses_( + ISWbemObject *iface, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectSet **objWbemObjectSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_SubclassesAsync_( + ISWbemObject *iface, + IDispatch *objWbemSink, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_Associators_( + ISWbemObject *iface, + BSTR strAssocClass, + BSTR strResultClass, + BSTR strResultRole, + BSTR strRole, + VARIANT_BOOL bClassesOnly, + VARIANT_BOOL bSchemaOnly, + BSTR strRequiredAssocQualifier, + BSTR strRequiredQualifier, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectSet **objWbemObjectSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_AssociatorsAsync_( + ISWbemObject *iface, + IDispatch *objWbemSink, + BSTR strAssocClass, + BSTR strResultClass, + BSTR strResultRole, + BSTR strRole, + VARIANT_BOOL bClassesOnly, + VARIANT_BOOL bSchemaOnly, + BSTR strRequiredAssocQualifier, + BSTR strRequiredQualifier, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_References_( + ISWbemObject *iface, + BSTR strResultClass, + BSTR strRole, + VARIANT_BOOL bClassesOnly, + VARIANT_BOOL bSchemaOnly, + BSTR strRequiredQualifier, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectSet **objWbemObjectSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_ReferencesAsync_( + ISWbemObject *iface, + IDispatch *objWbemSink, + BSTR strResultClass, + BSTR strRole, + VARIANT_BOOL bClassesOnly, + VARIANT_BOOL bSchemaOnly, + BSTR strRequiredQualifier, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_ExecMethod_( + ISWbemObject *iface, + BSTR strMethodName, + IDispatch *objWbemInParameters, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObject **objWbemOutParameters ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_ExecMethodAsync_( + ISWbemObject *iface, + IDispatch *objWbemSink, + BSTR strMethodName, + IDispatch *objWbemInParameters, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_Clone_( + ISWbemObject *iface, + ISWbemObject **objWbemObject ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_GetObjectText_( + ISWbemObject *iface, + LONG iFlags, + BSTR *strObjectText ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_SpawnDerivedClass_( + ISWbemObject *iface, + LONG iFlags, + ISWbemObject **objWbemObject ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_SpawnInstance_( + ISWbemObject *iface, + LONG iFlags, + ISWbemObject **objWbemObject ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_CompareTo_( + ISWbemObject *iface, + IDispatch *objWbemObject, + LONG iFlags, + VARIANT_BOOL *bResult ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_get_Qualifiers_( + ISWbemObject *iface, + ISWbemQualifierSet **objWbemQualifierSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_get_Properties_( + ISWbemObject *iface, + ISWbemPropertySet **objWbemPropertySet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_get_Methods_( + ISWbemObject *iface, + ISWbemMethodSet **objWbemMethodSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_get_Derivation_( + ISWbemObject *iface, + VARIANT *strClassNameArray ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_get_Path_( + ISWbemObject *iface, + ISWbemObjectPath **objWbemObjectPath ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI object_get_Security_( + ISWbemObject *iface, + ISWbemSecurity **objWbemSecurity ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + static const ISWbemObjectVtbl object_vtbl = { object_QueryInterface, @@ -328,7 +587,31 @@ static const ISWbemObjectVtbl object_vtbl = object_GetTypeInfo, object_GetIDsOfNames, object_Invoke, - object_Put_ + object_Put_, + object_PutAsync_, + object_Delete_, + object_DeleteAsync_, + object_Instances_, + object_InstancesAsync_, + object_Subclasses_, + object_SubclassesAsync_, + object_Associators_, + object_AssociatorsAsync_, + object_References_, + object_ReferencesAsync_, + object_ExecMethod_, + object_ExecMethodAsync_, + object_Clone_, + object_GetObjectText_, + object_SpawnDerivedClass_, + object_SpawnInstance_, + object_CompareTo_, + object_get_Qualifiers_, + object_get_Properties_, + object_get_Methods_, + object_get_Derivation_, + object_get_Path_, + object_get_Security_ }; static HRESULT SWbemObject_create( IWbemClassObject *wbem_object, ISWbemObject **obj )

1 0