June 2023 - Wine-commits - list.winehq.org

Alex Henrie : dbghelp: Allocate real_path with the CRT and copy it to the module heap.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: wine Branch: master Commit: 00df1bea9a965695bff48541b57b6791a58fd02d URL: https://gitlab.winehq.org/wine/wine/-/commit/00df1bea9a965695bff48541b57b67… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jun 26 20:39:27 2023 -0600 dbghelp: Allocate real_path with the CRT and copy it to the module heap. Fixes both a memory leak and an alloc/free mismatch, and the module heap is the most appropriate place to hold the variable long-term. --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/module.c | 1 - dlls/dbghelp/pe_module.c | 76 ++++++++++++++++++++---------------------- dlls/dbghelp/storage.c | 7 ++++ 4 files changed, 45 insertions(+), 40 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 1ceefcdbde6..1ce221a0f27 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -44,6 +44,7 @@ void pool_destroy(struct pool* a) DECLSPEC_HIDDEN; void* pool_alloc(struct pool* a, size_t len) __WINE_ALLOC_SIZE(2) __WINE_MALLOC DECLSPEC_HIDDEN; void* pool_realloc(struct pool* a, void* ptr, size_t len) __WINE_ALLOC_SIZE(3) DECLSPEC_HIDDEN; char* pool_strdup(struct pool* a, const char* str) __WINE_MALLOC DECLSPEC_HIDDEN; +WCHAR* pool_wcsdup(struct pool* a, const WCHAR* str) __WINE_MALLOC DECLSPEC_HIDDEN; struct vector { diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index bae4a77f16e..1493d3006cc 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1068,7 +1068,6 @@ BOOL module_remove(struct process* pcs, struct module* module) hash_table_destroy(&module->ht_types); HeapFree(GetProcessHeap(), 0, module->sources); HeapFree(GetProcessHeap(), 0, module->addr_sorttab); - HeapFree(GetProcessHeap(), 0, module->real_path); pool_destroy(&module->pool); /* native dbghelp doesn't invoke registered callback(,CBA_SYMBOLS_UNLOADED,) here * so do we diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 3364498e0c7..6c07bf5826a 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -760,13 +760,10 @@ struct builtin_search static BOOL search_builtin_pe(void *param, HANDLE handle, const WCHAR *path) { struct builtin_search *search = param; - size_t size; if (!pe_map_file(handle, &search->fmap, DMT_PE)) return FALSE; - size = (lstrlenW(path) + 1) * sizeof(WCHAR); - if ((search->path = heap_alloc(size))) - memcpy(search->path, path, size); + search->path = wcsdup(path); return TRUE; } @@ -818,47 +815,48 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, } if (name) lstrcpyW(loaded_name, name); } - if (!(modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct pe_module_info)))) - return NULL; - modfmt->u.pe_info = (struct pe_module_info*)(modfmt + 1); - if (pe_map_file(hFile, &modfmt->u.pe_info->fmap, DMT_PE)) + + if ((modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct pe_module_info)))) { - struct builtin_search builtin = { NULL }; - if (opened && modfmt->u.pe_info->fmap.u.pe.builtin && - search_dll_path(pcs, loaded_name, modfmt->u.pe_info->fmap.u.pe.file_header.Machine, search_builtin_pe, &builtin)) - { - TRACE("reloaded %s from %s\n", debugstr_w(loaded_name), debugstr_w(builtin.path)); - image_unmap_file(&modfmt->u.pe_info->fmap); - modfmt->u.pe_info->fmap = builtin.fmap; - real_path = builtin.path; - } - if (!base) base = PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, ImageBase); - if (!size) size = PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, SizeOfImage); - - module = module_new(pcs, loaded_name, DMT_PE, FALSE, base, size, - modfmt->u.pe_info->fmap.u.pe.file_header.TimeDateStamp, - PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, CheckSum), - modfmt->u.pe_info->fmap.u.pe.file_header.Machine); - if (module) - { - module->real_path = real_path; - modfmt->module = module; - modfmt->remove = pe_module_remove; - modfmt->loc_compute = NULL; - module->format_info[DFI_PE] = modfmt; - module->reloc_delta = base - PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, ImageBase); - } - else + modfmt->u.pe_info = (struct pe_module_info*)(modfmt + 1); + if (pe_map_file(hFile, &modfmt->u.pe_info->fmap, DMT_PE)) { - ERR("could not load the module '%s'\n", debugstr_w(loaded_name)); - heap_free(real_path); - image_unmap_file(&modfmt->u.pe_info->fmap); + struct builtin_search builtin = { NULL }; + if (opened && modfmt->u.pe_info->fmap.u.pe.builtin && + search_dll_path(pcs, loaded_name, modfmt->u.pe_info->fmap.u.pe.file_header.Machine, search_builtin_pe, &builtin)) + { + TRACE("reloaded %s from %s\n", debugstr_w(loaded_name), debugstr_w(builtin.path)); + image_unmap_file(&modfmt->u.pe_info->fmap); + modfmt->u.pe_info->fmap = builtin.fmap; + real_path = builtin.path; + } + if (!base) base = PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, ImageBase); + if (!size) size = PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, SizeOfImage); + + module = module_new(pcs, loaded_name, DMT_PE, FALSE, base, size, + modfmt->u.pe_info->fmap.u.pe.file_header.TimeDateStamp, + PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, CheckSum), + modfmt->u.pe_info->fmap.u.pe.file_header.Machine); + if (module) + { + module->real_path = real_path ? pool_wcsdup(&module->pool, real_path) : NULL; + modfmt->module = module; + modfmt->remove = pe_module_remove; + modfmt->loc_compute = NULL; + module->format_info[DFI_PE] = modfmt; + module->reloc_delta = base - PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, ImageBase); + } + else + { + ERR("could not load the module '%s'\n", debugstr_w(loaded_name)); + image_unmap_file(&modfmt->u.pe_info->fmap); + } } + if (!module) HeapFree(GetProcessHeap(), 0, modfmt); } - if (!module) HeapFree(GetProcessHeap(), 0, modfmt); if (opened) CloseHandle(hFile); - + free(real_path); return module; } diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index daed3aa8d99..038b625cf1c 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -55,6 +55,13 @@ char* pool_strdup(struct pool* pool, const char* str) return ret; } +WCHAR* pool_wcsdup(struct pool* pool, const WCHAR* str) +{ + WCHAR* ret; + if ((ret = pool_alloc(pool, (wcslen(str) + 1) * sizeof(WCHAR)))) wcscpy(ret, str); + return ret; +} + void vector_init(struct vector* v, unsigned esz, unsigned bucket_sz) { v->buckets = NULL;

