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

Francois Gouget : odbccp32/tests: Make test_SQLInstallDriverEx() static.
by Alexandre Julliard April 3, 2017

April 3, 2017

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

Daniel Lehman : msvcp140: Add __crtFreeLibraryWhenCallbackReturns.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: e54654ef3f00a49d31e04e1674ade03f412fb718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54654ef3f00a49d31e04e167… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Mar 31 17:10:26 2017 -0700 msvcp140: Add __crtFreeLibraryWhenCallbackReturns. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 9 +++++++++ include/winbase.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index c32514a..81a3902 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3763,7 +3763,7 @@ @ cdecl __crtCreateThreadpoolTimer(ptr ptr ptr) MSVCP__crtCreateThreadpoolTimer @ cdecl __crtCreateThreadpoolWait(ptr ptr ptr) MSVCP__crtCreateThreadpoolWait @ stub __crtFlushProcessWriteBuffers -@ stub __crtFreeLibraryWhenCallbackReturns +@ cdecl __crtFreeLibraryWhenCallbackReturns(ptr ptr) MSVCP__crtFreeLibraryWhenCallbackReturns @ stub __crtGetCurrentProcessorNumber @ stub __crtGetFileInformationByHandleEx @ stub __crtGetLocaleInfoEx diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 7b97b5c..b358656 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1332,6 +1332,15 @@ VOID CDECL MSVCP__crtSetThreadpoolWait(TP_WAIT *wait, HANDLE handle, FILETIME *d return SetThreadpoolWait(wait, handle, due_time); } +/********************************************************************* + * __crtFreeLibraryWhenCallbackReturns (MSVCP140.@) + */ +VOID CDECL MSVCP__crtFreeLibraryWhenCallbackReturns(PTP_CALLBACK_INSTANCE instance, HMODULE mod) +{ + TRACE("(%p %p)\n", instance, mod); + FreeLibraryWhenCallbackReturns(instance, mod); +} + /* ?_Execute_once(a)std@@YAHAAUonce_flag(a)1@P6GHPAX1PAPAX(a)Z1@Z */ /* ?_Execute_once(a)std@@YAHAEAUonce_flag(a)1@P6AHPEAX1PEAPEAX(a)Z1@Z */ BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param) diff --git a/include/winbase.h b/include/winbase.h index 25e5077..b7f86a2 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1994,6 +1994,7 @@ WINBASEAPI BOOL WINAPI FreeEnvironmentStringsW(LPWSTR); #define FreeEnvironmentStrings WINELIB_NAME_AW(FreeEnvironmentStrings) WINBASEAPI BOOL WINAPI FreeLibrary(HMODULE); WINBASEAPI VOID DECLSPEC_NORETURN WINAPI FreeLibraryAndExitThread(HINSTANCE,DWORD); +WINBASEAPI VOID WINAPI FreeLibraryWhenCallbackReturns(PTP_CALLBACK_INSTANCE,HMODULE); #define FreeModule(handle) FreeLibrary(handle) #define FreeProcInstance(proc) /*nothing*/ WINBASEAPI BOOL WINAPI FreeResource(HGLOBAL);

1 0

Daniel Lehman : msvcp140: Add __crtCloseThreadpoolWait.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 8104282988183cf28b41244011e76c5360cefeed URL: http://source.winehq.org/git/wine.git/?a=commit;h=8104282988183cf28b4124401… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Mar 31 13:57:09 2017 -0700 msvcp140: Add __crtCloseThreadpoolWait. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 31d437e..1b5bdcb 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3753,7 +3753,7 @@ @ cdecl -ret64 _Xtime_get_ticks() _Xtime_get_ticks @ stub __Wcrtomb_lk @ cdecl __crtCloseThreadpoolTimer(ptr) MSVCP__crtCloseThreadpoolTimer -@ stub __crtCloseThreadpoolWait +@ cdecl __crtCloseThreadpoolWait(ptr) MSVCP__crtCloseThreadpoolWait @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ stub __crtCompareStringEx @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 1098cb7..ac23c2b 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1306,6 +1306,15 @@ PTP_WAIT CDECL MSVCP__crtCreateThreadpoolWait(PTP_WAIT_CALLBACK callback, } /********************************************************************* + * __crtCloseThreadpoolWait (MSVCP140.@) + */ +VOID CDECL MSVCP__crtCloseThreadpoolWait(TP_WAIT *wait) +{ + TRACE("(%p)\n", wait); + CloseThreadpoolWait(wait); +} + +/********************************************************************* * __crtSetThreadpoolWait (MSVCP140.@) */ VOID CDECL MSVCP__crtSetThreadpoolWait(TP_WAIT *wait, HANDLE handle, FILETIME *due_time)

