wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Santino Mazza : ncrypt: Implement NCryptImportKey function.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 2252613aba4ebce74442e8c303df68b324f10d8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2252613aba4ebce74442e8c3… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Wed Feb 16 15:13:05 2022 +0100 ncrypt: Implement NCryptImportKey function. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 116 +++++++++++++++++++++++++++++++++++------- dlls/ncrypt/ncrypt_internal.h | 31 +++++++++++ dlls/ncrypt/tests/ncrypt.c | 2 - 3 files changed, 128 insertions(+), 21 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 44cfe781e7c..0d5a40b7b26 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -24,17 +24,17 @@ #include "windef.h" #include "winbase.h" #include "ncrypt.h" +#include "bcrypt.h" #include "ncrypt_internal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, - const WCHAR *algid, const WCHAR *name, DWORD keyspec, - DWORD flags) + const WCHAR *algid, const WCHAR *name, DWORD keyspec, DWORD flags) { FIXME("(0x%lx, %p, %s, %s, 0x%08x, 0x%08x): stub\n", provider, key, wine_dbgstr_w(algid), - wine_dbgstr_w(name), keyspec, flags); + wine_dbgstr_w(name), keyspec, flags); return NTE_NOT_SUPPORTED; } @@ -42,7 +42,7 @@ SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD i BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding, - output, outsize, result, flags); + output, outsize, result, flags); return NTE_NOT_SUPPORTED; } @@ -56,13 +56,12 @@ SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD i BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding, - output, outsize, result, flags); + output, outsize, result, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptEnumAlgorithms(NCRYPT_PROV_HANDLE provider, DWORD alg_ops, - DWORD *alg_count, NCryptAlgorithmName **alg_list, - DWORD flags) + DWORD *alg_count, NCryptAlgorithmName **alg_list, DWORD flags) { FIXME("(0x%lx, 0x%08x, %p, %p, 0x%08x): stub\n", provider, alg_ops, alg_count, alg_list, flags); return NTE_NOT_SUPPORTED; @@ -96,8 +95,7 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE object) SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE object, const WCHAR *property, PBYTE output, DWORD outsize, DWORD *result, DWORD flags) { - FIXME("(0x%lx, %s, %p, %u, %p, 0x%08x): stub\n", object, wine_dbgstr_w(property), output, outsize, - result, flags); + FIXME("(0x%lx, %s, %p, %u, %p, 0x%08x): stub\n", object, wine_dbgstr_w(property), output, outsize, result, flags); return NTE_NOT_SUPPORTED; } @@ -110,17 +108,98 @@ static struct object *allocate_object(enum object_type type) } SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE decrypt_key, - const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *key, - PBYTE data, DWORD datasize, DWORD flags) + const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *handle, + BYTE *data, DWORD datasize, DWORD flags) { - FIXME("(0x%lx, 0x%lx, %s, %p, %p, %p, %u, 0x%08x): stub\n", provider, decrypt_key, - wine_dbgstr_w(type), params, - key, data, datasize, flags); - return NTE_NOT_SUPPORTED; + BCRYPT_KEY_BLOB *header = (BCRYPT_KEY_BLOB *)data; + + TRACE("(0x%lx, 0x%lx, %s, %p, %p, %p, %u, 0x%08x): stub\n", provider, decrypt_key, wine_dbgstr_w(type), + params, handle, data, datasize, flags); + + if (decrypt_key) + { + FIXME("Key blob decryption not implemented\n"); + return NTE_NOT_SUPPORTED; + } + if (params) + { + FIXME("Parameter information not implemented\n"); + return NTE_NOT_SUPPORTED; + } + if (flags == NCRYPT_SILENT_FLAG) + { + FIXME("Silent flag not implemented\n"); + } + else if (flags) + { + ERR("Invalid flags 0x%x\n", flags); + return NTE_BAD_FLAGS; + } + + switch (header->Magic) + { + case BCRYPT_RSAPUBLIC_MAGIC: + { + DWORD expected_size; + struct object *object; + struct key *key; + BYTE *public_exp, *modulus; + BCRYPT_RSAKEY_BLOB *rsaheader = (BCRYPT_RSAKEY_BLOB *)data; + + if (datasize < sizeof(*rsaheader)) + { + ERR("Invalid buffer size.\n"); + return NTE_BAD_DATA; + } + + expected_size = sizeof(*rsaheader) + rsaheader->cbPublicExp + rsaheader->cbModulus; + if (datasize != expected_size) + { + ERR("Invalid buffer size.\n"); + return NTE_BAD_DATA; + } + + if (!(object = allocate_object(KEY))) + { + ERR("Error allocating memory.\n"); + return NTE_NO_MEMORY; + } + + key = &object->key; + key->alg = RSA; + key->rsa.public_exp_size = rsaheader->cbPublicExp; + key->rsa.modulus_size = rsaheader->cbModulus; + if (!(key->rsa.public_exp = malloc(rsaheader->cbPublicExp))) + { + ERR("Error allocating memory.\n"); + free(object); + return NTE_NO_MEMORY; + } + if (!(key->rsa.modulus = malloc(rsaheader->cbModulus))) + { + ERR("Error allocating memory.\n"); + free(key->rsa.public_exp); + free(object); + return NTE_NO_MEMORY; + } + + public_exp = &data[sizeof(*rsaheader)]; /* The public exp is after the header. */ + modulus = &public_exp[rsaheader->cbPublicExp]; /* The modulus is after the public exp. */ + memcpy(key->rsa.public_exp, public_exp, rsaheader->cbPublicExp); + memcpy(key->rsa.modulus, modulus, rsaheader->cbModulus); + + *handle = (NCRYPT_KEY_HANDLE)object; + break; + } + default: + FIXME("unhandled key magic %x\n", header->Magic); + return NTE_INVALID_PARAMETER; + } + + return ERROR_SUCCESS; } -SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, - DWORD flags) +SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { FIXME("(0x%lx, %s, 0x%08x): stub\n", provider, wine_dbgstr_w(algid), flags); return NTE_NOT_SUPPORTED; @@ -157,7 +236,6 @@ SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, c SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, PBYTE input, DWORD insize, DWORD flags) { - FIXME("(%lx, %s, %p, %u, 0x%08x): stub\n", object, wine_dbgstr_w(property), input, insize, - flags); + FIXME("(%lx, %s, %p, %u, 0x%08x): stub\n", object, wine_dbgstr_w(property), input, insize, flags); return NTE_NOT_SUPPORTED; } diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h index 7a2d96f8417..fe5f27ea1eb 100644 --- a/dlls/ncrypt/ncrypt_internal.h +++ b/dlls/ncrypt/ncrypt_internal.h @@ -16,12 +16,42 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +enum key_algorithm +{ + DH, + DSA, + ECC, + RSA, +}; + +struct rsa_key +{ + DWORD public_exp_size; + BYTE *public_exp; + DWORD modulus_size; + BYTE *modulus; + DWORD prime1_size; + BYTE *prime1; + DWORD prime2_size; + BYTE *prime2; +}; + +struct key +{ + enum key_algorithm alg; + union + { + struct rsa_key rsa; + }; +}; + struct storage_provider { }; enum object_type { + KEY, STORAGE_PROVIDER, }; @@ -39,6 +69,7 @@ struct object struct object_property *properties; union { + struct key key; struct storage_provider storage_provider; }; }; diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 06551ab3a94..68b893282c2 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -97,7 +97,6 @@ static void test_key_import_rsa(void) ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); ok(prov, "got null handle\n"); - todo_wine { key = 0; ret = NCryptImportKey(prov, 0, BCRYPT_RSAPUBLIC_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob), 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); @@ -135,7 +134,6 @@ static void test_key_import_rsa(void) ok(ret == NTE_BAD_DATA, "got %#lx\n", ret); NCryptFreeObject(prov); - } } START_TEST(ncrypt)

