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

Vincent Povirk : mscoree: Fix locking in GetRuntimeHost.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: bb256b4f211852ddf5c3ed2c1a2827c39e11cb53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb256b4f211852ddf5c3ed2c1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 2 11:24:15 2017 -0500 mscoree: Fix locking in GetRuntimeHost. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 6edd30f..bf70baa 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -342,6 +342,7 @@ static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost * if (This->loaded_runtime) { *result = This->loaded_runtime; + LeaveCriticalSection(&runtime_list_cs); return hr; }

1 0

Jacek Caban : rpcrt4: Always protect ref access for connections associated with protseq in RPCRT4_ReleaseConnection.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: 2d9e894d285937716a4541c7fab9152fdf0b495f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d9e894d285937716a4541c7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 2 15:51:09 2017 +0200 rpcrt4: Always protect ref access for connections associated with protseq in RPCRT4_ReleaseConnection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 48def49..5735b0f 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -3382,20 +3382,24 @@ RpcConnection *RPCRT4_GrabConnection(RpcConnection *connection) void RPCRT4_ReleaseConnection(RpcConnection *connection) { - LONG ref = InterlockedDecrement(&connection->ref); + LONG ref; - if (!ref && connection->protseq) + /* protseq stores a list of active connections, but does not own references to them. + * It may need to grab a connection from the list, which could lead to a race if + * connection is being released, but not yet removed from the list. We handle that + * by synchronizing on CS here. */ + if (connection->protseq) { - /* protseq stores a list of active connections, but does not own references to them. - * It may need to grab a connection from the list, which could lead to a race if - * connection is being released, but not yet removed from the list. We handle that - * by synchronizing on CS here. */ EnterCriticalSection(&connection->protseq->cs); - ref = connection->ref; + ref = InterlockedDecrement(&connection->ref); if (!ref) list_remove(&connection->protseq_entry); LeaveCriticalSection(&connection->protseq->cs); } + else + { + ref = InterlockedDecrement(&connection->ref); + } TRACE("%p ref=%u\n", connection, ref);

1 0

Jacek Caban : ws2_32: Factor out GetAddrInfoW implementation.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: 39fe376e92d1ac8a456424802be4bc28be955293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39fe376e92d1ac8a456424802… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 1 18:29:21 2017 +0200 ws2_32: Factor out GetAddrInfoW implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 91 +++++++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 41 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 620b19b..e1cc15f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6823,49 +6823,13 @@ static struct WS_addrinfo *addrinfo_WtoA(const struct WS_addrinfoW *ai) return ret; } -/*********************************************************************** - * GetAddrInfoExW (WS2_32.@) - */ -int WINAPI GetAddrInfoExW(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) -{ - FIXME("(%s %s %x %s %p %p %p %p %p %p)\n", debugstr_w(name), debugstr_w(servname), namespace, - debugstr_guid(namespace_id), hints, result, timeout, overlapped, completion_routine, handle); - return WSAHOST_NOT_FOUND; -} - -/*********************************************************************** - * GetAddrInfoExOverlappedResult (WS2_32.@) - */ -int WINAPI GetAddrInfoExOverlappedResult(OVERLAPPED *overlapped) -{ - FIXME("(%p)\n", overlapped); - return SOCKET_ERROR; -} - -/*********************************************************************** - * GetAddrInfoExCancel (WS2_32.@) - */ -int WINAPI GetAddrInfoExCancel(HANDLE *handle) -{ - FIXME("(%p)\n", handle); - return WSA_INVALID_HANDLE; -} - -/*********************************************************************** - * GetAddrInfoW (WS2_32.@) - */ -int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, PADDRINFOW *res) +static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const struct WS_addrinfo *hints, PADDRINFOW *res) { int ret = EAI_MEMORY, len, i; char *nodenameA = NULL, *servnameA = NULL; - struct WS_addrinfo *resA, *hintsA = NULL; + struct WS_addrinfo *resA; WCHAR *local_nodenameW = (WCHAR *)nodename; - TRACE("nodename %s, servname %s, hints %p, result %p\n", - debugstr_w(nodename), debugstr_w(servname), hints, res); - *res = NULL; if (nodename) { @@ -6911,9 +6875,7 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hin WideCharToMultiByte(CP_ACP, 0, servname, -1, servnameA, len, NULL, NULL); } - if (hints) hintsA = addrinfo_WtoA(hints); - ret = WS_getaddrinfo(nodenameA, servnameA, hintsA, &resA); - WS_freeaddrinfo(hintsA); + ret = WS_getaddrinfo(nodenameA, servnameA, hints, &resA); if (!ret) { @@ -6930,6 +6892,53 @@ end: } /*********************************************************************** + * GetAddrInfoExW (WS2_32.@) + */ +int WINAPI GetAddrInfoExW(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) +{ + FIXME("(%s %s %x %s %p %p %p %p %p %p)\n", debugstr_w(name), debugstr_w(servname), namespace, + debugstr_guid(namespace_id), hints, result, timeout, overlapped, completion_routine, handle); + return WSAHOST_NOT_FOUND; +} + +/*********************************************************************** + * GetAddrInfoExOverlappedResult (WS2_32.@) + */ +int WINAPI GetAddrInfoExOverlappedResult(OVERLAPPED *overlapped) +{ + FIXME("(%p)\n", overlapped); + return SOCKET_ERROR; +} + +/*********************************************************************** + * GetAddrInfoExCancel (WS2_32.@) + */ +int WINAPI GetAddrInfoExCancel(HANDLE *handle) +{ + FIXME("(%p)\n", handle); + return WSA_INVALID_HANDLE; +} + +/*********************************************************************** + * GetAddrInfoW (WS2_32.@) + */ +int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, PADDRINFOW *res) +{ + struct WS_addrinfo *hintsA = NULL; + int ret = EAI_MEMORY; + + TRACE("nodename %s, servname %s, hints %p, result %p\n", + debugstr_w(nodename), debugstr_w(servname), hints, res); + + if (hints) hintsA = addrinfo_WtoA(hints); + ret = WS_getaddrinfoW(nodename, servname, hintsA, res); + WS_freeaddrinfo(hintsA); + return ret; +} + +/*********************************************************************** * FreeAddrInfoW (WS2_32.@) */ void WINAPI FreeAddrInfoW(PADDRINFOW ai)

