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

Martin Storsjo : msvcrt: Don't export _isnanf, _nextafterf, _scalbf and frexpf on arm.
by Alexandre Julliard 03 Aug '17

03 Aug '17

Module: wine Branch: master Commit: a4af0aaf5f3f51bd348014ee56ca6a4a1e385609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4af0aaf5f3f51bd348014ee5… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 2 20:49:17 2017 +0300 msvcrt: Don't export _isnanf, _nextafterf, _scalbf and frexpf on arm. Based on the import libraries in MSVC 2012, 2013 and in the Windows 10 SDK, these functions actually aren't exported on arm - only on x86_64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 9 files changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4af0aaf5f3f51bd34801…

1 0

Martin Storsjo : msvcrt: Export -f suffixed float functions functions on arm64.
by Alexandre Julliard 03 Aug '17

03 Aug '17

Module: wine Branch: master Commit: a44b52d1021935e04a83080ce62f4f44f0d94b7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44b52d1021935e04a83080ce… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 2 15:21:52 2017 +0300 msvcrt: Export -f suffixed float functions functions on arm64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 44 ++++++++++---------- dlls/msvcr100/msvcr100.spec | 46 ++++++++++----------- dlls/msvcr110/msvcr110.spec | 48 +++++++++++----------- dlls/msvcr120/msvcr120.spec | 44 ++++++++++---------- dlls/msvcr120_app/msvcr120_app.spec | 44 ++++++++++---------- dlls/msvcr80/msvcr80.spec | 46 ++++++++++----------- dlls/msvcr90/msvcr90.spec | 44 ++++++++++---------- dlls/msvcrt/math.c | 4 +- dlls/msvcrt/msvcrt.spec | 48 +++++++++++----------- dlls/ucrtbase/ucrtbase.spec | 44 ++++++++++---------- 10 files changed, 206 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a44b52d1021935e04a830…

1 0

Alexandre Julliard : Release 2.14.
by Alexandre Julliard 03 Aug '17

03 Aug '17

Module: wine Branch: master Commit: 7aa4a25bd3d23b57ff990a151296dddb337a5767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa4a25bd3d23b57ff990a151… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 3 19:38:53 2017 +0200 Release 2.14. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 611 ++++++++++++++++++++++---------------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 229 insertions(+), 403 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7aa4a25bd3d23b57ff990…

1 0

Tag wine-2.14 : Alexandre Julliard : Release 2.14
by Alexandre Julliard 03 Aug '17

03 Aug '17

Module: wine Branch: refs/tags/wine-2.14 Tag: e22fdb521173f0af38dc36a58b3a11202069cca4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=e22fdb521173f0af38dc36a58b3a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 3 19:38:54 2017 +0200 Release 2.14

1 0