1 0

Santino Mazza : ncrypt: Make NCryptOpenStorageProvider return a valid stub pointer.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: cf3517b7905eceda3fe73977604863c80c9d1193 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf3517b7905eceda3fe73977… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Wed Feb 16 15:13:04 2022 +0100 ncrypt: Make NCryptOpenStorageProvider return a valid stub pointer. Some applications crash when the storage provider is null. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 21 ++++++++++++++++++++- dlls/ncrypt/ncrypt_internal.h | 44 +++++++++++++++++++++++++++++++++++++++++++ dlls/ncrypt/tests/ncrypt.c | 2 -- 3 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f23b239d93f..44cfe781e7c 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -19,10 +19,12 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "ncrypt.h" +#include "ncrypt_internal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); @@ -99,6 +101,14 @@ SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE object, const WCHAR *prop return NTE_NOT_SUPPORTED; } +static struct object *allocate_object(enum object_type type) +{ + struct object *ret; + if (!(ret = calloc(1, sizeof(*ret)))) return NULL; + ret->type = type; + return ret; +} + SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE decrypt_key, const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *key, PBYTE data, DWORD datasize, DWORD flags) @@ -131,8 +141,17 @@ SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HAN SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags) { + struct object *object; + FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); - return NTE_NOT_SUPPORTED; + + if (!(object = allocate_object(STORAGE_PROVIDER))) + { + ERR("Error allocating memory.\n"); + return NTE_NO_MEMORY; + } + *provider = (NCRYPT_PROV_HANDLE)object; + return ERROR_SUCCESS; } SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h new file mode 100644 index 00000000000..7a2d96f8417 --- /dev/null +++ b/dlls/ncrypt/ncrypt_internal.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2021 Santino Mazza + * + * 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 + */ + +struct storage_provider +{ +}; + +enum object_type +{ + STORAGE_PROVIDER, +}; + +struct object_property +{ + WCHAR *key; + DWORD value_size; + void *value; +}; + +struct object +{ + enum object_type type; + DWORD num_properties; + struct object_property *properties; + union + { + struct storage_provider storage_provider; + }; +}; diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index fe0e782b1af..06551ab3a94 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -92,12 +92,10 @@ static void test_key_import_rsa(void) NCRYPT_KEY_HANDLE key; SECURITY_STATUS ret; - todo_wine { prov = 0; ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); ok(prov, "got null handle\n"); - } todo_wine { key = 0;

