October 2021 - Wine-commits

Alexandre Julliard : bcrypt: Remove some no longer needed Unix backend functions.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: e4f716bc26fc61e2734f6e8dec4473fc63b6b99f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4f716bc26fc61e2734f6e8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 11:17:07 2021 +0200 bcrypt: Remove some no longer needed Unix backend functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 3 -- dlls/bcrypt/bcrypt_main.c | 65 +++++++++++++++++++++++++++++----------- dlls/bcrypt/gnutls.c | 69 ------------------------------------------- 3 files changed, 47 insertions(+), 90 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 61c367cae9d..590e0a666c9 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -197,15 +197,12 @@ struct secret struct key_funcs { - NTSTATUS (CDECL *key_set_property)( struct key *, const WCHAR *, UCHAR *, ULONG, ULONG ); - NTSTATUS (CDECL *key_symmetric_init)( struct key * ); void (CDECL *key_symmetric_vector_reset)( struct key * ); NTSTATUS (CDECL *key_symmetric_set_auth_data)( struct key *, UCHAR *, ULONG ); NTSTATUS (CDECL *key_symmetric_encrypt)( struct key *, const UCHAR *, ULONG, UCHAR *, ULONG ); NTSTATUS (CDECL *key_symmetric_decrypt)( struct key *, const UCHAR *, ULONG, UCHAR *, ULONG ); NTSTATUS (CDECL *key_symmetric_get_tag)( struct key *, UCHAR *, ULONG ); void (CDECL *key_symmetric_destroy)( struct key * ); - NTSTATUS (CDECL *key_asymmetric_init)( struct key * ); NTSTATUS (CDECL *key_asymmetric_generate)( struct key * ); NTSTATUS (CDECL *key_asymmetric_decrypt)( struct key *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG * ); NTSTATUS (CDECL *key_asymmetric_duplicate)( struct key *, struct key * ); diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 5eb50cd616b..e32d5a175db 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -672,6 +672,36 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA } } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + if (!wcscmp( prop, BCRYPT_CHAINING_MODE )) + { + if (!wcscmp( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB )) + { + key->u.s.mode = MODE_ID_ECB; + return STATUS_SUCCESS; + } + else if (!wcscmp( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC )) + { + key->u.s.mode = MODE_ID_CBC; + return STATUS_SUCCESS; + } + else if (!wcscmp( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM )) + { + key->u.s.mode = MODE_ID_GCM; + return STATUS_SUCCESS; + } + else + { + FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) ); + return STATUS_NOT_IMPLEMENTED; + } + } + + FIXME( "unsupported key property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS get_hash_property( const struct hash *hash, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { NTSTATUS status; @@ -933,7 +963,6 @@ static NTSTATUS key_asymmetric_create( struct key **ret_key, struct algorithm *a const UCHAR *pubkey, ULONG pubkey_len ) { struct key *key; - NTSTATUS status; if (!key_funcs) { @@ -956,12 +985,6 @@ static NTSTATUS key_asymmetric_create( struct key **ret_key, struct algorithm *a memcpy( key->u.a.pubkey, pubkey, pubkey_len ); key->u.a.pubkey_len = pubkey_len; } - if ((status = key_funcs->key_asymmetric_init( key ))) - { - heap_free( key->u.a.pubkey ); - heap_free( key ); - return status; - } *ret_key = key; return STATUS_SUCCESS; } @@ -1446,7 +1469,6 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ struct algorithm *alg = algorithm; struct key *key; ULONG block_size; - NTSTATUS status; TRACE( "%p, %p, %p, %u, %p, %u, %08x\n", algorithm, handle, object, object_len, secret, secret_len, flags ); @@ -1476,13 +1498,6 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ memcpy( key->u.s.secret, secret, secret_len ); key->u.s.secret_len = secret_len; - if ((status = key_funcs->key_symmetric_init( key ))) - { - heap_free( key->u.s.secret ); - heap_free( key ); - return status; - } - *handle = key; return STATUS_SUCCESS; } @@ -1499,8 +1514,22 @@ NTSTATUS WINAPI BCryptGenerateKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_H if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; if (!handle) return STATUS_INVALID_PARAMETER; - if (!(status = key_asymmetric_create( &key, alg, key_len, NULL, 0 ))) *handle = key; - return status; + switch (alg->id) + { + case ALG_ID_ECDH_P256: + case ALG_ID_ECDSA_P256: + case ALG_ID_ECDSA_P384: + case ALG_ID_RSA: + case ALG_ID_RSA_SIGN: + case ALG_ID_DSA: + if (!(status = key_asymmetric_create( &key, alg, key_len, NULL, 0 ))) *handle = key; + return status; + + default: + FIXME( "algorithm %u not supported\n", alg->id ); + return STATUS_NOT_SUPPORTED; + } + } NTSTATUS WINAPI BCryptFinalizeKeyPair( BCRYPT_KEY_HANDLE handle, ULONG flags ) @@ -1767,7 +1796,7 @@ NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHA case MAGIC_KEY: { struct key *key = (struct key *)object; - return key_funcs->key_set_property( key, prop, value, size, flags ); + return set_key_property( key, prop, value, size, flags ); } default: WARN( "unknown magic %08x\n", object->magic ); diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 9c1e7b5ab06..317881640ed 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -480,52 +480,6 @@ static void buffer_append_asn1_r_s( struct buffer *buffer, BYTE *r, DWORD r_len, buffer_free( &value ); } -static NTSTATUS CDECL key_set_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) -{ - if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) - { - if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_ECB )) - { - key->u.s.mode = MODE_ID_ECB; - return STATUS_SUCCESS; - } - else if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC )) - { - key->u.s.mode = MODE_ID_CBC; - return STATUS_SUCCESS; - } - else if (!strcmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM )) - { - key->u.s.mode = MODE_ID_GCM; - return STATUS_SUCCESS; - } - else - { - FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) ); - return STATUS_NOT_IMPLEMENTED; - } - } - - FIXME( "unsupported key property %s\n", debugstr_w(prop) ); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS CDECL key_symmetric_init( struct key *key ) -{ - if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; - - switch (key->alg_id) - { - case ALG_ID_3DES: - case ALG_ID_AES: - return STATUS_SUCCESS; - - default: - FIXME( "algorithm %u not supported\n", key->alg_id ); - return STATUS_NOT_SUPPORTED; - } -} - static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) { switch (key->alg_id) @@ -1271,26 +1225,6 @@ static NTSTATUS CDECL key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG le return STATUS_SUCCESS; } -static NTSTATUS CDECL key_asymmetric_init( struct key *key ) -{ - if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; - - switch (key->alg_id) - { - case ALG_ID_ECDH_P256: - case ALG_ID_ECDSA_P256: - case ALG_ID_ECDSA_P384: - case ALG_ID_RSA: - case ALG_ID_RSA_SIGN: - case ALG_ID_DSA: - return STATUS_SUCCESS; - - default: - FIXME( "algorithm %u not supported\n", key->alg_id ); - return STATUS_NOT_SUPPORTED; - } -} - static NTSTATUS import_gnutls_pubkey_ecc( struct key *key, gnutls_pubkey_t *gnutls_key ) { BCRYPT_ECCKEY_BLOB *ecc_blob; @@ -1871,15 +1805,12 @@ static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULO static const struct key_funcs key_funcs = { - key_set_property, - key_symmetric_init, key_symmetric_vector_reset, key_symmetric_set_auth_data, key_symmetric_encrypt, key_symmetric_decrypt, key_symmetric_get_tag, key_symmetric_destroy, - key_asymmetric_init, key_asymmetric_generate, key_asymmetric_decrypt, key_asymmetric_duplicate,

1 0

Alexandre Julliard : bcrypt: Add a helper macros to load GnuTLS optional functions.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 52ca433e7801cbc588763089bf6a8637f076bfe1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52ca433e7801cbc588763089… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 11:17:52 2021 +0200 bcrypt: Add a helper macros to load GnuTLS optional functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 98 ++++++++++++---------------------------------------- 1 file changed, 23 insertions(+), 75 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 317881640ed..f0cee5aff41 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -274,87 +274,35 @@ static BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_pubkey_init); #undef LOAD_FUNCPTR - if (!(pgnutls_cipher_tag = dlsym( libgnutls_handle, "gnutls_cipher_tag" ))) - { - WARN("gnutls_cipher_tag not found\n"); - pgnutls_cipher_tag = compat_gnutls_cipher_tag; - } - if (!(pgnutls_cipher_add_auth = dlsym( libgnutls_handle, "gnutls_cipher_add_auth" ))) - { - WARN("gnutls_cipher_add_auth not found\n"); - pgnutls_cipher_add_auth = compat_gnutls_cipher_add_auth; - } +#define LOAD_FUNCPTR_OPT(f) \ + if (!(p##f = dlsym( libgnutls_handle, #f ))) \ + { \ + WARN( "failed to load %s\n", #f ); \ + p##f = compat_##f; \ + } + + LOAD_FUNCPTR_OPT(gnutls_cipher_tag) + LOAD_FUNCPTR_OPT(gnutls_cipher_add_auth) + LOAD_FUNCPTR_OPT(gnutls_pubkey_import_ecc_raw) + LOAD_FUNCPTR_OPT(gnutls_privkey_export_rsa_raw) + LOAD_FUNCPTR_OPT(gnutls_privkey_export_ecc_raw) + LOAD_FUNCPTR_OPT(gnutls_privkey_import_ecc_raw) + LOAD_FUNCPTR_OPT(gnutls_privkey_export_dsa_raw) + LOAD_FUNCPTR_OPT(gnutls_pk_to_sign) + LOAD_FUNCPTR_OPT(gnutls_pubkey_verify_hash2) + LOAD_FUNCPTR_OPT(gnutls_pubkey_import_rsa_raw) + LOAD_FUNCPTR_OPT(gnutls_pubkey_import_dsa_raw) + LOAD_FUNCPTR_OPT(gnutls_privkey_generate) + LOAD_FUNCPTR_OPT(gnutls_decode_rs_value) + LOAD_FUNCPTR_OPT(gnutls_privkey_import_rsa_raw) + LOAD_FUNCPTR_OPT(gnutls_privkey_decrypt_data) +#undef LOAD_FUNCPTR_OPT if ((ret = pgnutls_global_init()) != GNUTLS_E_SUCCESS) { pgnutls_perror( ret ); goto fail; } - if (!(pgnutls_pubkey_import_ecc_raw = dlsym( libgnutls_handle, "gnutls_pubkey_import_ecc_raw" ))) - { - WARN("gnutls_pubkey_import_ecc_raw not found\n"); - pgnutls_pubkey_import_ecc_raw = compat_gnutls_pubkey_import_ecc_raw; - } - if (!(pgnutls_privkey_export_rsa_raw = dlsym( libgnutls_handle, "gnutls_privkey_export_rsa_raw" ))) - { - WARN("gnutls_privkey_export_rsa_raw not found\n"); - pgnutls_privkey_export_rsa_raw = compat_gnutls_privkey_export_rsa_raw; - } - if (!(pgnutls_privkey_export_ecc_raw = dlsym( libgnutls_handle, "gnutls_privkey_export_ecc_raw" ))) - { - WARN("gnutls_privkey_export_ecc_raw not found\n"); - pgnutls_privkey_export_ecc_raw = compat_gnutls_privkey_export_ecc_raw; - } - if (!(pgnutls_privkey_import_ecc_raw = dlsym( libgnutls_handle, "gnutls_privkey_import_ecc_raw" ))) - { - WARN("gnutls_privkey_import_ecc_raw not found\n"); - pgnutls_privkey_import_ecc_raw = compat_gnutls_privkey_import_ecc_raw; - } - if (!(pgnutls_privkey_export_dsa_raw = dlsym( libgnutls_handle, "gnutls_privkey_export_dsa_raw" ))) - { - WARN("gnutls_privkey_export_dsa_raw not found\n"); - pgnutls_privkey_export_dsa_raw = compat_gnutls_privkey_export_dsa_raw; - } - if (!(pgnutls_pk_to_sign = dlsym( libgnutls_handle, "gnutls_pk_to_sign" ))) - { - WARN("gnutls_pk_to_sign not found\n"); - pgnutls_pk_to_sign = compat_gnutls_pk_to_sign; - } - if (!(pgnutls_pubkey_verify_hash2 = dlsym( libgnutls_handle, "gnutls_pubkey_verify_hash2" ))) - { - WARN("gnutls_pubkey_verify_hash2 not found\n"); - pgnutls_pubkey_verify_hash2 = compat_gnutls_pubkey_verify_hash2; - } - if (!(pgnutls_pubkey_import_rsa_raw = dlsym( libgnutls_handle, "gnutls_pubkey_import_rsa_raw" ))) - { - WARN("gnutls_pubkey_import_rsa_raw not found\n"); - pgnutls_pubkey_import_rsa_raw = compat_gnutls_pubkey_import_rsa_raw; - } - if (!(pgnutls_pubkey_import_dsa_raw = dlsym( libgnutls_handle, "gnutls_pubkey_import_dsa_raw" ))) - { - WARN("gnutls_pubkey_import_dsa_raw not found\n"); - pgnutls_pubkey_import_dsa_raw = compat_gnutls_pubkey_import_dsa_raw; - } - if (!(pgnutls_privkey_generate = dlsym( libgnutls_handle, "gnutls_privkey_generate" ))) - { - WARN("gnutls_privkey_generate not found\n"); - pgnutls_privkey_generate = compat_gnutls_privkey_generate; - } - if (!(pgnutls_decode_rs_value = dlsym( libgnutls_handle, "gnutls_decode_rs_value" ))) - { - WARN("gnutls_decode_rs_value not found\n"); - pgnutls_decode_rs_value = compat_gnutls_decode_rs_value; - } - if (!(pgnutls_privkey_import_rsa_raw = dlsym( libgnutls_handle, "gnutls_privkey_import_rsa_raw" ))) - { - WARN("gnutls_privkey_import_rsa_raw not found\n"); - pgnutls_privkey_import_rsa_raw = compat_gnutls_privkey_import_rsa_raw; - } - if (!(pgnutls_privkey_decrypt_data = dlsym( libgnutls_handle, "gnutls_privkey_decrypt_data" ))) - { - WARN("gnutls_privkey_decrypt_data not found\n"); - pgnutls_privkey_decrypt_data = compat_gnutls_privkey_decrypt_data; - } if (TRACE_ON( bcrypt )) {