1 0

Paul Gofman : Revert "crypt32: Do not create persistent container in CRYPT_CreateKeyProv().".
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: wine Branch: master Commit: 7861b1e8f005c73d5fb8d58384f0cd31597fc479 URL: https://gitlab.winehq.org/wine/wine/-/commit/7861b1e8f005c73d5fb8d58384f0cd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 26 15:32:53 2023 -0600 Revert "crypt32: Do not create persistent container in CRYPT_CreateKeyProv().". This reverts commit a19c8712917042361208b8a4a0a503e06815d20a. --- dlls/crypt32/cert.c | 53 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index ec3cf5b15ec..b9645770ce1 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -3682,21 +3682,54 @@ static void CRYPT_MakeCertInfo(PCERT_INFO info, const CRYPT_DATA_BLOB *pSerialNu } } +typedef RPC_STATUS (RPC_ENTRY *UuidCreateFunc)(UUID *); +typedef RPC_STATUS (RPC_ENTRY *UuidToStringFunc)(UUID *, unsigned char **); +typedef RPC_STATUS (RPC_ENTRY *RpcStringFreeFunc)(unsigned char **); + static HCRYPTPROV CRYPT_CreateKeyProv(void) { - HCRYPTPROV prov; - HCRYPTKEY key; + HCRYPTPROV hProv = 0; + HMODULE rpcrt = LoadLibraryW(L"rpcrt4"); - if (!CryptAcquireContextA(&prov, NULL, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_NEWKEYSET)) - return 0; - - if (!CryptGenKey(prov, AT_SIGNATURE, 0, &key)) + if (rpcrt) { - CryptReleaseContext(prov, 0); - return 0; + UuidCreateFunc uuidCreate = (UuidCreateFunc)GetProcAddress(rpcrt, + "UuidCreate"); + UuidToStringFunc uuidToString = (UuidToStringFunc)GetProcAddress(rpcrt, + "UuidToStringA"); + RpcStringFreeFunc rpcStringFree = (RpcStringFreeFunc)GetProcAddress( + rpcrt, "RpcStringFreeA"); + + if (uuidCreate && uuidToString && rpcStringFree) + { + UUID uuid; + RPC_STATUS status = uuidCreate(&uuid); + + if (status == RPC_S_OK || status == RPC_S_UUID_LOCAL_ONLY) + { + unsigned char *uuidStr; + + status = uuidToString(&uuid, &uuidStr); + if (status == RPC_S_OK) + { + BOOL ret = CryptAcquireContextA(&hProv, (LPCSTR)uuidStr, + MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_NEWKEYSET); + + if (ret) + { + HCRYPTKEY key; + + ret = CryptGenKey(hProv, AT_SIGNATURE, 0, &key); + if (ret) + CryptDestroyKey(key); + } + rpcStringFree(&uuidStr); + } + } + } + FreeLibrary(rpcrt); } - CryptDestroyKey(key); - return prov; + return hProv; } PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hProv,