1 0

Francois Gouget : inetmib1: Fix the IPv4 address network order for comparisons.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 631fde70b8da49de63eca1e161c9b0059b0ad61c URL: https://source.winehq.org/git/wine.git/?a=commit;h=631fde70b8da49de63eca1e1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 16 13:05:55 2022 +0100 inetmib1: Fix the IPv4 address network order for comparisons. compareUdpRow() was already performing the byte-swaps but compareIpAddrRow() and compareIpForwardRow() need them too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetmib1/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index e66dbe0a811..5d925183505 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -778,7 +778,7 @@ static int __cdecl DWORD_cmp(DWORD a, DWORD b) static int __cdecl compareIpAddrRow(const void *a, const void *b) { const MIB_IPADDRROW *rowA = a, *rowB = b; - return DWORD_cmp(rowA->dwAddr, rowB->dwAddr); + return DWORD_cmp(ntohl(rowA->dwAddr), ntohl(rowB->dwAddr)); } static BOOL mib2IpAddrQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -870,7 +870,7 @@ static void oidToIpForwardRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareIpForwardRow(const void *a, const void *b) { const MIB_IPFORWARDROW *rowA = a, *rowB = b; - return DWORD_cmp(rowA->dwForwardDest, rowB->dwForwardDest); + return DWORD_cmp(ntohl(rowA->dwForwardDest), ntohl(rowB->dwForwardDest)); } static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind,

1 0

Francois Gouget : inetmib1: Avoid overflows in IPv4 address comparisons.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 85c6caf65b43c289a84b062e761005b8d03d1e48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85c6caf65b43c289a84b062e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 16 13:05:48 2022 +0100 inetmib1: Avoid overflows in IPv4 address comparisons. The difference between two ULONGs may not fit in an int, causing comparison errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetmib1/main.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 90da277375e..e66dbe0a811 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -770,11 +770,15 @@ static void oidToIpAddrRow(AsnObjectIdentifier *oid, void *dst) row->dwAddr = oidToIpAddr(oid); } -static int __cdecl compareIpAddrRow(const void *a, const void *b) +static int __cdecl DWORD_cmp(DWORD a, DWORD b) { - const MIB_IPADDRROW *key = a, *value = b; + return a < b ? -1 : a > b ? 1 : 0; /* a subtraction would overflow */ +} - return key->dwAddr - value->dwAddr; +static int __cdecl compareIpAddrRow(const void *a, const void *b) +{ + const MIB_IPADDRROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwAddr, rowB->dwAddr); } static BOOL mib2IpAddrQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -865,9 +869,8 @@ static void oidToIpForwardRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareIpForwardRow(const void *a, const void *b) { - const MIB_IPFORWARDROW *key = a, *value = b; - - return key->dwForwardDest - value->dwForwardDest; + const MIB_IPFORWARDROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwForwardDest, rowB->dwForwardDest); } static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -1223,13 +1226,9 @@ static void oidToUdpRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareUdpRow(const void *a, const void *b) { - const MIB_UDPROW *key = a, *value = b; - int ret; - - ret = ntohl(key->dwLocalAddr) - ntohl(value->dwLocalAddr); - if (ret == 0) - ret = ntohs(key->dwLocalPort) - ntohs(value->dwLocalPort); - return ret; + const MIB_UDPROW *rowA = a, *rowB = b; + return DWORD_cmp(ntohl(rowA->dwLocalAddr), ntohl(rowB->dwLocalAddr)) || + ntohs(rowA->dwLocalPort) - ntohs(rowB->dwLocalPort); } static BOOL mib2UdpEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind,

1 0