1 0

Alexandre Julliard : bcrypt: Move public key allocation to the PE side.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 696255907c53d52836d80c2360bf4c66ec327a3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=696255907c53d52836d80c23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 11:18:55 2021 +0200 bcrypt: Move public key allocation to the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 41 ++++++++++++++++++++++------------------ dlls/bcrypt/gnutls.c | 48 +++++++++++++++++++++++------------------------ 2 files changed, 47 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=696255907c53d52836d8…

1 0

Alexandre Julliard : bcrypt: Convert the Unix library to the __wine_unix_call() interface.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: dc3a240a2dc89e5280f37c3b50df86e09705dc70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc3a240a2dc89e5280f37c3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 11:19:27 2021 +0200 bcrypt: Convert the Unix library to the __wine_unix_call() interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/bcrypt_internal.h | 128 ++++++++++++++++++++++---- dlls/bcrypt/bcrypt_main.c | 179 +++++++++++++++++++++++++++---------- dlls/bcrypt/gnutls.c | 203 +++++++++++++++++++++++------------------- 4 files changed, 357 insertions(+), 154 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc3a240a2dc89e5280f3…

1 0

Alexandre Julliard : ntdll: Move some exception definitions to winternl.h.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 97479d3d32cd1adf1a77f74b19ecfd0560b78128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97479d3d32cd1adf1a77f74b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 12:06:54 2021 +0200 ntdll: Move some exception definitions to winternl.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/store.c | 1 - dlls/dbghelp/coff.c | 1 - dlls/ddraw/tests/dsurface.c | 1 - dlls/kernel32/console.c | 2 -- dlls/kernel32/file.c | 1 - dlls/kernel32/module.c | 1 - dlls/kernel32/process.c | 1 - dlls/krnl386.exe16/instr.c | 1 - dlls/krnl386.exe16/int21.c | 1 - dlls/krnl386.exe16/int31.c | 1 - dlls/msvcp140_1/tests/msvcp140_1.c | 2 -- dlls/msvcp90/misc.c | 2 +- dlls/msvcrt/except.c | 1 - dlls/ntdll/unix/process.c | 1 - dlls/ntdll/unix/sync.c | 1 - dlls/ntdll/unix/thread.c | 1 - dlls/ntoskrnl.exe/instr.c | 1 - dlls/user32/lstr.c | 2 -- dlls/user32/png.c | 1 - dlls/win32u/main.c | 1 - dlls/wininet/internet.c | 2 -- dlls/wow64cpu/cpu.c | 1 - dlls/ws2_32/ws2_32_private.h | 1 - include/wine/exception.h | 32 +------------------------------- include/winternl.h | 31 +++++++++++++++++++++++++++++++ programs/winedbg/gdbproxy.c | 1 - programs/winedbg/info.c | 1 - programs/winedbg/tgt_active.c | 1 - programs/winedbg/winedbg.c | 2 -- 29 files changed, 33 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=97479d3d32cd1adf1a77…