1 0

Paul Gofman : crypt32/tests: Test CertCreateSelfSignCertificate() without provider info.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: wine Branch: master Commit: e647719eb0f13fb7abb63a86c59477a53310f28d URL: https://gitlab.winehq.org/wine/wine/-/commit/e647719eb0f13fb7abb63a86c59477… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 26 16:32:35 2023 -0600 crypt32/tests: Test CertCreateSelfSignCertificate() without provider info. --- dlls/crypt32/tests/cert.c | 45 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 83594560efa..ac0987e76bd 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2167,17 +2167,44 @@ static void testCreateSelfSignCert(void) HCRYPTPROV csp; BOOL ret; HCRYPTKEY key; - CRYPT_KEY_PROV_INFO info; + CRYPT_KEY_PROV_INFO info, *ret_info; + DWORD size; /* This crashes: - context = CertCreateSelfSignCertificate(0, NULL, 0, NULL, NULL, NULL, NULL, - NULL); - * Calling this with no first parameter creates a new key container, which - * lasts beyond the test, so I don't test that. Nb: the generated key - * name is a GUID. - context = CertCreateSelfSignCertificate(0, &name, 0, NULL, NULL, NULL, NULL, - NULL); - */ + context = CertCreateSelfSignCertificate(0, NULL, 0, NULL, NULL, NULL, NULL, NULL); */ + + /* Test CSP created by implementation without CSP or CSP parameters provided. */ + context = CertCreateSelfSignCertificate(0, &name, 0, NULL, NULL, NULL, NULL, NULL); + ok(!!context, "failed, error %#lx.\n", GetLastError()); + size = 0; + ret = CertGetCertificateContextProperty(context, CERT_KEY_PROV_INFO_PROP_ID, NULL, &size); + ok(ret, "failed, error %#lx.\n", GetLastError()); + ret_info = malloc(size); + ok(!!ret_info, "memory allocation failed.\n"); + ret = CertGetCertificateContextProperty(context, CERT_KEY_PROV_INFO_PROP_ID, ret_info, &size); + ok(ret, "failed, error %#lx.\n", GetLastError()); + CertFreeCertificateContext(context); + ok(ret_info->dwKeySpec == AT_SIGNATURE, "got %#lx.\n", ret_info->dwKeySpec); + ok(!ret_info->dwFlags, "got %#lx.\n", ret_info->dwFlags); + ok(ret_info->pwszContainerName && *ret_info->pwszContainerName, "got %s.\n", + debugstr_w(ret_info->pwszContainerName)); + ret = CryptAcquireContextW(&csp, ret_info->pwszContainerName, ret_info->pwszProvName, ret_info->dwProvType, 0); + ok(ret, "failed, error %#lx.\n", GetLastError()); + ret = CryptGetUserKey(csp, AT_SIGNATURE, &key); + ok(ret, "failed, error %#lx.\n", GetLastError()); + ret = CryptDestroyKey(key); + ok(ret, "failed, error %#lx.\n", GetLastError()); + ret = CryptGetUserKey(csp, AT_KEYEXCHANGE, &key); + ok(!ret && GetLastError() == NTE_NO_KEY, "got ret %d, error %#lx.\n", ret, GetLastError()); + CryptReleaseContext(csp, 0); + csp = 0xdeadbeef; + ret = CryptAcquireContextW(&csp, ret_info->pwszContainerName, ret_info->pwszProvName, + ret_info->dwProvType, CRYPT_DELETEKEYSET); + ok(ret, "failed, error %#lx.\n", GetLastError()); + ok(!csp, "got %p.\n", (void *)csp); + ret = CryptAcquireContextW(&csp, ret_info->pwszContainerName, ret_info->pwszProvName, ret_info->dwProvType, 0); + ok(!ret && GetLastError() == NTE_BAD_KEYSET, "got ret %d, error %#lx.\n", ret, GetLastError()); + free(ret_info); /* Acquire a CSP */ CryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL,