Francois Gouget : iphlpapi: Fix the IPv4 address network order for comparisons.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: ed4a566f12c2f97e45310513690e3cdfda24402e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed4a566f12c2f97e45310513… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 16 13:05:40 2022 +0100 iphlpapi: Fix the IPv4 address network order for comparisons. ipaddrrow_cmp() and ipforward_row_cmp() must perform byte-swapping in order for the rows to be sorted as expected. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6fe0cbc58f4..041e712f44f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1928,7 +1928,7 @@ done: static int ipaddrrow_cmp( const void *a, const void *b ) { const MIB_IPADDRROW *rowA = a, *rowB = b; - return DWORD_cmp(rowA->dwAddr, rowB->dwAddr); + return DWORD_cmp(RtlUlongByteSwap( rowA->dwAddr ), RtlUlongByteSwap( rowB->dwAddr )); } /****************************************************************** @@ -2034,10 +2034,10 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL s static int ipforward_row_cmp( const void *a, const void *b ) { const MIB_IPFORWARDROW *rowA = a, *rowB = b; - return DWORD_cmp(rowA->dwForwardDest, rowB->dwForwardDest) || + return DWORD_cmp(RtlUlongByteSwap( rowA->dwForwardDest ), RtlUlongByteSwap( rowB->dwForwardDest )) || DWORD_cmp(rowA->dwForwardProto, rowB->dwForwardProto) || DWORD_cmp(rowA->dwForwardPolicy, rowB->dwForwardPolicy) || - DWORD_cmp(rowA->dwForwardNextHop, rowB->dwForwardNextHop); + DWORD_cmp(RtlUlongByteSwap( rowA->dwForwardNextHop ), RtlUlongByteSwap( rowB->dwForwardNextHop )); } /******************************************************************

1 0

Francois Gouget : iphlpapi: Fix ULONG comparisons, most notably for IPv4 addresses.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 3aa18cc5d01028bda126624ba5f5bfb11ebc4f77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa18cc5d01028bda126624b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 16 13:05:29 2022 +0100 iphlpapi: Fix ULONG comparisons, most notably for IPv4 addresses. The difference between two ULONGs may not fit in an int, causing sorting errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 45 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 53b5006d771..6fe0cbc58f4 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1593,9 +1593,15 @@ DWORD WINAPI GetIfEntry( MIB_IFROW *row ) return err; } +static int DWORD_cmp( DWORD a, DWORD b ) +{ + return a < b ? -1 : a > b ? 1 : 0; /* a subtraction would overflow */ +} + static int ifrow_cmp( const void *a, const void *b ) { - return ((const MIB_IFROW*)a)->dwIndex - ((const MIB_IFROW*)b)->dwIndex; + const MIB_IFROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwIndex, rowB->dwIndex); } /****************************************************************** @@ -1921,7 +1927,8 @@ done: static int ipaddrrow_cmp( const void *a, const void *b ) { - return ((const MIB_IPADDRROW*)a)->dwAddr - ((const MIB_IPADDRROW*)b)->dwAddr; + const MIB_IPADDRROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwAddr, rowB->dwAddr); } /****************************************************************** @@ -2026,14 +2033,11 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL s static int ipforward_row_cmp( const void *a, const void *b ) { - const MIB_IPFORWARDROW *rowA = a; - const MIB_IPFORWARDROW *rowB = b; - int ret; - - if ((ret = rowA->dwForwardDest - rowB->dwForwardDest) != 0) return ret; - if ((ret = rowA->dwForwardProto - rowB->dwForwardProto) != 0) return ret; - if ((ret = rowA->dwForwardPolicy - rowB->dwForwardPolicy) != 0) return ret; - return rowA->dwForwardNextHop - rowB->dwForwardNextHop; + const MIB_IPFORWARDROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwForwardDest, rowB->dwForwardDest) || + DWORD_cmp(rowA->dwForwardProto, rowB->dwForwardProto) || + DWORD_cmp(rowA->dwForwardPolicy, rowB->dwForwardPolicy) || + DWORD_cmp(rowA->dwForwardNextHop, rowB->dwForwardNextHop); } /****************************************************************** @@ -2277,10 +2281,8 @@ err: static int ipnetrow_cmp( const void *a, const void *b ) { - const MIB_IPNETROW *row_a = a; - const MIB_IPNETROW *row_b = b; - - return RtlUlongByteSwap( row_a->dwAddr ) - RtlUlongByteSwap( row_b->dwAddr ); + const MIB_IPNETROW *rowA = a, *rowB = b; + return DWORD_cmp(RtlUlongByteSwap( rowA->dwAddr ), RtlUlongByteSwap( rowB->dwAddr )); } /****************************************************************** @@ -3043,13 +3045,12 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas static int tcp_row_cmp( const void *a, const void *b ) { - const MIB_TCPROW *rowA = a; - const MIB_TCPROW *rowB = b; + const MIB_TCPROW *rowA = a, *rowB = b; int ret; - if ((ret = RtlUlongByteSwap( rowA->dwLocalAddr ) - RtlUlongByteSwap( rowB->dwLocalAddr )) != 0) return ret; + if ((ret = DWORD_cmp(RtlUshortByteSwap( rowA->dwLocalAddr ), RtlUshortByteSwap( rowB->dwLocalAddr ))) != 0) return ret; if ((ret = RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort )) != 0) return ret; - if ((ret = RtlUlongByteSwap( rowA->dwRemoteAddr ) - RtlUlongByteSwap( rowB->dwRemoteAddr )) != 0) return ret; + if ((ret = DWORD_cmp(RtlUshortByteSwap( rowA->dwRemoteAddr ), RtlUshortByteSwap( rowB->dwRemoteAddr ))) != 0) return ret; return RtlUshortByteSwap( rowA->dwRemotePort ) - RtlUshortByteSwap( rowB->dwRemotePort ); } @@ -3432,12 +3433,10 @@ static void udp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas static int udp_row_cmp( const void *a, const void *b ) { - const MIB_UDPROW *rowA = a; - const MIB_UDPROW *rowB = b; - int ret; + const MIB_UDPROW *rowA = a, *rowB = b; - if ((ret = RtlUlongByteSwap( rowA->dwLocalAddr ) - RtlUlongByteSwap( rowB->dwLocalAddr )) != 0) return ret; - return RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort ); + return DWORD_cmp(RtlUlongByteSwap( rowA->dwLocalAddr), RtlUlongByteSwap( rowB->dwLocalAddr )) || + RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort ); } static int udp6_row_cmp( const void *a, const void *b )

1 0

Jacek Caban : win32u: Move UnhookWindowsHook implementation from user32.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 8714eb2fef7182a9c73b9963493935decca89fdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8714eb2fef7182a9c73b9963… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 16 12:31:17 2022 +0100 win32u: Move UnhookWindowsHook implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/hook.c | 16 +--------------- dlls/win32u/hook.c | 28 +++++++++++++++++++++++++++- dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u_private.h | 3 +++ include/ntuser.h | 1 + 5 files changed, 34 insertions(+), 16 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 7a9cff63298..1ccd69f5a98 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -520,21 +520,7 @@ HHOOK WINAPI SetWindowsHookExW( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid */ BOOL WINAPI UnhookWindowsHook( INT id, HOOKPROC proc ) { - BOOL ret; - - TRACE( "%s %p\n", hook_names[id-WH_MINHOOK], proc ); - - SERVER_START_REQ( remove_hook ) - { - req->handle = 0; - req->id = id; - req->proc = wine_server_client_ptr( proc ); - ret = !wine_server_call_err( req ); - if (ret) get_user_thread_info()->active_hooks = reply->active_hooks; - } - SERVER_END_REQ; - if (!ret && GetLastError() == ERROR_INVALID_HANDLE) SetLastError( ERROR_INVALID_HOOK_HANDLE ); - return ret; + return NtUserCallTwoParam( id, (UINT_PTR)proc, NtUserUnhookWindowsHook ); } diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index b7630a14f16..b390676fc60 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -53,6 +53,12 @@ static const char * const hook_names[WH_WINEVENT - WH_MINHOOK + 1] = "WH_WINEVENT" }; +static const char *debugstr_hook_id( unsigned int id ) +{ + if (id - WH_MINHOOK >= ARRAYSIZE(hook_names)) return wine_dbg_sprintf( "%u", id ); + return hook_names[id - WH_MINHOOK]; +} + static BOOL is_hooked( INT id ) { struct user_thread_info *thread_info = get_user_thread_info(); @@ -122,7 +128,7 @@ HHOOK WINAPI NtUserSetWindowsHookEx( HINSTANCE inst, UNICODE_STRING *module, DWO } SERVER_END_REQ; - TRACE( "%s %p %x -> %p\n", hook_names[id - WH_MINHOOK], proc, tid, handle ); + TRACE( "%s %p %x -> %p\n", debugstr_hook_id(id), proc, tid, handle ); return handle; } @@ -145,6 +151,26 @@ BOOL WINAPI NtUserUnhookWindowsHookEx( HHOOK handle ) return !status; } +/* see UnhookWindowsHook */ +BOOL unhook_windows_hook( INT id, HOOKPROC proc ) +{ + NTSTATUS status; + + TRACE( "%s %p\n", debugstr_hook_id(id), proc ); + + SERVER_START_REQ( remove_hook ) + { + req->handle = 0; + req->id = id; + req->proc = wine_server_client_ptr( proc ); + status = wine_server_call_err( req ); + if (!status) get_user_thread_info()->active_hooks = reply->active_hooks; + } + SERVER_END_REQ; + if (status == STATUS_INVALID_HANDLE) SetLastError( ERROR_INVALID_HOOK_HANDLE ); + return !status; +} + /*********************************************************************** * NtUserSetWinEventHook (win32u.@) */ diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 93fda23a31e..c9885f89d87 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4565,6 +4565,8 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return mirror_window_region( UlongToHandle(arg1), UlongToHandle(arg2) ); case NtUserMonitorFromRect: return HandleToUlong( monitor_from_rect( (const RECT *)arg1, arg2, get_thread_dpi() )); + case NtUserUnhookWindowsHook: + return unhook_windows_hook( arg1, (HOOKPROC)arg2 ); /* temporary exports */ case NtUserRegisterWindowSurface: register_window_surface( (struct window_surface *)arg1, (struct window_surface *)arg2 ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index c099a8c8c4d..c3419d83858 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -248,6 +248,9 @@ struct unix_funcs /* cursoricon.c */ extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN; +/* hook.c */ +extern BOOL unhook_windows_hook( INT id, HOOKPROC proc ) DECLSPEC_HIDDEN; + /* input.c */ extern LONG global_key_state_counter DECLSPEC_HIDDEN; extern BOOL get_cursor_pos( POINT *pt ) DECLSPEC_HIDDEN; diff --git a/include/ntuser.h b/include/ntuser.h index 14ff5d861d0..6e4183b1e14 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -94,6 +94,7 @@ enum NtUserGetSystemMetricsForDpi, NtUserMirrorRgn, NtUserMonitorFromRect, + NtUserUnhookWindowsHook, /* temporary exports */ NtUserRegisterWindowSurface, };