1 0

Jacek Caban : ntdll: Introduce ntdll_get_build_dir and ntdll_get_data_dir.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 65ce784ffacf3fb20440b635e5bd4f5de1058a79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65ce784ffacf3fb20440b635… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:19:05 2021 +0200 ntdll: Introduce ntdll_get_build_dir and ntdll_get_data_dir. To expose build and data dirs for Unix libs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 18 ++++++++++++++++++ include/wine/unixlib.h | 2 ++ 2 files changed, 20 insertions(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index ae1afb2797b..92ae04d90a5 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -783,6 +783,24 @@ int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BO } +/*********************************************************************** + * ntdll_get_build_dir + */ +const char *ntdll_get_build_dir(void) +{ + return build_dir; +} + + +/*********************************************************************** + * ntdll_get_data_dir + */ +const char *ntdll_get_data_dir(void) +{ + return data_dir; +} + + /*********************************************************************** * build_envp * diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 072401a0714..4abc3172192 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -27,6 +27,8 @@ typedef UINT64 unixlib_handle_t; extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); /* some useful helpers from ntdll */ +extern const char *ntdll_get_build_dir(void); +extern const char *ntdll_get_data_dir(void); extern DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ); extern int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ); extern NTSTATUS ntdll_init_syscalls( ULONG id, SYSTEM_SERVICE_TABLE *table, void **dispatcher );