1 0

Zebediah Figura : d3d11/tests: Read back directly from the mipmap texture in test_generate_mips().
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: wine Branch: master Commit: 0135114951e722d714589bdadc88e69c46a668ad URL: https://gitlab.winehq.org/wine/wine/-/commit/0135114951e722d714589bdadc88e6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 14 16:21:40 2023 -0500 d3d11/tests: Read back directly from the mipmap texture in test_generate_mips(). This is far simpler than drawing with it. The immediate motivation here is that the DXGI_FORMAT_R8G8B8A8_UINT test causes a validation error when drawing, since the shader declares its resource as a float4 texture, which does not match the UINT view format. This could be fixed by using a different shader, but it seems more prudent to just simplify the test to not draw at all. --- dlls/d3d11/tests/d3d11.c | 162 +++++------------------------------------------ 1 file changed, 16 insertions(+), 146 deletions(-)

1 0

Zebediah Figura : d3d10core/tests: Read back directly from the mipmap texture in test_generate_mips().
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: wine Branch: master Commit: 9f2cf25c2def844d127c78aa91f4f14edc92f934 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f2cf25c2def844d127c78aa91f4f1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 14 17:02:06 2023 -0500 d3d10core/tests: Read back directly from the mipmap texture in test_generate_mips(). This is far simpler than drawing with it. The immediate motivation here is that the DXGI_FORMAT_R8G8B8A8_UINT test causes a validation error when drawing, since the shader declares its resource as a float4 texture, which does not match the UINT view format. This could be fixed by using a different shader, but it seems more prudent to just simplify the test to not draw at all. --- dlls/d3d10core/tests/d3d10core.c | 255 ++++++++++++++++----------------------- 1 file changed, 103 insertions(+), 152 deletions(-)

1 0