1 0

Jacek Caban : win32u: Move NtUserUnhookWindowsHookEx implementation from user32.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 6490088e7442b7d26041bfb7e9ac97ce83b691f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6490088e7442b7d26041bfb7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 16 12:31:04 2022 +0100 win32u: Move NtUserUnhookWindowsHookEx implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/hook.c | 21 --------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/hook.c | 19 +++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 7 +++++++ include/ntuser.h | 1 + 8 files changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 71ddb6860dc..7a9cff63298 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -538,27 +538,6 @@ BOOL WINAPI UnhookWindowsHook( INT id, HOOKPROC proc ) } - -/*********************************************************************** - * UnhookWindowsHookEx (USER32.@) - */ -BOOL WINAPI UnhookWindowsHookEx( HHOOK hhook ) -{ - BOOL ret; - - SERVER_START_REQ( remove_hook ) - { - req->handle = wine_server_user_handle( hhook ); - req->id = 0; - ret = !wine_server_call_err( req ); - if (ret) get_user_thread_info()->active_hooks = reply->active_hooks; - } - SERVER_END_REQ; - if (!ret && GetLastError() == ERROR_INVALID_HANDLE) SetLastError( ERROR_INVALID_HOOK_HANDLE ); - return ret; -} - - /*********************************************************************** * CallNextHookEx (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 16342d15ee7..d60b424321b 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -772,7 +772,7 @@ # @ stub TranslateMessageEx @ stdcall UnhookWinEvent(long) NtUserUnhookWinEvent @ stdcall UnhookWindowsHook(long ptr) -@ stdcall UnhookWindowsHookEx(long) +@ stdcall UnhookWindowsHookEx(long) NtUserUnhookWindowsHookEx @ stdcall UnionRect(ptr ptr ptr) @ stdcall UnloadKeyboardLayout(long) @ stub UnlockWindowStation diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index c91ccf41f6f..b7630a14f16 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -126,6 +126,25 @@ HHOOK WINAPI NtUserSetWindowsHookEx( HINSTANCE inst, UNICODE_STRING *module, DWO return handle; } +/*********************************************************************** + * NtUserUnhookWindowsHookEx (win32u.@) + */ +BOOL WINAPI NtUserUnhookWindowsHookEx( HHOOK handle ) +{ + NTSTATUS status; + + SERVER_START_REQ( remove_hook ) + { + req->handle = wine_server_user_handle( handle ); + req->id = 0; + status = wine_server_call_err( req ); + if (!status) get_user_thread_info()->active_hooks = reply->active_hooks; + } + SERVER_END_REQ; + if (status == STATUS_INVALID_HANDLE) SetLastError( ERROR_INVALID_HOOK_HANDLE ); + return !status; +} + /*********************************************************************** * NtUserSetWinEventHook (win32u.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 9258b6b6377..d97688d7c8c 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -143,6 +143,7 @@ static void * const syscalls[] = NtUserSetWinEventHook, NtUserSetWindowsHookEx, NtUserUnhookWinEvent, + NtUserUnhookWindowsHookEx, }; static BYTE arguments[ARRAY_SIZE(syscalls)]; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 0088d21eda5..20faca70c5e 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1285,7 +1285,7 @@ @ stub NtUserTranslateMessage @ stub NtUserUndelegateInput @ stdcall -syscall NtUserUnhookWinEvent(long) -@ stub NtUserUnhookWindowsHookEx +@ stdcall -syscall NtUserUnhookWindowsHookEx(long) @ stub NtUserUnloadKeyboardLayout @ stub NtUserUnlockWindowStation @ stub NtUserUnregisterClass diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 6c70d95f263..47e95a98a4b 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -129,6 +129,7 @@ SYSCALL_ENTRY( NtUserSetThreadDesktop ) \ SYSCALL_ENTRY( NtUserSetWinEventHook ) \ SYSCALL_ENTRY( NtUserSetWindowsHookEx ) \ - SYSCALL_ENTRY( NtUserUnhookWinEvent ) + SYSCALL_ENTRY( NtUserUnhookWinEvent ) \ + SYSCALL_ENTRY( NtUserUnhookWindowsHookEx ) #endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index b78ae290049..cd4dc32d407 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -408,3 +408,10 @@ NTSTATUS WINAPI wow64_NtUserSetWindowsHookEx( UINT *args ) tid, id, proc, ansi ); return HandleToUlong( ret ); } + +NTSTATUS WINAPI wow64_NtUserUnhookWindowsHookEx( UINT *args ) +{ + HHOOK handle = get_handle( &args ); + + return NtUserUnhookWindowsHookEx( handle ); +} diff --git a/include/ntuser.h b/include/ntuser.h index a591363f77e..14ff5d861d0 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -204,6 +204,7 @@ BOOL WINAPI NtUserSystemParametersInfoForDpi( UINT action, UINT val, PVOID pt INT WINAPI NtUserToUnicodeEx( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ); BOOL WINAPI NtUserUnhookWinEvent( HWINEVENTHOOK hEventHook ); +BOOL WINAPI NtUserUnhookWindowsHookEx( HHOOK handle ); BOOL WINAPI NtUserUnregisterHotKey( HWND hwnd, INT id ); WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout );

1 0

Jacek Caban : win32u: Move NtUserSetWindowsHookEx implementation from user32.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: fcf7d2a140c2d4f41bdb3aa5f967ccfe1c728646 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcf7d2a140c2d4f41bdb3aa5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 16 12:30:44 2022 +0100 win32u: Move NtUserSetWindowsHookEx implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/hook.c | 69 +++++++-------------------------------- dlls/win32u/hook.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 16 ++++++++++ include/ntuser.h | 2 ++ 7 files changed, 118 insertions(+), 58 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 3adfba43691..71ddb6860dc 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -140,73 +140,28 @@ static UINT get_ll_hook_timeout(void) * * Implementation of SetWindowsHookExA and SetWindowsHookExW. */ -static HHOOK set_windows_hook( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid, BOOL unicode ) +static HHOOK set_windows_hook( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid, BOOL ansi ) { - HHOOK handle = 0; WCHAR module[MAX_PATH]; - DWORD len; + UNICODE_STRING str; - if (!proc) + if (!inst) { - SetLastError( ERROR_INVALID_FILTER_PROC ); - return 0; + RtlInitUnicodeString( &str, NULL ); } - - if (tid) /* thread-local hook */ + else { - if (id == WH_JOURNALRECORD || - id == WH_JOURNALPLAYBACK || - id == WH_KEYBOARD_LL || - id == WH_MOUSE_LL || - id == WH_SYSMSGFILTER) + size_t len = GetModuleFileNameW( inst, module, ARRAYSIZE(module) ); + if (!len || len >= ARRAYSIZE(module)) { - /* these can only be global */ SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + str.Buffer = module; + str.MaximumLength = str.Length = len * sizeof(WCHAR); } - else /* system-global hook */ - { - if (id == WH_KEYBOARD_LL || id == WH_MOUSE_LL) inst = 0; - else if (!inst) - { - SetLastError( ERROR_HOOK_NEEDS_HMOD ); - return 0; - } - } - - if (inst && (!(len = GetModuleFileNameW( inst, module, MAX_PATH )) || len >= MAX_PATH)) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - - SERVER_START_REQ( set_hook ) - { - req->id = id; - req->pid = 0; - req->tid = tid; - req->event_min = EVENT_MIN; - req->event_max = EVENT_MAX; - req->flags = WINEVENT_INCONTEXT; - req->unicode = unicode; - if (inst) /* make proc relative to the module base */ - { - req->proc = wine_server_client_ptr( (void *)((char *)proc - (char *)inst) ); - wine_server_add_data( req, module, lstrlenW(module) * sizeof(WCHAR) ); - } - else req->proc = wine_server_client_ptr( proc ); - - if (!wine_server_call_err( req )) - { - handle = wine_server_ptr_handle( reply->handle ); - get_user_thread_info()->active_hooks = reply->active_hooks; - } - } - SERVER_END_REQ; - TRACE( "%s %p %x -> %p\n", hook_names[id-WH_MINHOOK], proc, tid, handle ); - return handle; + return NtUserSetWindowsHookEx( inst, &str, tid, id, proc, ansi ); } #ifdef __i386__ @@ -548,7 +503,7 @@ HHOOK WINAPI SetWindowsHookW( INT id, HOOKPROC proc ) */ HHOOK WINAPI SetWindowsHookExA( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid ) { - return set_windows_hook( id, proc, inst, tid, FALSE ); + return set_windows_hook( id, proc, inst, tid, TRUE ); } /*********************************************************************** @@ -556,7 +511,7 @@ HHOOK WINAPI SetWindowsHookExA( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid */ HHOOK WINAPI SetWindowsHookExW( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid ) { - return set_windows_hook( id, proc, inst, tid, TRUE ); + return set_windows_hook( id, proc, inst, tid, FALSE ); } diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index 748ff3e9031..c91ccf41f6f 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -32,6 +32,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(hook); #define WH_WINEVENT (WH_MAXHOOK+1) +static const char * const hook_names[WH_WINEVENT - WH_MINHOOK + 1] = +{ + "WH_MSGFILTER", + "WH_JOURNALRECORD", + "WH_JOURNALPLAYBACK", + "WH_KEYBOARD", + "WH_GETMESSAGE", + "WH_CALLWNDPROC", + "WH_CBT", + "WH_SYSMSGFILTER", + "WH_MOUSE", + "WH_HARDWARE", + "WH_DEBUG", + "WH_SHELL", + "WH_FOREGROUNDIDLE", + "WH_CALLWNDPROCRET", + "WH_KEYBOARD_LL", + "WH_MOUSE_LL", + "WH_WINEVENT" +}; static BOOL is_hooked( INT id ) { @@ -41,6 +61,71 @@ static BOOL is_hooked( INT id ) return (thread_info->active_hooks & (1 << (id - WH_MINHOOK))) != 0; } +/*********************************************************************** + * NtUserSetWindowsHookEx (win32u.@) + */ +HHOOK WINAPI NtUserSetWindowsHookEx( HINSTANCE inst, UNICODE_STRING *module, DWORD tid, INT id, + HOOKPROC proc, BOOL ansi ) +{ + HHOOK handle = 0; + + if (!proc) + { + SetLastError( ERROR_INVALID_FILTER_PROC ); + return 0; + } + + if (tid) /* thread-local hook */ + { + if (id == WH_JOURNALRECORD || + id == WH_JOURNALPLAYBACK || + id == WH_KEYBOARD_LL || + id == WH_MOUSE_LL || + id == WH_SYSMSGFILTER) + { + /* these can only be global */ + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + } + else /* system-global hook */ + { + if (id == WH_KEYBOARD_LL || id == WH_MOUSE_LL) inst = 0; + else if (!inst) + { + SetLastError( ERROR_HOOK_NEEDS_HMOD ); + return 0; + } + } + + SERVER_START_REQ( set_hook ) + { + req->id = id; + req->pid = 0; + req->tid = tid; + req->event_min = EVENT_MIN; + req->event_max = EVENT_MAX; + req->flags = WINEVENT_INCONTEXT; + req->unicode = !ansi; + if (inst) /* make proc relative to the module base */ + { + req->proc = wine_server_client_ptr( (void *)((char *)proc - (char *)inst) ); + wine_server_add_data( req, module->Buffer, module->Length ); + } + else req->proc = wine_server_client_ptr( proc ); + + if (!wine_server_call_err( req )) + { + handle = wine_server_ptr_handle( reply->handle ); + get_user_thread_info()->active_hooks = reply->active_hooks; + } + } + SERVER_END_REQ; + + TRACE( "%s %p %x -> %p\n", hook_names[id - WH_MINHOOK], proc, tid, handle ); + return handle; +} + /*********************************************************************** * NtUserSetWinEventHook (win32u.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 3034a0377ff..9258b6b6377 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -141,6 +141,7 @@ static void * const syscalls[] = NtUserSetProp, NtUserSetThreadDesktop, NtUserSetWinEventHook, + NtUserSetWindowsHookEx, NtUserUnhookWinEvent, }; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 5ddbf53af77..0088d21eda5 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1256,7 +1256,7 @@ @ stub NtUserSetWindowStationUser @ stub NtUserSetWindowWord @ stub NtUserSetWindowsHookAW -@ stub NtUserSetWindowsHookEx +@ stdcall -syscall NtUserSetWindowsHookEx(ptr ptr long long ptr long) @ stub NtUserShowCaret @ stdcall NtUserShowCursor(long) @ stub NtUserShowScrollBar diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 50b442ecaea..6c70d95f263 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -128,6 +128,7 @@ SYSCALL_ENTRY( NtUserSetProp ) \ SYSCALL_ENTRY( NtUserSetThreadDesktop ) \ SYSCALL_ENTRY( NtUserSetWinEventHook ) \ + SYSCALL_ENTRY( NtUserSetWindowsHookEx ) \ SYSCALL_ENTRY( NtUserUnhookWinEvent ) #endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 7a97cbed7f2..b78ae290049 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -392,3 +392,19 @@ NTSTATUS WINAPI wow64_NtUserUnhookWinEvent( UINT *args ) return NtUserUnhookWinEvent( handle ); } + +NTSTATUS WINAPI wow64_NtUserSetWindowsHookEx( UINT *args ) +{ + HINSTANCE inst = get_handle( &args ); + UNICODE_STRING32 *module32 = get_ptr( &args ); + DWORD tid = get_ulong( &args ); + INT id = get_ulong( &args ); + HOOKPROC proc = get_ptr( &args ); + BOOL ansi = get_ulong( &args ); + UNICODE_STRING module; + HHOOK ret; + + ret = NtUserSetWindowsHookEx( inst, unicode_str_32to64( &module, module32 ), + tid, id, proc, ansi ); + return HandleToUlong( ret ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 6f166f70d05..a591363f77e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -193,6 +193,8 @@ BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); BOOL WINAPI NtUserSetProp( HWND hwnd, const WCHAR *str, HANDLE handle ); BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *values ); BOOL WINAPI NtUserSetThreadDesktop( HDESK handle ); +HHOOK WINAPI NtUserSetWindowsHookEx( HINSTANCE inst, UNICODE_STRING *module, DWORD tid, INT id, + HOOKPROC proc, BOOL ansi ); HWINEVENTHOOK WINAPI NtUserSetWinEventHook( DWORD event_min, DWORD event_max, HMODULE inst, UNICODE_STRING *module, WINEVENTPROC proc, DWORD pid, DWORD tid, DWORD flags );

1 0

Jacek Caban : win32u: Move NtUserNotifyWinEvent implementation from user32.
by Alexandre Julliard 16 Feb '22

16 Feb '22

Module: wine Branch: master Commit: 01b3674247b1956fb8d1d46cc725d687a63ed425 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01b3674247b1956fb8d1d46c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 16 12:30:12 2022 +0100 win32u: Move NtUserNotifyWinEvent implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/focus.c | 2 +- dlls/user32/hook.c | 161 +++++---------------------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 1 + dlls/user32/win.c | 2 +- dlls/win32u/hook.c | 96 +++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 11 ++++ include/ntuser.h | 14 ++++ 12 files changed, 144 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01b3674247b1956fb8d1…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022