1 0

Jacek Caban : ntdll: Provide some Unicode helpers for Unix libs.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 1be12eaa942e38302c2b79806a184f58d664c617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1be12eaa942e38302c2b7980… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:19:58 2021 +0200 ntdll: Provide some Unicode helpers for Unix libs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 101 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 71 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 92ae04d90a5..13bf85d2eb6 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -644,37 +644,11 @@ DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) } else /* utf-8 */ { - unsigned int res; - const char *srcend = src + srclen; - WCHAR *dstend = dst + dstlen; - - while ((dst < dstend) && (src < srcend)) - { - unsigned char ch = *src++; - if (ch < 0x80) /* special fast case for 7-bit ASCII */ - { - *dst++ = ch; - continue; - } - if ((res = decode_utf8_char( ch, &src, srcend )) <= 0xffff) - { - *dst++ = res; - } - else if (res <= 0x10ffff) /* we need surrogates */ - { - res -= 0x10000; - *dst++ = 0xd800 | (res >> 10); - if (dst == dstend) break; - *dst++ = 0xdc00 | (res & 0x3ff); - } - else - { - *dst++ = 0xfffd; - } - } - reslen = dstlen - (dstend - dst); + reslen = 0; + RtlUTF8ToUnicodeN( dst, dstlen * sizeof(WCHAR), &reslen, src, srclen ); + reslen /= sizeof(WCHAR); #ifdef __APPLE__ /* work around broken Mac OS X filesystem that enforces NFD */ - if (reslen && nfc_table) reslen = compose_string( nfc_table, dst - reslen, reslen ); + if (reslen && nfc_table) reslen = compose_string( nfc_table, dst, reslen ); #endif } return reslen; @@ -2486,3 +2460,70 @@ NTSTATUS WINAPI NtQueryInstallUILanguage( LANGID *lang ) *lang = system_ui_language; return STATUS_SUCCESS; } + +WCHAR WINAPI RtlUpcaseUnicodeChar( WCHAR wch ) +{ + return ntdll_towupper( wch ); +} + +WCHAR WINAPI RtlDowncaseUnicodeChar( WCHAR wch ) +{ + return ntdll_towlower( wch ); +} + +NTSTATUS WINAPI RtlUTF8ToUnicodeN( WCHAR *dst, DWORD dstlen, DWORD *reslen, const char *src, DWORD srclen ) +{ + unsigned int res, len; + NTSTATUS status = STATUS_SUCCESS; + const char *srcend = src + srclen; + WCHAR *dstend; + + if (!src) return STATUS_INVALID_PARAMETER_4; + if (!reslen) return STATUS_INVALID_PARAMETER; + + dstlen /= sizeof(WCHAR); + dstend = dst + dstlen; + if (!dst) + { + for (len = 0; src < srcend; len++) + { + unsigned char ch = *src++; + if (ch < 0x80) continue; + if ((res = decode_utf8_char( ch, &src, srcend )) > 0x10ffff) + status = STATUS_SOME_NOT_MAPPED; + else + if (res > 0xffff) len++; + } + *reslen = len * sizeof(WCHAR); + return status; + } + + while ((dst < dstend) && (src < srcend)) + { + unsigned char ch = *src++; + if (ch < 0x80) /* special fast case for 7-bit ASCII */ + { + *dst++ = ch; + continue; + } + if ((res = decode_utf8_char( ch, &src, srcend )) <= 0xffff) + { + *dst++ = res; + } + else if (res <= 0x10ffff) /* we need surrogates */ + { + res -= 0x10000; + *dst++ = 0xd800 | (res >> 10); + if (dst == dstend) break; + *dst++ = 0xdc00 | (res & 0x3ff); + } + else + { + *dst++ = 0xfffd; + status = STATUS_SOME_NOT_MAPPED; + } + } + if (src < srcend) status = STATUS_BUFFER_TOO_SMALL; /* overflow */ + *reslen = (dstlen - (dstend - dst)) * sizeof(WCHAR); + return status; +}

1 0

Jacek Caban : ntdll: Allow Unix libraries to use exception macros.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 2ec2e136bfc6cc2cfe895b1268cca3b342737001 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ec2e136bfc6cc2cfe895b12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:20:06 2021 +0200 ntdll: Allow Unix libraries to use exception macros. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 1 - dlls/ntdll/unix/signal_arm64.c | 1 - dlls/ntdll/unix/signal_i386.c | 1 - dlls/ntdll/unix/signal_x86_64.c | 1 - dlls/ntdll/unix/thread.c | 10 +++++++++ dlls/ntdll/unix/virtual.c | 30 -------------------------- include/wine/unixlib.h | 47 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 57 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index f024879b81f..584c1f2f0bf 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -61,7 +61,6 @@ #include "windef.h" #include "winnt.h" #include "winternl.h" -#include "wine/exception.h" #include "wine/asm.h" #include "unix_private.h" #include "wine/debug.h" diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 145277b5418..df0c7dad1da 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -64,7 +64,6 @@ #include "windef.h" #include "winnt.h" #include "winternl.h" -#include "wine/exception.h" #include "wine/asm.h" #include "unix_private.h" #include "wine/debug.h" diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index e123f2c2a79..a709c85b4da 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -60,7 +60,6 @@ #include "winternl.h" #include "ddk/wdm.h" #include "wine/asm.h" -#include "wine/exception.h" #include "unix_private.h" #include "wine/debug.h" diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 9b18180301a..ffe7ef7db07 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -75,7 +75,6 @@ #include "windef.h" #include "winternl.h" #include "ddk/wdm.h" -#include "wine/exception.h" #include "wine/list.h" #include "wine/asm.h" #include "unix_private.h" diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 839a75b4cac..384ac1d4119 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1737,6 +1737,16 @@ NTSTATUS get_thread_context( HANDLE handle, void *context, BOOL *self, USHORT ma } +/*********************************************************************** + * ntdll_set_exception_jmp_buf + */ +void ntdll_set_exception_jmp_buf( __wine_jmp_buf *jmp ) +{ + assert( !jmp || !ntdll_get_thread_data()->jmp_buf ); + ntdll_get_thread_data()->jmp_buf = jmp; +} + + BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time) { #ifdef linux diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 63655f0c928..924aa78b306 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -59,7 +59,6 @@ #include "windef.h" #include "winnt.h" #include "winternl.h" -#include "wine/exception.h" #include "wine/list.h" #include "wine/rbtree.h" #include "unix_private.h" @@ -104,35 +103,6 @@ struct file_view unsigned int protect; /* protection for all pages at allocation time and SEC_* flags */ }; -#undef __TRY -#undef __EXCEPT -#undef __ENDTRY - -#define __TRY \ - do { __wine_jmp_buf __jmp; \ - int __first = 1; \ - assert( !ntdll_get_thread_data()->jmp_buf ); \ - for (;;) if (!__first) \ - { \ - do { - -#define __EXCEPT \ - } while(0); \ - ntdll_get_thread_data()->jmp_buf = NULL; \ - break; \ - } else { \ - if (__wine_setjmpex( &__jmp, NULL )) { \ - do { - -#define __ENDTRY \ - } while (0); \ - break; \ - } \ - ntdll_get_thread_data()->jmp_buf = &__jmp; \ - __first = 0; \ - } \ - } while (0); - /* per-page protection flags */ #define VPROT_READ 0x01 #define VPROT_WRITE 0x02 diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 4abc3172192..920e3d32dc5 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -26,6 +26,8 @@ typedef UINT64 unixlib_handle_t; extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); +#ifdef WINE_UNIX_LIB + /* some useful helpers from ntdll */ extern const char *ntdll_get_build_dir(void); extern const char *ntdll_get_data_dir(void); @@ -33,4 +35,49 @@ extern DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD d extern int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ); extern NTSTATUS ntdll_init_syscalls( ULONG id, SYSTEM_SERVICE_TABLE *table, void **dispatcher ); +/* exception handling */ + +#ifdef __i386__ +typedef struct { int reg[16]; } __wine_jmp_buf; +#elif defined(__x86_64__) +typedef struct { DECLSPEC_ALIGN(16) struct { unsigned __int64 Part[2]; } reg[16]; } __wine_jmp_buf; +#elif defined(__arm__) +typedef struct { int reg[28]; } __wine_jmp_buf; +#elif defined(__aarch64__) +typedef struct { __int64 reg[24]; } __wine_jmp_buf; +#else +typedef struct { int reg; } __wine_jmp_buf; +#endif + +extern int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) __wine_setjmpex( __wine_jmp_buf *buf, + EXCEPTION_REGISTRATION_RECORD *frame ); +extern void DECLSPEC_NORETURN __cdecl __wine_longjmp( __wine_jmp_buf *buf, int retval ); +extern void ntdll_set_exception_jmp_buf( __wine_jmp_buf *jmp ); + +#define __TRY \ + do { __wine_jmp_buf __jmp; \ + int __first = 1; \ + for (;;) if (!__first) \ + { \ + do { + +#define __EXCEPT \ + } while(0); \ + ntdll_set_exception_jmp_buf( NULL ); \ + break; \ + } else { \ + if (__wine_setjmpex( &__jmp, NULL )) { \ + do { + +#define __ENDTRY \ + } while (0); \ + break; \ + } \ + ntdll_set_exception_jmp_buf( &__jmp ); \ + __first = 0; \ + } \ + } while (0); + +#endif /* WINE_UNIX_LIB */ + #endif /* __WINE_WINE_UNIXLIB_H */

1 0

Jacek Caban : ntdll: Handle Unix lib exception outside Unix stack.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: e0a934d0ef2d690caa700f2bcbe2359b8141fc18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0a934d0ef2d690caa700f2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:20:12 2021 +0200 ntdll: Handle Unix lib exception outside Unix stack. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 584c1f2f0bf..88f0f4ff76d 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -645,7 +645,7 @@ static BOOL handle_syscall_fault( ucontext_t *context, EXCEPTION_RECORD *rec ) struct syscall_frame *frame = arm_thread_data()->syscall_frame; DWORD i; - if (!is_inside_syscall( context )) return FALSE; + if (!is_inside_syscall( context ) && !ntdll_get_thread_data()->jmp_buf) return FALSE; TRACE( "code=%x flags=%x addr=%p pc=%08x tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index df0c7dad1da..ce7e1689434 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -794,7 +794,7 @@ static BOOL handle_syscall_fault( ucontext_t *context, EXCEPTION_RECORD *rec ) struct syscall_frame *frame = arm64_thread_data()->syscall_frame; DWORD i; - if (!is_inside_syscall( context )) return FALSE; + if (!is_inside_syscall( context ) && !ntdll_get_thread_data()->jmp_buf) return FALSE; TRACE( "code=%x flags=%x addr=%p pc=%p tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index a709c85b4da..c38c4d046d7 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1697,7 +1697,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, void *stack_ptr, struct syscall_frame *frame = x86_thread_data()->syscall_frame; DWORD i, *stack; - if (!is_inside_syscall( sigcontext )) return FALSE; + if (!is_inside_syscall( sigcontext ) && !ntdll_get_thread_data()->jmp_buf) return FALSE; TRACE( "code=%x flags=%x addr=%p ip=%08x tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index ffe7ef7db07..a99cf2ae9c1 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2478,7 +2478,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, struct syscall_frame *frame = amd64_thread_data()->syscall_frame; DWORD i; - if (!is_inside_syscall( sigcontext )) return FALSE; + if (!is_inside_syscall( sigcontext ) && !ntdll_get_thread_data()->jmp_buf) return FALSE; TRACE_(seh)( "code=%x flags=%x addr=%p ip=%lx tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress,

1 0

Jacek Caban : gdi32: Use __wine_unix_call interface for Unix library.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: f309721d13d8d728732ca97224c7502493ff6026 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f309721d13d8d728732ca972… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 16:20:19 2021 +0200 gdi32: Use __wine_unix_call interface for Unix library. 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/gdi32/Makefile.in | 3 ++- dlls/gdi32/dibdrv/dc.c | 4 ++-- dlls/gdi32/font.c | 27 +++++++++++++++------------ dlls/gdi32/gdiobj.c | 14 +++++++++----- dlls/gdi32/wrappers.c | 14 ++++++++++++-- 5 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 6a5df55bfeb..fbfc11d7b60 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -1,9 +1,10 @@ EXTRADEFS = -D_GDI32_ MODULE = gdi32.dll +UNIXLIB = gdi32.so IMPORTLIB = gdi32 IMPORTS = advapi32 EXTRAINCL = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) -EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) $(PTHREAD_LIBS) +EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) $(PTHREAD_LIBS) -lm DELAYIMPORTS = setupapi C_SRCS = \ diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index f69713c8025..8404630bb48 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -27,9 +27,9 @@ #include "ntgdi_private.h" #include "dibdrv.h" +#include "wine/unixlib.h" #include "wine/wgl.h" #include "wine/wgl_driver.h" -#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dib); @@ -232,7 +232,7 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit dst_dib.funcs->convert_to( &dst_dib, &src_dib, &src->visrect, FALSE ); ret = TRUE; } - __EXCEPT_PAGE_FAULT + __EXCEPT { WARN( "invalid bits pointer %p\n", src_bits ); ret = FALSE; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 8cc60d5a16f..3c5911785fd 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -40,7 +40,8 @@ #include "winternl.h" #include "winreg.h" #include "ntgdi_private.h" -#include "wine/exception.h" + +#include "wine/unixlib.h" #include "wine/rbtree.h" #include "wine/debug.h" @@ -528,17 +529,19 @@ static pthread_mutex_t font_lock = PTHREAD_MUTEX_INITIALIZER; static void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) { - SIZE_T len; - - static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R'}; - static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R'}; + const char *dir; + ULONG len = MAX_PATH; - if (!RtlQueryEnvironmentVariable( NULL, winedatadirW, ARRAYSIZE(winedatadirW), - path, MAX_PATH, &len )) - asciiz_to_unicode( path + len, "\\" WINE_FONT_DIR "\\" ); - else if (!RtlQueryEnvironmentVariable( NULL, winebuilddirW, ARRAYSIZE(winebuilddirW), - path, MAX_PATH, &len )) - asciiz_to_unicode( path + len, "\\fonts\\" ); + if ((dir = ntdll_get_data_dir())) + { + wine_unix_to_nt_file_name( dir, path, &len ); + asciiz_to_unicode( path + len - 1, "\\" WINE_FONT_DIR "\\" ); + } + else if ((dir = ntdll_get_build_dir())) + { + wine_unix_to_nt_file_name( dir, path, &len ); + asciiz_to_unicode( path + len - 1, "\\fonts\\" ); + } if (file) lstrcatW( path, file ); } @@ -6456,7 +6459,7 @@ HANDLE WINAPI NtGdiAddFontMemResourceEx( void *ptr, DWORD size, void *dv, ULONG { *count = num_fonts; } - __EXCEPT_PAGE_FAULT + __EXCEPT { WARN( "page fault while writing to *count (%p)\n", count ); NtGdiRemoveFontMemResourceEx( ret ); diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index bbfe50d2c8b..ff7ee2cacda 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -38,6 +38,7 @@ #include "ntgdi_private.h" #include "wine/debug.h" +#include "wine/unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(gdi); @@ -1250,13 +1251,11 @@ static struct unix_funcs unix_funcs = __wine_set_visible_region, }; -NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) +NTSTATUS initialize( void *args ) { pthread_mutexattr_t attr; unsigned int dpi; - if (reason != DLL_PROCESS_ATTACH) return 0; - pthread_mutexattr_init( &attr ); pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE ); pthread_mutex_init( &gdi_lock, &attr ); @@ -1268,7 +1267,12 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p dpi = font_init(); init_stock_objects( dpi ); - user_callbacks = ptr_in; - *(struct unix_funcs **)ptr_out = &unix_funcs; + user_callbacks = *(const struct user_callbacks **)args; + *(const struct unix_funcs **)args = &unix_funcs; return 0; } + +const unixlib_entry_t __wine_unix_call_funcs[] = +{ + initialize +}; diff --git a/dlls/gdi32/wrappers.c b/dlls/gdi32/wrappers.c index e6e7985e482..f37fbd57b0d 100644 --- a/dlls/gdi32/wrappers.c +++ b/dlls/gdi32/wrappers.c @@ -20,11 +20,12 @@ #include "gdi_private.h" #include "win32u_private.h" +#include "wine/unixlib.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(gdi); -static struct unix_funcs *unix_funcs; +static const struct unix_funcs *unix_funcs; INT WINAPI NtGdiAbortDoc( HDC hdc ) { @@ -1151,5 +1152,14 @@ static const struct user_callbacks user_callbacks = BOOL wrappers_init(void) { - return !__wine_init_unix_lib( gdi32_module, DLL_PROCESS_ATTACH, &user_callbacks, &unix_funcs ); + unixlib_handle_t handle; + const void *args = &user_callbacks; + + if (NtQueryVirtualMemory( GetCurrentProcess(), gdi32_module, MemoryWineUnixFuncs, + &handle, sizeof(handle), NULL )) + return FALSE; + + if (__wine_unix_call( handle, 0, &args )) return FALSE; + unix_funcs = args; + return TRUE; }

1 0