1 0

Jacek Caban : ws2_32: Added FreeAddrInfoEx implementation.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: 001a8a4f2725dc48f989b0aafdc2d6145ee31237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=001a8a4f2725dc48f989b0aaf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 1 18:29:31 2017 +0200 ws2_32: Added FreeAddrInfoEx implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 +++++++++++- include/ws2tcpip.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e1cc15f..71241c6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6959,7 +6959,17 @@ void WINAPI FreeAddrInfoW(PADDRINFOW ai) */ void WINAPI FreeAddrInfoExW(ADDRINFOEXW *ai) { - FIXME("%p\n", ai); + TRACE("(%p)\n", ai); + + while (ai) + { + ADDRINFOEXW *next; + HeapFree(GetProcessHeap(), 0, ai->ai_canonname); + HeapFree(GetProcessHeap(), 0, ai->ai_addr); + next = ai->ai_next; + HeapFree(GetProcessHeap(), 0, ai); + ai = next; + } } int WINAPI WS_getnameinfo(const SOCKADDR *sa, WS_socklen_t salen, PCHAR host, diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 2d509be..f12deec 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -173,6 +173,7 @@ void WINAPI WS(freeaddrinfo)(LPADDRINFO); #define FreeAddrInfoA WS(freeaddrinfo) void WINAPI FreeAddrInfoW(PADDRINFOW); #define FreeAddrInfo WINELIB_NAME_AW(FreeAddrInfo) +void WINAPI FreeAddrInfoExW(ADDRINFOEXW*); int WINAPI WS(getaddrinfo)(const char*,const char*,const struct WS(addrinfo)*,struct WS(addrinfo)**); #define GetAddrInfoA WS(getaddrinfo) int WINAPI GetAddrInfoW(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*);

1 0

Jacek Caban : ws2_32: Return ADDRINFOEXW type from WS_getaddrinfoW.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: 037e6010dac62a6d5cb419aac47d5b8df1ce7da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=037e6010dac62a6d5cb419aac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 1 18:29:35 2017 +0200 ws2_32: Return ADDRINFOEXW type from WS_getaddrinfoW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 71241c6..37931a5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6733,11 +6733,11 @@ outofmem: #endif } -static struct WS_addrinfoW *addrinfo_AtoW(const struct WS_addrinfo *ai) +static ADDRINFOEXW *addrinfo_AtoW(const struct WS_addrinfo *ai) { - struct WS_addrinfoW *ret; + ADDRINFOEXW *ret; - if (!(ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct WS_addrinfoW)))) return NULL; + if (!(ret = HeapAlloc(GetProcessHeap(), 0, sizeof(ADDRINFOEXW)))) return NULL; ret->ai_flags = ai->ai_flags; ret->ai_family = ai->ai_family; ret->ai_socktype = ai->ai_socktype; @@ -6745,6 +6745,9 @@ static struct WS_addrinfoW *addrinfo_AtoW(const struct WS_addrinfo *ai) ret->ai_addrlen = ai->ai_addrlen; ret->ai_canonname = NULL; ret->ai_addr = NULL; + ret->ai_blob = NULL; + ret->ai_bloblen = 0; + ret->ai_provider = NULL; ret->ai_next = NULL; if (ai->ai_canonname) { @@ -6769,16 +6772,16 @@ static struct WS_addrinfoW *addrinfo_AtoW(const struct WS_addrinfo *ai) return ret; } -static struct WS_addrinfoW *addrinfo_list_AtoW(const struct WS_addrinfo *info) +static ADDRINFOEXW *addrinfo_list_AtoW(const struct WS_addrinfo *info) { - struct WS_addrinfoW *ret, *infoW; + ADDRINFOEXW *ret, *infoW; if (!(ret = infoW = addrinfo_AtoW(info))) return NULL; while (info->ai_next) { if (!(infoW->ai_next = addrinfo_AtoW(info->ai_next))) { - FreeAddrInfoW(ret); + FreeAddrInfoExW(ret); return NULL; } infoW = infoW->ai_next; @@ -6823,7 +6826,7 @@ static struct WS_addrinfo *addrinfo_WtoA(const struct WS_addrinfoW *ai) return ret; } -static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const struct WS_addrinfo *hints, PADDRINFOW *res) +static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const struct WS_addrinfo *hints, ADDRINFOEXW **res) { int ret = EAI_MEMORY, len, i; char *nodenameA = NULL, *servnameA = NULL; @@ -6927,15 +6930,29 @@ int WINAPI GetAddrInfoExCancel(HANDLE *handle) int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, PADDRINFOW *res) { struct WS_addrinfo *hintsA = NULL; + ADDRINFOEXW *resex; int ret = EAI_MEMORY; TRACE("nodename %s, servname %s, hints %p, result %p\n", debugstr_w(nodename), debugstr_w(servname), hints, res); + *res = NULL; if (hints) hintsA = addrinfo_WtoA(hints); - ret = WS_getaddrinfoW(nodename, servname, hintsA, res); + ret = WS_getaddrinfoW(nodename, servname, hintsA, &resex); WS_freeaddrinfo(hintsA); - return ret; + if (ret) return ret; + + if (resex) + { + /* ADDRINFOEXW has layout compatible with ADDRINFOW except for ai_next field, + * so we may convert it in place */ + *res = (ADDRINFOW*)resex; + do { + ((ADDRINFOW*)resex)->ai_next = (ADDRINFOW*)resex->ai_next; + resex = resex->ai_next; + } while (resex); + } + return 0; } /***********************************************************************

1 0

Jacek Caban : ws2_32: Added partial GetAddrInfoExW implementation.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: a17ac691bc0618fdf66e3c2e23ee99dcc6b66b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17ac691bc0618fdf66e3c2e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 1 18:29:39 2017 +0200 ws2_32: Added partial GetAddrInfoExW implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 37931a5..b47e84d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6901,9 +6901,30 @@ int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namesp const ADDRINFOEXW *hints, ADDRINFOEXW **result, struct timeval *timeout, OVERLAPPED *overlapped, LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle) { - FIXME("(%s %s %x %s %p %p %p %p %p %p)\n", debugstr_w(name), debugstr_w(servname), namespace, + int ret; + + TRACE("(%s %s %x %s %p %p %p %p %p %p)\n", debugstr_w(name), debugstr_w(servname), namespace, debugstr_guid(namespace_id), hints, result, timeout, overlapped, completion_routine, handle); - return WSAHOST_NOT_FOUND; + + if (namespace != NS_DNS) + FIXME("Unsupported namespace %u\n", namespace); + if (namespace_id) + FIXME("Unsupported naemspace_id %s\n", debugstr_guid(namespace_id)); + if (hints) + FIXME("Unsupported hints\n"); + if (timeout) + FIXME("Unsupported timeout\n"); + if (overlapped) + FIXME("Unsupported overlapped\n"); + if (completion_routine) + FIXME("Unsupported completion_routine\n"); + if (handle) + FIXME("Unsupported cancel handle\n"); + + ret = WS_getaddrinfoW(name, servname, NULL, result); + if (ret) return ret; + if (handle) *handle = (HANDLE)0xdeadbeef; + return 0; } /***********************************************************************

1 0

Jacek Caban : ws2_32: Added support for overlapped GetAddrInfoExW.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: a71c18e7fd11611da6775e6dee1100c51fbffeb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71c18e7fd11611da6775e6de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 1 19:36:28 2017 +0200 ws2_32: Added support for overlapped GetAddrInfoExW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b47e84d..9cae18f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6826,7 +6826,39 @@ static struct WS_addrinfo *addrinfo_WtoA(const struct WS_addrinfoW *ai) return ret; } -static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const struct WS_addrinfo *hints, ADDRINFOEXW **res) +struct getaddrinfo_args +{ + OVERLAPPED *overlapped; + ADDRINFOEXW **result; + char *nodename; + char *servname; +}; + +static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *context) +{ + struct getaddrinfo_args *args = context; + OVERLAPPED *overlapped = args->overlapped; + HANDLE event = overlapped->hEvent; + struct WS_addrinfo *res; + int ret; + + ret = WS_getaddrinfo(args->nodename, args->servname, NULL, &res); + if (res) + { + *args->result = addrinfo_list_AtoW(res); + overlapped->u.Pointer = args->result; + WS_freeaddrinfo(res); + } + + HeapFree(GetProcessHeap(), 0, args->nodename); + HeapFree(GetProcessHeap(), 0, args->servname); + HeapFree(GetProcessHeap(), 0, args); + + overlapped->Internal = ret; + if (event) SetEvent(event); +} + +static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const struct WS_addrinfo *hints, ADDRINFOEXW **res, OVERLAPPED *overlapped) { int ret = EAI_MEMORY, len, i; char *nodenameA = NULL, *servnameA = NULL; @@ -6878,8 +6910,32 @@ static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const s WideCharToMultiByte(CP_ACP, 0, servname, -1, servnameA, len, NULL, NULL); } - ret = WS_getaddrinfo(nodenameA, servnameA, hints, &resA); + if (overlapped) + { + struct getaddrinfo_args *args; + + if (!(args = HeapAlloc(GetProcessHeap(), 0, sizeof(*args)))) goto end; + args->overlapped = overlapped; + args->result = res; + args->nodename = nodenameA; + args->servname = servnameA; + + overlapped->Internal = WSAEINPROGRESS; + if (!TrySubmitThreadpoolCallback(getaddrinfo_callback, args, NULL)) + { + HeapFree(GetProcessHeap(), 0, args); + ret = GetLastError(); + goto end; + } + + if (local_nodenameW != nodename) + HeapFree(GetProcessHeap(), 0, local_nodenameW); + WSASetLastError(ERROR_IO_PENDING); + return ERROR_IO_PENDING; + } + + ret = WS_getaddrinfo(nodenameA, servnameA, hints, &resA); if (!ret) { *res = addrinfo_list_AtoW(resA); @@ -6914,14 +6970,12 @@ int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namesp FIXME("Unsupported hints\n"); if (timeout) FIXME("Unsupported timeout\n"); - if (overlapped) - FIXME("Unsupported overlapped\n"); if (completion_routine) FIXME("Unsupported completion_routine\n"); if (handle) FIXME("Unsupported cancel handle\n"); - ret = WS_getaddrinfoW(name, servname, NULL, result); + ret = WS_getaddrinfoW(name, servname, NULL, result, overlapped); if (ret) return ret; if (handle) *handle = (HANDLE)0xdeadbeef; return 0; @@ -6932,8 +6986,8 @@ int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namesp */ int WINAPI GetAddrInfoExOverlappedResult(OVERLAPPED *overlapped) { - FIXME("(%p)\n", overlapped); - return SOCKET_ERROR; + TRACE("(%p)\n", overlapped); + return overlapped->Internal; } /*********************************************************************** @@ -6959,7 +7013,7 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hin *res = NULL; if (hints) hintsA = addrinfo_WtoA(hints); - ret = WS_getaddrinfoW(nodename, servname, hintsA, &resex); + ret = WS_getaddrinfoW(nodename, servname, hintsA, &resex, NULL); WS_freeaddrinfo(hintsA); if (ret) return ret;

1 0

Jeremy Newman : remove appHitStats and catHitStats, no longer used
by Jeremy Newman 02 Aug '17

02 Aug '17

Module: appdb Branch: master Commit: 75edc0778910135ac90365b6e72ed0741f81ee56 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=75edc0778910135ac90365b6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Aug 2 08:33:33 2017 -0500 remove appHitStats and catHitStats, no longer used There are better ways of tracking that information than storing it in sql tables. --- tables/appdb_tables.sql | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index d4c5b6b..30af6ca 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -6,8 +6,6 @@ drop table if exists vendor; drop table if exists appFamily; drop table if exists appVersion; drop table if exists appCategory; -drop table if exists appHitStats; -drop table if exists catHitStats; drop table if exists appComments; drop table if exists appData; drop table if exists appBundle; @@ -94,28 +92,6 @@ create table appBundle ( /* - * appHitStats and catHitStats are to record statistics - */ -create table appHitStats ( - appHitId int not null auto_increment, - time datetime, - ip varchar(16), - appId int not null, - count int, - key(appHitId) -); - -create table catHitStats ( - catHitId int not null auto_increment, - time datetime, - ip varchar(16), - catId int not null, - count int, - key(catHitId) -); - - -/* * user comments */ create table appComments (

1 0

Józef Kucia : opengl32: Update OpenGL Registry files URLs.
by Alexandre Julliard 01 Aug '17

01 Aug '17

Module: wine Branch: master Commit: 2901ccceb0fe2f98bc68fd0abb10e9438c397bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2901ccceb0fe2f98bc68fd0ab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 1 00:14:38 2017 +0200 opengl32: Update OpenGL Registry files URLs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 45e3f72..deb95be 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -8,8 +8,8 @@ use XML::Simple; # # - It needs files from the OpenGL extension registry: # -# https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/gl.xml -# https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/wgl.xml +# https://raw.github.com/KhronosGroup/OpenGL-Registry/master/xml/gl.xml +# https://raw.github.com/KhronosGroup/OpenGL-Registry/master/xml/wgl.xml # # If they are not found in the current directory the script will # attempt to download them from there. @@ -404,8 +404,8 @@ if ($version eq "1.0") { # # Fetch the registry files # --f "gl.xml" || system "wget --no-check-certificate https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/gl.xml" || die "cannot download gl.xml"; --f "wgl.xml" || system "wget --no-check-certificate https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/wgl.xml" || die "cannot download wgl.xml"; +-f "gl.xml" || system "wget https://raw.github.com/KhronosGroup/OpenGL-Registry/master/xml/gl.xml" || die "cannot download gl.xml"; +-f "wgl.xml" || system "wget https://raw.github.com/KhronosGroup/OpenGL-Registry/master/xml/wgl.xml" || die "cannot download wgl.xml"; #

1 0

Józef Kucia : wined3d: Update ARB_pipeline_statistics_query extension detection.
by Alexandre Julliard 01 Aug '17

01 Aug '17

Module: wine Branch: master Commit: 0e2f75b2f6296ab58017e6d846a9d4082e5bc3dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e2f75b2f6296ab58017e6d84… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 31 23:31:17 2017 +0200 wined3d: Update ARB_pipeline_statistics_query extension detection. ARB_pipeline_statistics_query is included in OpenGL 4.6. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9707f81..919b997 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3898,6 +3898,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_DERIVATIVE_CONTROL, MAKEDWORD_VERSION(4, 5)}, + + {ARB_PIPELINE_STATISTICS_QUERY, MAKEDWORD_VERSION(4, 6)}, }; struct wined3d_driver_info *driver_info = &adapter->driver_info; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str;

1 0