Jacek Caban : ws2_32/tests: Added GetAddrInfoExW tests.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: eb32d1a52b4c5a4728b4eab830559e0a9916cb19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb32d1a52b4c5a4728b4eab83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 1 18:29:55 2017 +0200 ws2_32/tests: Added GetAddrInfoExW tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e975ea4..43008cf 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -66,7 +66,13 @@ static void (WINAPI *pfreeaddrinfo)(struct addrinfo *); static int (WINAPI *pgetaddrinfo)(LPCSTR,LPCSTR,const struct addrinfo *,struct addrinfo **); static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW); +static void (WINAPI *pFreeAddrInfoExW)(ADDRINFOEXW *ai); static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *); +static int (WINAPI *pGetAddrInfoExW)(const WCHAR *name, const WCHAR *servname, DWORD namespace, + GUID *namespace_id, const ADDRINFOEXW *hints, ADDRINFOEXW **result, + struct timeval *timeout, OVERLAPPED *overlapped, + LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle); +static int (WINAPI *pGetAddrInfoExOverlappedResult)(OVERLAPPED *overlapped); static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG); static PCWSTR(WINAPI *pInetNtopW)(INT,LPVOID,LPWSTR,ULONG); static int (WINAPI *pInetPtonA)(INT,LPCSTR,LPVOID); @@ -1226,7 +1232,10 @@ static void Init (void) pfreeaddrinfo = (void *)GetProcAddress(hws2_32, "freeaddrinfo"); pgetaddrinfo = (void *)GetProcAddress(hws2_32, "getaddrinfo"); pFreeAddrInfoW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoW"); + pFreeAddrInfoExW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoExW"); pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); + pGetAddrInfoExW = (void *)GetProcAddress(hws2_32, "GetAddrInfoExW"); + pGetAddrInfoExOverlappedResult = (void *)GetProcAddress(hws2_32, "GetAddrInfoExOverlappedResult"); pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); pInetNtopW = (void *)GetProcAddress(hws2_32, "InetNtopW"); pInetPtonA = (void *)GetProcAddress(hws2_32, "inet_pton"); @@ -7334,6 +7343,95 @@ static void test_GetAddrInfoW(void) ok(result2 == NULL, "got %p\n", result2); } +static void test_GetAddrInfoExW(void) +{ + static const WCHAR empty[] = {0}; + static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; + static const WCHAR winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; + ADDRINFOEXW *result; + OVERLAPPED overlapped; + HANDLE event; + int ret; + + if (!pGetAddrInfoExW || !pGetAddrInfoExOverlappedResult) + { + win_skip("GetAddrInfoExW and/or GetAddrInfoExOverlappedResult not present\n"); + return; + } + + event = WSACreateEvent(); + + result = (ADDRINFOEXW *)0xdeadbeef; + WSASetLastError(0xdeadbeef); + ret = pGetAddrInfoExW(NULL, NULL, NS_DNS, NULL, NULL, &result, NULL, NULL, NULL, NULL); + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); + ok(result == NULL, "got %p\n", result); + + result = NULL; + WSASetLastError(0xdeadbeef); + ret = pGetAddrInfoExW(empty, NULL, NS_DNS, NULL, NULL, &result, NULL, NULL, NULL, NULL); + ok(!ret, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); + pFreeAddrInfoExW(result); + + result = NULL; + ret = pGetAddrInfoExW(localhost, NULL, NS_DNS, NULL, NULL, &result, NULL, NULL, NULL, NULL); + ok(!ret, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + pFreeAddrInfoExW(result); + + result = (void*)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + overlapped.hEvent = event; + ResetEvent(event); + ret = pGetAddrInfoExW(localhost, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, NULL, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(!result, "result != NULL\n"); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(!ret, "overlapped result is %d\n", ret); + pFreeAddrInfoExW(result); + + result = (void*)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + ResetEvent(event); + overlapped.hEvent = event; + WSASetLastError(0xdeadbeef); + ret = pGetAddrInfoExW(winehq, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, NULL, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == ERROR_IO_PENDING, "expected 11001, got %d\n", WSAGetLastError()); + ret = overlapped.Internal; + ok(ret == WSAEINPROGRESS || ret == ERROR_SUCCESS, "overlapped.Internal = %u\n", ret); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(!ret, "overlapped result is %d\n", ret); + ok(overlapped.hEvent == event, "hEvent changed %p\n", overlapped.hEvent); + ok(overlapped.Internal == ERROR_SUCCESS, "overlapped.Internal = %lx\n", overlapped.Internal); + ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n"); + ok(result != NULL, "result == NULL\n"); + ok(!result->ai_blob, "ai_blob != NULL\n"); + ok(!result->ai_bloblen, "ai_bloblen != 0\n"); + ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); + pFreeAddrInfoExW(result); + + result = (void*)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + ResetEvent(event); + overlapped.hEvent = event; + ret = pGetAddrInfoExW(NULL, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, NULL, NULL); + todo_wine + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + todo_wine + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); + ok(result == NULL, "got %p\n", result); + ret = WaitForSingleObject(event, 0); + todo_wine_if(ret != WAIT_TIMEOUT) /* Remove when abowe todo_wines are fixed */ + ok(ret == WAIT_TIMEOUT, "wait failed\n"); + + WSACloseEvent(event); +} + static void verify_ipv6_addrinfo(ADDRINFOA *result, const char *expectedIp) { SOCKADDR_IN6 *sockaddr6; @@ -10579,6 +10677,7 @@ START_TEST( sock ) test_ipv6only(); test_TransmitFile(); test_GetAddrInfoW(); + test_GetAddrInfoExW(); test_getaddrinfo(); test_AcceptEx(); test_ConnectEx();

1 0

Zebediah Figura : include: Add initial IDL for cmnquery.h.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: bc89730e51b713a3bf5bbcda3c30268818cba34a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc89730e51b713a3bf5bbcda3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 1 10:03:36 2017 -0500 include: Add initial IDL for cmnquery.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/cmnquery.idl | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 063c4ec..81c646e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -24,6 +24,7 @@ IDL_SRCS = \ chprst.idl \ cmdbas.idl \ cmdtxt.idl \ + cmnquery.idl \ colinf.idl \ comcat.idl \ commoncontrols.idl \ diff --git a/include/cmnquery.idl b/include/cmnquery.idl new file mode 100644 index 0000000..f9d2991 --- /dev/null +++ b/include/cmnquery.idl @@ -0,0 +1,79 @@ +/* + * Copyright 2017 Zebediah Figura 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"; + +[ + object, + uuid(1a3114b8-a62e-11d0-a6c5-00a0c906af45), + local +] +interface IPersistQuery : IPersist +{ + HRESULT WriteString([in] LPCWSTR section, [in] LPCWSTR name, [in] LPCWSTR value); + + HRESULT ReadString([in] LPCWSTR section, [in] LPCWSTR name, [out, size_is(buflen)] LPWSTR buffer, [in] INT buflen); + + HRESULT WriteInt([in] LPCWSTR section, [in] LPCWSTR name, [in] INT value); + + HRESULT ReadInt([in] LPCWSTR section, [in] LPCWSTR name, [out] INT *value); + + HRESULT WriteStruct([in] LPCWSTR section, [in] LPCWSTR name, [in] LPVOID value, [in] DWORD size); + + HRESULT ReadStruct([in] LPCWSTR section, [in] LPCWSTR name, [out, size_is(buflen)] LPVOID buffer, [in] DWORD buflen); + + HRESULT Clear(); +} + +cpp_quote("#define OQWF_OKCANCEL 0x00000001") +cpp_quote("#define OQWF_DEFAULTFORM 0x00000002") +cpp_quote("#define OQWF_SINGLESELECT 0x00000004") +cpp_quote("#define OQWF_LOADQUERY 0x00000008") +cpp_quote("#define OQWF_REMOVESCOPES 0x00000010") +cpp_quote("#define OQWF_REMOVEFORMS 0x00000020") +cpp_quote("#define OQWF_ISSUEONOPEN 0x00000040") +cpp_quote("#define OQWF_SHOWOPTIONAL 0x00000080") +cpp_quote("#define OQWF_SAVEQUERYONOK 0x00000200") +cpp_quote("#define OQWF_HIDEMENUS 0x00000400") +cpp_quote("#define OQWF_HIDESEARCHUI 0x00000800") +cpp_quote("#define OQWF_PARAMISPROPERTYBAG 0x80000000") + +typedef struct { + DWORD cbStruct; + DWORD dwFlags; + CLSID clsidHandler; + LPVOID pHandlerParameters; + CLSID clsidDefaultForm; + IPersistQuery *pPersistQuery; + union { + void *pFormParameters; + IPropertyBag *ppbFormParameters; + }; +} OPENQUERYWINDOW, *LPOPENQUERYWINDOW; + +[ + object, + uuid(ab50dec0-6f1d-11d0-a1c4-00aa00c16e65), + local +] +interface ICommonQuery : IUnknown +{ + HRESULT OpenQueryWindow([in] HWND parent, [in] LPOPENQUERYWINDOW query_window, [out] IDataObject **data_object); +} + +cpp_quote("DEFINE_GUID(CLSID_CommonQuery, 0x83bc5ec0, 0x6f2a, 0x11d0, 0xa1,0xc4, 0x00,0xaa,0x00,0xc1,0x6e,0x65);")

1 0

Zebediah Figura : dsquery: Add stub DLL.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: f93e42e08868455d8867f7c5995959f7aae455d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93e42e08868455d8867f7c59… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 14:00:01 2017 -0500 dsquery: Add stub DLL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/dsquery/Makefile.in | 4 +++ dlls/dsquery/dsquery.spec | 19 +++++++++++ dlls/dsquery/main.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 111 insertions(+) diff --git a/configure b/configure index c79f5e6..b09f065 100755 --- a/configure +++ b/configure @@ -1182,6 +1182,7 @@ enable_dpvoice enable_dpwsockx enable_drmclien enable_dsound +enable_dsquery enable_dssenh enable_dswave enable_dwmapi @@ -18310,6 +18311,7 @@ wine_fn_config_dll dpwsockx enable_dpwsockx wine_fn_config_dll drmclien enable_drmclien wine_fn_config_dll dsound enable_dsound clean,implib wine_fn_config_test dlls/dsound/tests dsound_test +wine_fn_config_dll dsquery enable_dsquery wine_fn_config_dll dssenh enable_dssenh wine_fn_config_test dlls/dssenh/tests dssenh_test wine_fn_config_dll dswave enable_dswave clean diff --git a/configure.ac b/configure.ac index ce25b9a..1fbb796 100644 --- a/configure.ac +++ b/configure.ac @@ -3094,6 +3094,7 @@ WINE_CONFIG_DLL(dpwsockx) WINE_CONFIG_DLL(drmclien) WINE_CONFIG_DLL(dsound,,[clean,implib]) WINE_CONFIG_TEST(dlls/dsound/tests) +WINE_CONFIG_DLL(dsquery) WINE_CONFIG_DLL(dssenh) WINE_CONFIG_TEST(dlls/dssenh/tests) WINE_CONFIG_DLL(dswave,,[clean]) diff --git a/dlls/dsquery/Makefile.in b/dlls/dsquery/Makefile.in new file mode 100644 index 0000000..a3f3224 --- /dev/null +++ b/dlls/dsquery/Makefile.in @@ -0,0 +1,4 @@ +MODULE = dsquery.dll + +C_SRCS = \ + main.c diff --git a/dlls/dsquery/dsquery.spec b/dlls/dsquery/dsquery.spec new file mode 100644 index 0000000..721435f --- /dev/null +++ b/dlls/dsquery/dsquery.spec @@ -0,0 +1,19 @@ +256 stub OpenSavedDsQuery +257 stub OpenSavedDsQueryW +258 stub OpenQueryWindow +512 stub @ +513 stub @ +514 stub @ +515 stub @ +516 stub @ +517 stub @ +518 stub @ +519 stub @ +520 stub @ +521 stub @ + +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stub DllInstall +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dsquery/main.c b/dlls/dsquery/main.c new file mode 100644 index 0000000..ccf59f8 --- /dev/null +++ b/dlls/dsquery/main.c @@ -0,0 +1,85 @@ +/* + * Copyright 2017 Zebediah Figura 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 "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dsquery); + +static HINSTANCE instance; + +/*********************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", inst, reason, reserved); + + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = inst; + DisableThreadLibraryCalls(inst); + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllCanUnloadNow (DSQUERY.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** + * DllGetClassObject (DSQUERY.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) +{ + TRACE("rclsid %s, riid %s, out %p\n", debugstr_guid(rclsid), debugstr_guid(riid), out); + + FIXME("%s: no class found\n", debugstr_guid(rclsid)); + *out = NULL; + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllRegisterServer (DSQUERY.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( instance ); +} + +/*********************************************************************** + * DllUnregisterServer (DSQUERY.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( instance ); +}

1 0

Zebediah Figura : dsquery: Add stub implementation of ICommonQuery.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: 064f74bf0852b47e67e7392980dc7b39fb0ae6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=064f74bf0852b47e67e739298… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 14:24:57 2017 -0500 dsquery: Add stub implementation of ICommonQuery. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsquery/Makefile.in | 1 + dlls/dsquery/main.c | 187 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 188 insertions(+) diff --git a/dlls/dsquery/Makefile.in b/dlls/dsquery/Makefile.in index a3f3224..8fbe92d 100644 --- a/dlls/dsquery/Makefile.in +++ b/dlls/dsquery/Makefile.in @@ -1,4 +1,5 @@ MODULE = dsquery.dll +IMPORTS = uuid C_SRCS = \ main.c diff --git a/dlls/dsquery/main.c b/dlls/dsquery/main.c index ccf59f8..eee32cb 100644 --- a/dlls/dsquery/main.c +++ b/dlls/dsquery/main.c @@ -20,16 +20,183 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "objbase.h" #include "rpcproxy.h" +#include "initguid.h" +#include "cmnquery.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dsquery); static HINSTANCE instance; +/****************************************************************** + * IClassFactory implementation + */ +struct query_class_factory { + IClassFactory IClassFactory_iface; + LONG ref; + HRESULT (*pfnCreateInstance)(IUnknown *outer, REFIID riid, void **out); +}; + +static inline struct query_class_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct query_class_factory, IClassFactory_iface); +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **out) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_IClassFactory) || IsEqualGUID(riid, &IID_IUnknown)) + { + IClassFactory_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + struct query_class_factory *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) increasing refcount to %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + struct query_class_factory *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) decreasing refcount to %u\n", iface, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, + IUnknown *outer, REFIID riid, void **out) +{ + struct query_class_factory *This = impl_from_IClassFactory(iface); + + TRACE("(%p)->(%p, %s, %p)\n", iface, outer, debugstr_guid(riid), out); + + return This->pfnCreateInstance(outer, riid, out); +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) +{ + FIXME("(%p)->(%d)\n", iface, dolock); + + return S_OK; +} + +static const IClassFactoryVtbl query_class_factory_vtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer, +}; + +/****************************************************************** + * ICommonQuery implementation + */ +struct common_query { + ICommonQuery ICommonQuery_iface; + LONG ref; +}; + +static inline struct common_query *impl_from_ICommonQuery(ICommonQuery *iface) +{ + return CONTAINING_RECORD(iface, struct common_query, ICommonQuery_iface); +} + +static HRESULT WINAPI CommonQuery_QueryInterface(ICommonQuery *iface, REFIID riid, void **out) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ICommonQuery) || IsEqualGUID(riid, &IID_IUnknown)) + { + ICommonQuery_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI CommonQuery_AddRef(ICommonQuery *iface) +{ + struct common_query *This = impl_from_ICommonQuery(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) increasing refcount to %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI CommonQuery_Release(ICommonQuery *iface) +{ + struct common_query *This = impl_from_ICommonQuery(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) decreasing refcount to %u\n", iface, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI CommonQuery_OpenQueryWindow(ICommonQuery *iface, + HWND parent, LPOPENQUERYWINDOW query_window, IDataObject **data_object) +{ + FIXME("(%p)->(%p, %p, %p) stub!\n", iface, parent, query_window, data_object); + + return E_NOTIMPL; +} + +static const ICommonQueryVtbl CommonQuery_vtbl = +{ + CommonQuery_QueryInterface, + CommonQuery_AddRef, + CommonQuery_Release, + CommonQuery_OpenQueryWindow, +}; + +static HRESULT CommonQuery_create(IUnknown *outer, REFIID riid, void **out) +{ + struct common_query *query; + + TRACE("outer %p, riid %s, out %p\n", outer, debugstr_guid(riid), out); + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (!(query = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*query)))) + return E_OUTOFMEMORY; + + query->ICommonQuery_iface.lpVtbl = &CommonQuery_vtbl; + return ICommonQuery_QueryInterface(&query->ICommonQuery_iface, riid, out); +} + /*********************************************************************** * DllMain */ @@ -63,6 +230,26 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) { TRACE("rclsid %s, riid %s, out %p\n", debugstr_guid(rclsid), debugstr_guid(riid), out); + if (!IsEqualGUID( &IID_IClassFactory, riid) + && !IsEqualGUID( &IID_IUnknown, riid)) + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; + } + + if (IsEqualGUID(&CLSID_CommonQuery, rclsid)) + { + struct query_class_factory *factory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*factory)); + if (!factory) return E_OUTOFMEMORY; + + factory->IClassFactory_iface.lpVtbl = &query_class_factory_vtbl; + factory->ref = 1; + factory->pfnCreateInstance = CommonQuery_create; + *out = factory; + return S_OK; + } + FIXME("%s: no class found\n", debugstr_guid(rclsid)); *out = NULL; return CLASS_E_CLASSNOTAVAILABLE;