Alistair Leslie-Hughes : wined3d: Rename shader_extract_from_dxbc to wined3d_shader_extract_from_dxbc.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: wine Branch: master Commit: 0f41f29a22421a15f8e775a8927b8d249cf054f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f41f29a22421a15f8e775a8927b8d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 17 17:46:24 2023 +1000 wined3d: Rename shader_extract_from_dxbc to wined3d_shader_extract_from_dxbc. Stops a linker error of duplicate name when using upstream vkd3d. --- dlls/wined3d/shader.c | 2 +- dlls/wined3d/shader_sm4.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b4df79508ec..2728929045f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2481,7 +2481,7 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device shader->byte_code_size = desc->byte_code_size; max_version = shader_max_version_from_feature_level(device->cs->c.state->feature_level); - if (FAILED(hr = shader_extract_from_dxbc(shader, max_version, &source_type))) + if (FAILED(hr = wined3d_shader_extract_from_dxbc(shader, max_version, &source_type))) goto fail; if (!(shader->frontend = shader_select_frontend(source_type))) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 78abdbe81ac..74391cc1be8 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -2077,7 +2077,7 @@ static HRESULT shader_dxbc_process_section(struct wined3d_shader *shader, unsign return S_OK; } -HRESULT shader_extract_from_dxbc(struct wined3d_shader *shader, +HRESULT wined3d_shader_extract_from_dxbc(struct wined3d_shader *shader, unsigned int max_shader_version, enum vkd3d_shader_source_type *source_type) { const struct vkd3d_shader_code dxbc = {.code = shader->byte_code, .size = shader->byte_code_size}; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a586d6847bf..001534e8c38 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1466,7 +1466,7 @@ struct wined3d_shader_frontend extern const struct wined3d_shader_frontend sm1_shader_frontend DECLSPEC_HIDDEN; extern const struct wined3d_shader_frontend sm4_shader_frontend DECLSPEC_HIDDEN; -HRESULT shader_extract_from_dxbc(struct wined3d_shader *shader, +HRESULT wined3d_shader_extract_from_dxbc(struct wined3d_shader *shader, unsigned int max_shader_version, enum vkd3d_shader_source_type *source_type) DECLSPEC_HIDDEN; BOOL shader_get_stream_output_register_info(const struct wined3d_shader *shader, const struct wined3d_stream_output_element *so_element, unsigned int *register_idx,

1 0

Stefan Dösinger : vkd3d-shader/hlsl: Make sure variants is initialized in declare_predefined_types().
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: vkd3d Branch: master Commit: 5e88ab22aab49d33f7cc3a5337f3a7719cfa2833 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5e88ab22aab49d33f7cc3a5337f3a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 25 12:44:26 2023 +0200 vkd3d-shader/hlsl: Make sure variants is initialized in declare_predefined_types(). MSVC is too stupid to see it is unused when n_variants=0. --- libs/vkd3d-shader/hlsl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index ba5bcfbf..faeddb7e 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3127,8 +3127,8 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) for (bt = 0; bt <= HLSL_TYPE_LAST_SCALAR; ++bt) { - unsigned int n_variants = 0; const char *const *variants; + unsigned int n_variants; switch (bt) { @@ -3148,6 +3148,8 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) break; default: + n_variants = 0; + variants = NULL; break; }

1 0

Jacek Caban : gdi32: Don't use DECLSPEC_HIDDEN.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: cd56a1c16450d3d2addaf6a398859e4682e8b851 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd56a1c16450d3d2addaf6a398859e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:05:29 2023 +0200 gdi32: Don't use DECLSPEC_HIDDEN. --- dlls/gdi32/gdi_private.h | 389 ++++++++++++++++++++++------------------------- dlls/gdi32/text.c | 2 +- 2 files changed, 184 insertions(+), 207 deletions(-)

1 0

Jacek Caban : make_unicode: Don't use DECLSPEC_HIDDEN.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: a5f62b3ef7d286b1a2b205bf236921be5ba16e55 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5f62b3ef7d286b1a2b205bf236921… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 13:08:45 2023 +0200 make_unicode: Don't use DECLSPEC_HIDDEN. --- dlls/dwrite/bracket.c | 2 +- dlls/dwrite/direction.c | 2 +- dlls/dwrite/linebreak.c | 2 +- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 2 +- dlls/dwrite/shapers/arabic_table.c | 2 +- dlls/gdi32/uniscribe/bracket.c | 2 +- dlls/gdi32/uniscribe/direction.c | 2 +- dlls/gdi32/uniscribe/indicsyllable.c | 2 +- dlls/gdi32/uniscribe/linebreak.c | 2 +- dlls/gdi32/uniscribe/mirror.c | 2 +- dlls/gdi32/uniscribe/shaping.c | 4 ++-- dlls/win32u/vertical.c | 2 +- dlls/wineps.drv/direction.c | 2 +- dlls/wineps.drv/vertical.c | 2 +- tools/make_unicode | 6 +++--- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/bracket.c b/dlls/dwrite/bracket.c index 4c74da996ec..2e513bf6560 100644 --- a/dlls/dwrite/bracket.c +++ b/dlls/dwrite/bracket.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN bidi_bracket_table[572] = +const unsigned short bidi_bracket_table[572] = { /* level 1 offsets */ 0x0100, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, diff --git a/dlls/dwrite/direction.c b/dlls/dwrite/direction.c index 721ffbe6281..12e62d01f4b 100644 --- a/dlls/dwrite/direction.c +++ b/dlls/dwrite/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN bidi_direction_table[5631] = +const unsigned short bidi_direction_table[5631] = { /* level 1 offsets */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0144, 0x0152, 0x0152, 0x0152, diff --git a/dlls/dwrite/linebreak.c b/dlls/dwrite/linebreak.c index 637dd7e5440..29707e4135b 100644 --- a/dlls/dwrite/linebreak.c +++ b/dlls/dwrite/linebreak.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[9976] = +const unsigned short wine_linebreak_table[9976] = { /* level 1 offsets */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0143, 0x0151, 0x0151, 0x0151, diff --git a/dlls/dwrite/mirror.c b/dlls/dwrite/mirror.c index 42e1d794064..fb9b66fb563 100644 --- a/dlls/dwrite/mirror.c +++ b/dlls/dwrite/mirror.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_mirror_map[1428] = +const unsigned short wine_mirror_map[1428] = { /* level 1 offsets */ 0x0100, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, diff --git a/dlls/dwrite/scripts.c b/dlls/dwrite/scripts.c index cc020f399a4..623a1cb76a3 100644 --- a/dlls/dwrite/scripts.c +++ b/dlls/dwrite/scripts.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_scripts_table[10323] = +const unsigned short wine_scripts_table[10323] = { /* level 1 offsets */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0144, 0x0152, 0x0152, 0x0152, diff --git a/dlls/dwrite/shapers/arabic_table.c b/dlls/dwrite/shapers/arabic_table.c index 4e65ff7c0ad..f266ccea0e3 100644 --- a/dlls/dwrite/shapers/arabic_table.c +++ b/dlls/dwrite/shapers/arabic_table.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN arabic_shaping_table[3547] = +const unsigned short arabic_shaping_table[3547] = { /* level 1 offsets */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0141, 0x0141, 0x0141, 0x0141, diff --git a/dlls/gdi32/uniscribe/bracket.c b/dlls/gdi32/uniscribe/bracket.c index 4c74da996ec..2e513bf6560 100644 --- a/dlls/gdi32/uniscribe/bracket.c +++ b/dlls/gdi32/uniscribe/bracket.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN bidi_bracket_table[572] = +const unsigned short bidi_bracket_table[572] = { /* level 1 offsets */ 0x0100, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, diff --git a/dlls/gdi32/uniscribe/direction.c b/dlls/gdi32/uniscribe/direction.c index 721ffbe6281..12e62d01f4b 100644 --- a/dlls/gdi32/uniscribe/direction.c +++ b/dlls/gdi32/uniscribe/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN bidi_direction_table[5631] = +const unsigned short bidi_direction_table[5631] = { /* level 1 offsets */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0144, 0x0152, 0x0152, 0x0152, diff --git a/dlls/gdi32/uniscribe/indicsyllable.c b/dlls/gdi32/uniscribe/indicsyllable.c index 8924ed2b78d..62671f76df3 100644 --- a/dlls/gdi32/uniscribe/indicsyllable.c +++ b/dlls/gdi32/uniscribe/indicsyllable.c @@ -5,7 +5,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3033] = +const unsigned short indic_syllabic_table[3033] = { /* level 1 offsets */ 0x0100, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, diff --git a/dlls/gdi32/uniscribe/linebreak.c b/dlls/gdi32/uniscribe/linebreak.c index 637dd7e5440..29707e4135b 100644 --- a/dlls/gdi32/uniscribe/linebreak.c +++ b/dlls/gdi32/uniscribe/linebreak.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[9976] = +const unsigned short wine_linebreak_table[9976] = { /* level 1 offsets */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0143, 0x0151, 0x0151, 0x0151, diff --git a/dlls/gdi32/uniscribe/mirror.c b/dlls/gdi32/uniscribe/mirror.c index 42e1d794064..fb9b66fb563 100644 --- a/dlls/gdi32/uniscribe/mirror.c +++ b/dlls/gdi32/uniscribe/mirror.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_mirror_map[1428] = +const unsigned short wine_mirror_map[1428] = { /* level 1 offsets */ 0x0100, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, diff --git a/dlls/gdi32/uniscribe/shaping.c b/dlls/gdi32/uniscribe/shaping.c index 8eed3d629f0..11dbd808edc 100644 --- a/dlls/gdi32/uniscribe/shaping.c +++ b/dlls/gdi32/uniscribe/shaping.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2114] = +const unsigned short wine_shaping_table[2114] = { /* level 1 offsets */ 0x0100, 0x010b, 0x010b, 0x011b, 0x0123, 0x012c, 0x013b, 0x014b, @@ -276,7 +276,7 @@ const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2114] = 0x0006, 0x0000, 0x0000, 0x0000, 0x0000 }; -const unsigned short DECLSPEC_HIDDEN wine_shaping_forms[256][4] = +const unsigned short wine_shaping_forms[256][4] = { { 0x0600, 0x0600, 0x0600, 0x0600 }, { 0x0601, 0x0601, 0x0601, 0x0601 }, diff --git a/dlls/win32u/vertical.c b/dlls/win32u/vertical.c index a992d0364f6..c273f8e3f3d 100644 --- a/dlls/win32u/vertical.c +++ b/dlls/win32u/vertical.c @@ -8,7 +8,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1248] = +const unsigned short vertical_orientation_table[1248] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0112, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, diff --git a/dlls/wineps.drv/direction.c b/dlls/wineps.drv/direction.c index 721ffbe6281..12e62d01f4b 100644 --- a/dlls/wineps.drv/direction.c +++ b/dlls/wineps.drv/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN bidi_direction_table[5631] = +const unsigned short bidi_direction_table[5631] = { /* level 1 offsets */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0144, 0x0152, 0x0152, 0x0152, diff --git a/dlls/wineps.drv/vertical.c b/dlls/wineps.drv/vertical.c index 101511cde57..2a36d19c20a 100644 --- a/dlls/wineps.drv/vertical.c +++ b/dlls/wineps.drv/vertical.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1248] = +const unsigned short vertical_orientation_table[1248] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0112, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, diff --git a/tools/make_unicode b/tools/make_unicode index 69dce31df47..48d63773810 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -3115,7 +3115,7 @@ sub dump_shaping($) dump_two_level_mapping( "wine_shaping_table", 0, 16, @joining_table ); - print OUTPUT "\nconst unsigned short DECLSPEC_HIDDEN wine_shaping_forms[256][4] =\n{\n"; + print OUTPUT "\nconst unsigned short wine_shaping_forms[256][4] =\n{\n"; for (my $i = 0x600; $i <= 0x6ff; $i++) { printf OUTPUT " { 0x%04x, 0x%04x, 0x%04x, 0x%04x },\n", @@ -3283,7 +3283,7 @@ sub dump_two_level_mapping($$$@) for (my $i = 0; $i < @row_data; $i++) { $row_data[$i] += @row_data + 256 - 4096; } - printf OUTPUT "const %s DECLSPEC_HIDDEN %s[%d] =\n{\n", $type, $name, @array + @row_data + @data; + printf OUTPUT "const %s %s[%d] =\n{\n", $type, $name, @array + @row_data + @data; printf OUTPUT " /* level 1 offsets */\n%s,\n", dump_array( $size, 0, @array ); printf OUTPUT " /* level 2 offsets */\n%s,\n", dump_array( $size, 0, @row_data ); printf OUTPUT " /* values */\n%s\n};\n", dump_array( $size, 0, @data ); @@ -3307,7 +3307,7 @@ sub dump_three_level_mapping($$@) for (my $i = $level2; $i < @array2; $i++) { $array2[$i] += @array1 + @array2 - $level2 - $level3; } for (my $i = $level1; $i < @array1; $i++) { $array1[$i] += @array1 - $level2; } - printf OUTPUT "const %s DECLSPEC_HIDDEN %s[%u] =\n{\n", $type, $name, @array1 + (@array2 - $level2) + (@array3 - $level3); + printf OUTPUT "const %s %s[%u] =\n{\n", $type, $name, @array1 + (@array2 - $level2) + (@array3 - $level3); printf OUTPUT " /* level 1 offsets */\n%s,\n", dump_array( $size, 0, @array1[0..$level1-1] ); printf OUTPUT " /* level 2 offsets */\n%s,\n", dump_array( $size, 0, @array1[$level1..$#array1] ); printf OUTPUT " /* level 3 offsets */\n%s,\n", dump_array( $size, 0, @array2[$level2..$#array2] );

1 0

Jacek Caban : gdi32/uniscribe: Don't use DECLSPEC_HIDDEN.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: wine Branch: master Commit: a312a8e29afe97457a3b26e3b3bb06ae77968362 URL: https://gitlab.winehq.org/wine/wine/-/commit/a312a8e29afe97457a3b26e3b3bb06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:07:23 2023 +0200 gdi32/uniscribe: Don't use DECLSPEC_HIDDEN. --- dlls/gdi32/uniscribe/bidi.c | 4 +- dlls/gdi32/uniscribe/breaking.c | 2 +- dlls/gdi32/uniscribe/shape.c | 6 +-- dlls/gdi32/uniscribe/usp10.c | 2 +- dlls/gdi32/uniscribe/usp10_internal.h | 77 ++++++++++++++++++++++------------- 5 files changed, 56 insertions(+), 35 deletions(-)

1 0