1 0

Francois Gouget : kernel32/tests: A spelling fix in a comment.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: 8a19864b0f8315b51a0019c381483d1a5d98a63a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a19864b0f8315b51a0019c38… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 1 14:36:51 2017 +0200 kernel32/tests: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index dc4be32..0546e96 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2933,7 +2933,7 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) /* terminate process with pending write */ create_overlapped_pipe(create_flags, &client, &server); process = create_writepipe_process(client); - /* succesfully read part of write that is pending in child process */ + /* successfully read part of write that is pending in child process */ res = ReadFile(server, buf, 10, &read_bytes, NULL); if(!msg_read_mode) ok(res, "ReadFile failed: %u\n", GetLastError());

1 0

Huw Davies : wbemdisp: Add missing methods to the ISWbemObjectVtbl.
by Alexandre Julliard April 3, 2017

April 3, 2017

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

Owen Rudge : include: Add partial wsdxml.idl.
by Alexandre Julliard April 3, 2017

April 3, 2017

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 wsdbase.idl.
by Alexandre Julliard April 3, 2017

April 3, 2017

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 wsdxmldom.h.
by Alexandre Julliard April 3, 2017

April 3, 2017

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

Henri Verbeet : wined3d: Implement cpu_blit_blit_surface().
by Alexandre Julliard April 3, 2017

April 3, 2017

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

Daniel Lehman : msvcp140: Add __crtCloseThreadpoolTimer.
by Alexandre Julliard April 3, 2017

April 3, 2017

Module: wine Branch: master Commit: a0cf8ce9240558a54730e33e9dddd328f99b3fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0cf8ce9240558a54730e33e9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Mar 31 13:50:31 2017 -0700 msvcp140: Add __crtCloseThreadpoolTimer. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 9 +++++++++ include/winbase.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index ecf2b26..31d437e 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3752,7 +3752,7 @@ @ cdecl _Xtime_diff_to_millis2(ptr ptr) _Xtime_diff_to_millis2 @ cdecl -ret64 _Xtime_get_ticks() _Xtime_get_ticks @ stub __Wcrtomb_lk -@ stub __crtCloseThreadpoolTimer +@ cdecl __crtCloseThreadpoolTimer(ptr) MSVCP__crtCloseThreadpoolTimer @ stub __crtCloseThreadpoolWait @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ stub __crtCompareStringEx diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index fa5ac1d..1098cb7 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1277,6 +1277,15 @@ PTP_TIMER CDECL MSVCP__crtCreateThreadpoolTimer(PTP_TIMER_CALLBACK callback, } /********************************************************************* + * __crtCloseThreadpoolTimer (MSVCP140.@) + */ +VOID CDECL MSVCP__crtCloseThreadpoolTimer(TP_TIMER *timer) +{ + TRACE("(%p)\n", timer); + CloseThreadpoolTimer(timer); +} + +/********************************************************************* * __crtSetThreadpoolTimer (MSVCP140.@) */ VOID CDECL MSVCP__crtSetThreadpoolTimer(TP_TIMER *timer, diff --git a/include/winbase.h b/include/winbase.h index 894156c..be1cb64 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1752,6 +1752,7 @@ WINBASEAPI BOOL WINAPI CloseHandle(HANDLE); WINBASEAPI VOID WINAPI CloseThreadpool(PTP_POOL); WINBASEAPI VOID WINAPI CloseThreadpoolCleanupGroup(PTP_CLEANUP_GROUP); WINBASEAPI VOID WINAPI CloseThreadpoolCleanupGroupMembers(PTP_CLEANUP_GROUP,BOOL,PVOID); +WINBASEAPI VOID WINAPI CloseThreadpoolTimer(PTP_TIMER); WINBASEAPI VOID WINAPI CloseThreadpoolWait(PTP_WAIT); WINBASEAPI VOID WINAPI CloseThreadpoolWork(PTP_WORK); WINBASEAPI BOOL WINAPI CommConfigDialogA(LPCSTR,HWND,LPCOMMCONFIG);

1 0