1 0

Alistair Leslie-Hughes : msxml3/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: 2ccf4ab8edb0db976eaceb6882bf81859bc1b099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ccf4ab8edb0db976eaceb688… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 27 04:45:16 2017 +0000 msxml3/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/schema.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 8f24e1e..ee84b92 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -432,9 +432,8 @@ static const CHAR szOpenSeqXML4[] = "<test><x/><x/><y/><z/><z/><v/></test>"; #define _expect64(expr, str, base, TYPE, CONV) { \ TYPE v1 = expr; \ TYPE v2 = CONV(str, NULL, base); \ - ok(v1 == v2, #expr "returned 0x%08x%08x, expected 0x%08x%08x\n", \ - (ULONG)((ULONG64)v1 >> 32), (ULONG)((ULONG64)v2 & (ULONG64)0xffffffff), \ - (ULONG)((ULONG64)v1 >> 32), (ULONG)((ULONG64)v2 & (ULONG64)0xffffffff)); \ + ok(v1 == v2, #expr "returned %s, expected %s\n", \ + wine_dbgstr_longlong(v1), wine_dbgstr_longlong(v2)); \ } #define expect_int64(expr, x, base) _expect64(expr, #x, base, LONG64, strtoll)

1 0

Alistair Leslie-Hughes : msvcp90/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: c4429b6dc25346670b080e0c9052c46dd9cfaffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4429b6dc25346670b080e0c9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 1 01:25:52 2017 +0000 msvcp90/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/tests/ios.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index c1d6589..90fa6b1 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1132,8 +1132,8 @@ static void test_num_get_get_uint64(void) } ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); - ok(tests[i].val == val, "wrong val, expected = %lx%08lx found %lx%08lx\n", (unsigned long)(tests[i].val >> 32), - (unsigned long)tests[i].val, (unsigned long)(val >> 32), (unsigned long)val); + ok(tests[i].val == val, "wrong val, expected = %s found %s\n", wine_dbgstr_longlong(tests[i].val), + wine_dbgstr_longlong(val)); ok(tests[i].next == next, "wrong next, expected = %c (%i) found = %c (%i)\n", tests[i].next, tests[i].next, next, next); if(tests[i].lcl) @@ -1159,8 +1159,8 @@ static void test_num_get_get_uint64(void) nextus = (unsigned short)(int)call_func1(p_basic_istream_wchar_get, &wss.base.base1); ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); - ok(tests[i].val == val, "wrong val, expected = %lx%08lx found %lx%08lx\n", (unsigned long)(tests[i].val >> 32), - (unsigned long)tests[i].val, (unsigned long)(val >> 32), (unsigned long)val); + ok(tests[i].val == val, "wrong val, expected = %s found %s\n", wine_dbgstr_longlong(tests[i].val), + wine_dbgstr_longlong(val)); testus = tests[i].next == EOF ? WEOF : (unsigned short)tests[i].next; ok(testus == nextus, "wrong next, expected = %c (%i) found = %c (%i)\n", testus, testus, nextus, nextus);

1 0