October 2022 - wine-commits

Biswapriyo Nath : include: Add the PFN_D3D12_SERIALIZE_ROOT_SIGNATURE typedef.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: 6f1f14d97a9f7688d1c838060180035c15f30613 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6f1f14d97a9f7688d1c8380601800… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 20 10:26:08 2022 +0530 include: Add the PFN_D3D12_SERIALIZE_ROOT_SIGNATURE typedef. --- include/vkd3d_d3d12.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 0f93b9bc..394dfa50 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2633,6 +2633,10 @@ typedef HRESULT (__stdcall *PFN_D3D12_CREATE_VERSIONED_ROOT_SIGNATURE_DESERIALIZ [local] HRESULT __stdcall D3D12CreateVersionedRootSignatureDeserializer( const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +typedef HRESULT (__stdcall *PFN_D3D12_SERIALIZE_ROOT_SIGNATURE)( + const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, + D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); + [local] HRESULT __stdcall D3D12SerializeRootSignature( const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob);

1 0

Biswapriyo Nath : include: Add the PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER typedef.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: c9198735fd44762ead120ac2509a3c59b8768915 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c9198735fd44762ead120ac2509a3… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 20 10:26:08 2022 +0530 include: Add the PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER typedef. --- include/vkd3d_d3d12.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index e30df590..0f93b9bc 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2621,6 +2621,9 @@ interface ID3D12VersionedRootSignatureDeserializer : IUnknown const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *GetUnconvertedRootSignatureDesc(); }; +typedef HRESULT (__stdcall *PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER)( + const void *data, SIZE_T data_size, REFIID iid, void **deserializer); + [local] HRESULT __stdcall D3D12CreateRootSignatureDeserializer( const void *data, SIZE_T data_size, REFIID iid, void **deserializer);

1 0

Piotr Caban : winedump: Handle NULL in get_unicode_str.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 9e74a249dfc560133447e62b7e112f7da7eb03e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e74a249dfc560133447e62b7e112f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 18 12:09:55 2022 +0200 winedump: Handle NULL in get_unicode_str. --- tools/winedump/dump.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index f2cb601b295..7d4a1a320d5 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -202,6 +202,7 @@ const char *get_unicode_str( const WCHAR *str, int len ) char *buffer; int i = 0; + if (!str) return "(null)"; if (len == -1) len = strlenW( str ); buffer = dump_want_n( len * 6 + 3); buffer[i++] = '"';

1 0

Gerald Pfeifer : ntdll: Fix build on systems without ENODATA.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: d7541508936b9ed776e8a39a0bc2a4cc875514d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7541508936b9ed776e8a39a0bc2a4… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Oct 18 23:41:49 2022 +0200 ntdll: Fix build on systems without ENODATA. On FreeBSD 12 and 14 ENODATA is not regularly defined. Cater to that in fd_get_file_info() and get_file_info(). --- dlls/ntdll/unix/file.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c7ba12a5c13..8a599a289f8 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1565,10 +1565,15 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON attr_len = xattr_fget( fd, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); if (attr_len != -1) *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); - else if (errno != ENODATA && errno != ENOTSUP) + else + { + if (errno == ENOTSUP) return ret; +#ifdef ENODATA + if (errno == ENODATA) return ret; +#endif WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)\n", errno, strerror( errno ) ); - + } return ret; } @@ -1653,10 +1658,15 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) attr_len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); if (attr_len != -1) *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); - else if (errno != ENODATA && errno != ENOTSUP) + else + { + if (errno == ENOTSUP) return ret; +#ifdef ENODATA + if (errno == ENODATA) return ret; +#endif WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB " from \"%s\". errno %d (%s)\n", path, errno, strerror( errno ) ); - + } return ret; }

1 0

Alistair Leslie-Hughes : sapi: Implement ISpObjectToken OpenKey.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 9ea45b5a2e26ff64b94a52eb862b2838a13cdc42 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ea45b5a2e26ff64b94a52eb862b28… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 22 19:01:44 2021 +1000 sapi: Implement ISpObjectToken OpenKey. --- dlls/sapi/tests/token.c | 8 ++++++++ dlls/sapi/token.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 7778f4e61db..7ef58e697b0 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -194,6 +194,7 @@ static void test_default_token_id(void) static void test_object_token(void) { ISpObjectToken *token; + ISpDataKey *sub_key; HRESULT hr; LPWSTR tempW, token_id; ISpObjectTokenCategory *cat; @@ -253,6 +254,13 @@ static void test_object_token(void) CoTaskMemFree( tempW ); } + hr = ISpObjectToken_OpenKey(token, L"Non-exist", &sub_key); + ok( hr == SPERR_NOT_FOUND, "got %08lx\n", hr ); + + hr = ISpObjectToken_OpenKey(token, L"Classes", &sub_key); + ok( hr == S_OK, "got %08lx\n", hr ); + ISpDataKey_Release(sub_key); + cat = (LPVOID)0xdeadbeef; hr = ISpObjectToken_GetCategory( token, &cat ); todo_wine ok( hr == SPERR_INVALID_REGISTRY_KEY, "got %08lx\n", hr ); diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index b5cfc45e5a3..476e8d6d248 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -931,8 +931,37 @@ static HRESULT WINAPI token_GetDWORD( ISpObjectToken *iface, static HRESULT WINAPI token_OpenKey( ISpObjectToken *iface, LPCWSTR name, ISpDataKey **sub_key ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct object_token *This = impl_from_ISpObjectToken( iface ); + ISpRegDataKey *spregkey; + HRESULT hr; + HKEY key; + LONG ret; + + TRACE( "%p, %s, %p\n", This, debugstr_w(name), sub_key ); + + ret = RegOpenKeyExW (This->token_key, name, 0, KEY_ALL_ACCESS, &key); + if (ret != ERROR_SUCCESS) + return SPERR_NOT_FOUND; + + hr = data_key_create(NULL, &IID_ISpRegDataKey, (void**)&spregkey); + if (FAILED(hr)) + { + RegCloseKey(key); + return hr; + } + + hr = ISpRegDataKey_SetKey(spregkey, key, FALSE); + if (FAILED(hr)) + { + RegCloseKey(key); + ISpRegDataKey_Release(spregkey); + return hr; + } + + hr = ISpRegDataKey_QueryInterface(spregkey, &IID_ISpDataKey, (void**)sub_key); + ISpRegDataKey_Release(spregkey); + + return hr; } static HRESULT WINAPI token_CreateKey( ISpObjectToken *iface,

1 0

Hugh McMaster : kernelbase: Avoid memory leaks in GetConsoleTitleW().
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: e58052d8361fde59fd5d4a1d9386265e1099f633 URL: https://gitlab.winehq.org/wine/wine/-/commit/e58052d8361fde59fd5d4a1d938626… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Oct 19 23:33:34 2022 +1100 kernelbase: Avoid memory leaks in GetConsoleTitleW(). --- dlls/kernelbase/console.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index e3b0ebead9e..7cd87f53b3c 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1057,16 +1057,17 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleTitleW( LPWSTR title, DWORD size ) if (!(params = HeapAlloc( GetProcessHeap(), 0, max_size ))) return 0; - if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_TITLE, - NULL, 0, params, max_size, &size )) - return 0; - - if (size < sizeof(*params)) return 0; + if (console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_TITLE, + NULL, 0, params, max_size, &size ) && + size >= sizeof(*params)) + { + size -= sizeof(*params); + memcpy( title, params->buffer, size ); + title[ size / sizeof(WCHAR) ] = 0; + size = params->title_len; + } + else size = 0; - size -= sizeof(*params); - memcpy( title, params->buffer, size ); - title[ size / sizeof(WCHAR) ] = 0; - size = params->title_len; HeapFree( GetProcessHeap(), 0, params ); return size; }

1 0

Eric Pouech : dbghelp: Silence some FIXMEs.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 0c3d78269f9a463bf43bebdf08db368aef484cca URL: https://gitlab.winehq.org/wine/wine/-/commit/0c3d78269f9a463bf43bebdf08db36… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 19 17:27:43 2022 +0200 dbghelp: Silence some FIXMEs. In some 32bit modules, MingW/GCC generates in Dwarf debug information, a cfa address to be computed as: deref(register XX + offset) which is too complicated to be expressed through regular DbgHelp APIs. So silence the FIXME, and report a 'too complex' error (instead of 'internal'). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52790 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 8d365ba88f1..4671174d3bb 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3028,7 +3028,7 @@ static const dwarf2_cuhead_t* get_cuhead_from_func(const struct symt_function* f return NULL; } -static BOOL compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct location* frame); +static enum location_error compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct location* frame); static enum location_error loc_compute_frame(struct process* pcs, const struct module_format* modfmt, @@ -3071,7 +3071,8 @@ static enum location_error loc_compute_frame(struct process* pcs, } break; case loc_dwarf2_frame_cfa: - if (!compute_call_frame_cfa(modfmt->module, ip + ((struct symt_compiland*)func->container)->address, frame)) return loc_err_internal; + err = compute_call_frame_cfa(modfmt->module, ip + ((struct symt_compiland*)func->container)->address, frame); + if (err < 0) return err; break; default: WARN("Unsupported frame kind %d\n", pframe->kind); @@ -3866,11 +3867,11 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, ULONG_PTR ip, return TRUE; } -static BOOL compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct location* frame) +static enum location_error compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct location* frame) { struct frame_info info; - if (!dwarf2_fetch_frame_info(module, module->cpu, ip, &info)) return FALSE; + if (!dwarf2_fetch_frame_info(module, module->cpu, ip, &info)) return loc_err_internal; /* beginning of function, or no available dwarf information ? */ if (ip == info.ip || info.state.rules[info.retaddr_reg] == RULE_UNSET) @@ -3888,11 +3889,15 @@ static BOOL compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct l switch (info.state.cfa_rule) { case RULE_EXPRESSION: - FIXME("Too complex expression for frame_CFA resolution (RULE_EXPRESSION)\n"); - return FALSE; + WARN("Too complex expression for frame_CFA resolution (RULE_EXPRESSION)\n"); + return loc_err_too_complex; case RULE_VAL_EXPRESSION: - FIXME("Too complex expression for frame_CFA resolution (RULE_VAL_EXPRESSION)\n"); - return FALSE; + /* unfortunately, we've seen at least construct like: + * cfa := 'breg_x + offset; deref' + * which is an indirection too much for the DbgHelp API. + */ + WARN("Too complex expression for frame_CFA resolution (RULE_VAL_EXPRESSION)\n"); + return loc_err_too_complex; default: frame->kind = loc_regrel; frame->reg = module->cpu->map_dwarf_register(info.state.cfa_reg, module, TRUE); @@ -3900,7 +3905,7 @@ static BOOL compute_call_frame_cfa(struct module* module, ULONG_PTR ip, struct l break; } } - return TRUE; + return 0; } static void dwarf2_location_compute(struct process* pcs,

1 0

Eric Pouech : dbghelp: Allow symt_block to be defined over non contiguous chunks.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 3dee69106a4fcbb4f762a2cc7942f0215d33216c URL: https://gitlab.winehq.org/wine/wine/-/commit/3dee69106a4fcbb4f762a2cc7942f0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 18 17:33:33 2022 +0200 dbghelp: Allow symt_block to be defined over non contiguous chunks. This improves correctness of functions like SymFromAddr() when searching local variables. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 117 +++++++++++++++++++++++------------------ dlls/dbghelp/dwarf.c | 115 ++++++++++++---------------------------- dlls/dbghelp/msc.c | 12 ++--- dlls/dbghelp/stabs.c | 7 +-- dlls/dbghelp/symbol.c | 27 ++++++---- dlls/dbghelp/type.c | 12 ++++- 6 files changed, 136 insertions(+), 154 deletions(-)

1 0

Eric Pouech : dbghelp: No longer call read_range() for inline site (dwarf).
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: eb820b37c9262f0a3af0e526b7331a7bad8fa852 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb820b37c9262f0a3af0e526b7331a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 18 17:33:32 2022 +0200 dbghelp: No longer call read_range() for inline site (dwarf). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 37552afedb3..03e476487cc 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2185,7 +2185,6 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, dwarf2_debug_info_t* di) { struct attribute name; - ULONG_PTR low_pc, high_pc; struct symt* ret_type; struct symt_function_signature* sig_type; struct symt_inlinesite* inlined; @@ -2197,9 +2196,9 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, TRACE("%s\n", dwarf2_debug_di(di)); - if (!dwarf2_read_range(subpgm->ctx, di, &low_pc, &high_pc)) + if ((adranges = dwarf2_get_ranges(di, &num_adranges)) == NULL) { - WARN("cannot read range\n"); + WARN("cannot read ranges\n"); return; } if (!dwarf2_find_attribute(di, DW_AT_name, &name)) @@ -2216,20 +2215,14 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, subpgm->top_func, subpgm->current_block ? &subpgm->current_block->symt : &subpgm->current_func->symt, dwarf2_get_cpp_name(di, name.u.string), - subpgm->ctx->module_ctx->load_offset + low_pc, - &sig_type->symt); + adranges[0].low, &sig_type->symt); subpgm->current_func = (struct symt_function*)inlined; subpgm->current_block = NULL; - if ((adranges = dwarf2_get_ranges(di, &num_adranges)) != NULL) - { - for (i = 0; i < num_adranges; ++i) - symt_add_inlinesite_range(subpgm->ctx->module_ctx->module, inlined, - adranges[i].low, adranges[i].high); - free(adranges); - } - else - WARN("cannot read ranges\n"); + for (i = 0; i < num_adranges; ++i) + symt_add_inlinesite_range(subpgm->ctx->module_ctx->module, inlined, + adranges[i].low, adranges[i].high); + free(adranges); children = dwarf2_get_di_children(di); if (children) for (i = 0; i < vector_length(children); i++)

1 0

Eric Pouech : dbghelp: Rework dwarf2_get_ranges() helper.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: aa29948966a904404ff8d118a82acbc0f1adc9ac URL: https://gitlab.winehq.org/wine/wine/-/commit/aa29948966a904404ff8d118a82acb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 18 17:33:30 2022 +0200 dbghelp: Rework dwarf2_get_ranges() helper. - split in two sub helpers (one to get size, the other to fill content in) (this avoids reallocating buffer) - return error in case no range is present (but range dwarf attribute is) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 83 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 56 insertions(+), 27 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 8c57c211db4..37552afedb3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1280,55 +1280,75 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in } } -static struct addr_range* dwarf2_get_ranges(const dwarf2_debug_info_t* di, unsigned* num_ranges) +static unsigned dwarf2_get_num_ranges(const dwarf2_debug_info_t* di) { struct attribute range; - struct addr_range* ranges; - struct addr_range* new_ranges; if (dwarf2_find_attribute(di, DW_AT_ranges, &range)) { dwarf2_traverse_context_t traverse; - unsigned alloc = 16; - ranges = malloc(sizeof(struct addr_range) * alloc); - if (!ranges) return NULL; - *num_ranges = 0; + unsigned num_ranges = 0; traverse.data = di->unit_ctx->module_ctx->sections[section_ranges].address + range.u.uvalue; traverse.end_data = di->unit_ctx->module_ctx->sections[section_ranges].address + di->unit_ctx->module_ctx->sections[section_ranges].size; - while (traverse.data + 2 * di->unit_ctx->head.word_size < traverse.end_data) + for (num_ranges = 0; traverse.data + 2 * di->unit_ctx->head.word_size < traverse.end_data; num_ranges++) { ULONG_PTR low = dwarf2_parse_addr_head(&traverse, &di->unit_ctx->head); ULONG_PTR high = dwarf2_parse_addr_head(&traverse, &di->unit_ctx->head); if (low == 0 && high == 0) break; if (low == (di->unit_ctx->head.word_size == 8 ? (~(DWORD64)0u) : (DWORD64)(~0u))) FIXME("unsupported yet (base address selection)\n"); - if (*num_ranges >= alloc) - { - alloc *= 2; - new_ranges = realloc(ranges, sizeof(struct addr_range) * alloc); - if (!new_ranges) - { - free(ranges); - return NULL; - } - ranges = new_ranges; - } - ranges[*num_ranges].low = di->unit_ctx->compiland->address + low; - ranges[*num_ranges].high = di->unit_ctx->compiland->address + high; - (*num_ranges)++; } + return num_ranges; } else { struct attribute low_pc; struct attribute high_pc; - if (!dwarf2_find_attribute(di, DW_AT_low_pc, &low_pc) || + return dwarf2_find_attribute(di, DW_AT_low_pc, &low_pc) && + dwarf2_find_attribute(di, DW_AT_high_pc, &high_pc) ? 1 : 0; + } +} + +/* nun_ranges must have been gotten from dwarf2_get_num_ranges() */ +static BOOL dwarf2_fill_ranges(const dwarf2_debug_info_t* di, struct addr_range* ranges, unsigned num_ranges) +{ + struct attribute range; + + if (dwarf2_find_attribute(di, DW_AT_ranges, &range)) + { + dwarf2_traverse_context_t traverse; + unsigned index; + + traverse.data = di->unit_ctx->module_ctx->sections[section_ranges].address + range.u.uvalue; + traverse.end_data = di->unit_ctx->module_ctx->sections[section_ranges].address + + di->unit_ctx->module_ctx->sections[section_ranges].size; + + for (index = 0; traverse.data + 2 * di->unit_ctx->head.word_size < traverse.end_data; index++) + { + ULONG_PTR low = dwarf2_parse_addr_head(&traverse, &di->unit_ctx->head); + ULONG_PTR high = dwarf2_parse_addr_head(&traverse, &di->unit_ctx->head); + if (low == 0 && high == 0) break; + if (low == (di->unit_ctx->head.word_size == 8 ? (~(DWORD64)0u) : (DWORD64)(~0u))) + FIXME("unsupported yet (base address selection)\n"); + if (index >= num_ranges) return FALSE; /* sanity check */ + ranges[index].low = di->unit_ctx->compiland->address + low; + ranges[index].high = di->unit_ctx->compiland->address + high; + } + return index == num_ranges; /* sanity check */ + } + else + { + struct attribute low_pc; + struct attribute high_pc; + + if (num_ranges != 1 || /* sanity check */ + !dwarf2_find_attribute(di, DW_AT_low_pc, &low_pc) || !dwarf2_find_attribute(di, DW_AT_high_pc, &high_pc)) - return NULL; + return FALSE; if (di->unit_ctx->head.version >= 4) switch (high_pc.form) { @@ -1347,12 +1367,21 @@ static struct addr_range* dwarf2_get_ranges(const dwarf2_debug_info_t* di, unsig FIXME("Unsupported class for high_pc\n"); break; } - ranges = malloc(sizeof(struct addr_range)); - if (!ranges) return NULL; ranges[0].low = di->unit_ctx->module_ctx->load_offset + low_pc.u.uvalue; ranges[0].high = di->unit_ctx->module_ctx->load_offset + high_pc.u.uvalue; - *num_ranges = 1; } + return TRUE; +} + +static struct addr_range* dwarf2_get_ranges(const dwarf2_debug_info_t* di, unsigned* num_ranges) +{ + unsigned nr = dwarf2_get_num_ranges(di); + struct addr_range* ranges; + + if (nr == 0) return NULL; + ranges = malloc(nr * sizeof(ranges[0])); + if (!ranges || !dwarf2_fill_ranges(di, ranges, nr)) return NULL; + *num_ranges = nr; return ranges; }

1 0

Chilung Chan : po: Update Traditional Chinese translation.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: f31f7db286087782704866ad21b914be279fdf7a URL: https://gitlab.winehq.org/wine/wine/-/commit/f31f7db286087782704866ad21b914… Author: Chilung Chan <eason066(a)gmail.com> Date: Mon Oct 17 16:39:12 2022 +0800 po: Update Traditional Chinese translation. --- po/zh_TW.po | 86 +++++++++---------------------------------------------------- 1 file changed, 12 insertions(+), 74 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 3837694efbc..53301e772aa 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-06-09 03:15+0800\n" +"PO-Revision-Date: 2022-10-17 16:35+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -1321,10 +1321,8 @@ msgid "Options" msgstr "選項" #: dlls/compstui/compstui.rc:31 -#, fuzzy -#| msgid "Defaults" msgid "Default" -msgstr "預設" +msgstr "預設值" #: dlls/credui/credui.rc:45 msgid "&User name:" @@ -14913,10 +14911,8 @@ msgid "&Replace...\tCtrl+H" msgstr "取代(&R)...\tCtrl+H" #: programs/notepad/notepad.rc:59 -#, fuzzy -#| msgid "&New...\tCtrl+N" msgid "&Go To...\tCtrl+G" -msgstr "新增(&N)...\tCtrl+N" +msgstr "移至(&G)...\tCtrl+G" #: programs/notepad/notepad.rc:63 programs/oleview/oleview.rc:68 #: programs/oleview/oleview.rc:90 programs/winefile/winefile.rc:67 @@ -14959,17 +14955,15 @@ msgstr "上(&T):" #: programs/notepad/notepad.rc:132 msgid "Go To Line" -msgstr "" +msgstr "移至行" #: programs/notepad/notepad.rc:134 -#, fuzzy -#| msgid "CRL Number" msgid "&Line Number:" -msgstr "CRL 號碼" +msgstr "行號(&L):" #: programs/notepad/notepad.rc:137 msgid "Go To" -msgstr "" +msgstr "移至" #: programs/notepad/notepad.rc:145 msgid "Encoding:" @@ -15035,7 +15029,7 @@ msgstr "Z" #: programs/notepad/notepad.rc:162 msgctxt "accelerator GoTo" msgid "G" -msgstr "" +msgstr "G" #: programs/notepad/notepad.rc:74 msgid "Page &p" @@ -15112,7 +15106,7 @@ msgstr "" #: programs/notepad/notepad.rc:90 msgid "Ln %ld, Col %ld" -msgstr "" +msgstr "第 %ld 列，第 %ld 行" #: programs/oleview/oleview.rc:32 msgid "&Bind to file..." @@ -15719,56 +15713,6 @@ msgstr "" "\n" #: programs/reg/reg.rc:67 -#, fuzzy -#| msgid "" -#| "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" -#| "f]\n" -#| "\n" -#| " Adds a key to the registry or adds a new value to a given registry " -#| "key.\n" -#| "\n" -#| " <key>\n" -#| " The registry key to add or, if either [/v] or [/ve] is specified,\n" -#| " the key in which to add the new registry data.\n" -#| "\n" -#| " Format: ROOT\\Subkey\n" -#| "\n" -#| " ROOT: A predefined registry key. This must be one of the following:\n" -#| "\n" -#| " HKEY_LOCAL_MACHINE | HKLM\n" -#| " HKEY_CURRENT_USER | HKCU\n" -#| " HKEY_CLASSES_ROOT | HKCR\n" -#| " HKEY_USERS | HKU\n" -#| " HKEY_CURRENT_CONFIG | HKCC\n" -#| "\n" -#| " Subkey: The full path to a registry key under a given ROOT key.\n" -#| "\n" -#| " /v <value_name>\n" -#| " The name of the registry value to add.\n" -#| "\n" -#| " /ve\n" -#| " Add an unnamed registry value. This option modifies the (Default)\n" -#| " registry value.\n" -#| "\n" -#| " /t <type>\n" -#| " The type of data to add to the registry. If [/t] is specified,\n" -#| " <type> must be one of the following:\n" -#| "\n" -#| " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -#| " REG_DWORD | REG_BINARY | REG_NONE\n" -#| "\n" -#| " If [/t] is not specified, the default data type is REG_SZ.\n" -#| "\n" -#| " /s <separator>\n" -#| " The character used to separate strings in REG_MULTI_SZ data.\n" -#| " If [/s] is not specified, the default separator is \\0.\n" -#| "\n" -#| " /d <data>\n" -#| " The data to add to the new registry value.\n" -#| "\n" -#| " /f\n" -#| " Modify the registry without prompting for confirmation.\n" -#| "\n" msgid "" "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" "\n" @@ -15849,7 +15793,7 @@ msgstr "" " <類型> 必須是下列的其中一個:\n" "\n" " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -" REG_DWORD | REG_BINARY | REG_NONE\n" +" REG_DWORD | REG_QWORD | REG_BINARY | REG_NONE\n" "\n" " 如果未指定 [/t]，資料類型將預設為 REG_SZ。\n" "\n" @@ -16288,10 +16232,8 @@ msgstr "DWORD 值(&D)" #: programs/regedit/regedit.rc:52 programs/regedit/regedit.rc:105 #: programs/regedit/regedit.rc:128 -#, fuzzy -#| msgid "&DWORD Value" msgid "&QWORD Value" -msgstr "DWORD 值(&D)" +msgstr "QWORD 值(&Q)" #: programs/regedit/regedit.rc:53 programs/regedit/regedit.rc:106 #: programs/regedit/regedit.rc:129 @@ -16840,16 +16782,12 @@ msgid "Collapse" msgstr "摺疊" #: programs/regedit/regedit.rc:178 -#, fuzzy -#| msgid "Adds a new 32-bit value" msgid "Adds a new 64-bit value" -msgstr "新增一個新的 32 位元值" +msgstr "新增一個新的 64 位元值" #: programs/regedit/regedit.rc:221 -#, fuzzy -#| msgid "Edit DWORD" msgid "Edit QWORD" -msgstr "編輯 DWORD" +msgstr "編輯 QWORD" #: programs/regsvr32/regsvr32.rc:33 msgid ""

1 0

Zhiyi Zhang : comctl32/updown: Don't repaint when handling WM_STYLECHANGED.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: cacb60cb6df3825ac3e60a4340f675c9c70b9d34 URL: https://gitlab.winehq.org/wine/wine/-/commit/cacb60cb6df3825ac3e60a4340f675… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 16:32:54 2022 +0800 comctl32/updown: Don't repaint when handling WM_STYLECHANGED. --- dlls/comctl32/tests/misc.c | 2 +- dlls/comctl32/updown.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index c04e37ca2f3..5613fba15f5 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1110,7 +1110,7 @@ static void test_WM_STYLECHANGED(void) {TOOLTIPS_CLASSA, wm_stylechanged_seq}, {TRACKBAR_CLASSA, wm_stylechanged_trackbar_seq, TRUE}, {WC_TREEVIEWA, wm_stylechanged_seq}, - {UPDOWN_CLASSA, wm_stylechanged_seq, TRUE}, + {UPDOWN_CLASSA, wm_stylechanged_seq}, {WC_SCROLLBARA, wm_stylechanged_seq}, }; diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index e07f9e7a9f2..1d00db275f2 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -955,10 +955,8 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L break; case WM_STYLECHANGED: - if (wParam == GWL_STYLE) { + if (wParam == GWL_STYLE) infoPtr->dwStyle = ((LPSTYLESTRUCT)lParam)->styleNew; - InvalidateRect (infoPtr->Self, NULL, FALSE); - } break; case WM_THEMECHANGED:

1 0

Zhiyi Zhang : comctl32/tab: Don't repaint when handling WM_STYLECHANGED.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: b7624fb4eda0c1a1662e21c95401003f9595c09e URL: https://gitlab.winehq.org/wine/wine/-/commit/b7624fb4eda0c1a1662e21c9540100… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 16:30:11 2022 +0800 comctl32/tab: Don't repaint when handling WM_STYLECHANGED. --- dlls/comctl32/tab.c | 1 - dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 1275381489a..8943d9dce7c 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -3247,7 +3247,6 @@ static INT TAB_StyleChanged(TAB_INFO *infoPtr, WPARAM wStyleType, infoPtr->dwStyle = lpss->styleNew; TAB_SetItemBounds (infoPtr); - InvalidateRect(infoPtr->hwnd, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 203d0857ee9..c04e37ca2f3 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1105,7 +1105,7 @@ static void test_WM_STYLECHANGED(void) {WC_STATICA, wm_stylechanged_seq}, {STATUSCLASSNAMEA, wm_stylechanged_seq}, {"SysLink", wm_stylechanged_seq}, - {WC_TABCONTROLA, wm_stylechanged_seq, TRUE}, + {WC_TABCONTROLA, wm_stylechanged_seq}, {TOOLBARCLASSNAMEA, wm_stylechanged_seq}, {TOOLTIPS_CLASSA, wm_stylechanged_seq}, {TRACKBAR_CLASSA, wm_stylechanged_trackbar_seq, TRUE},

1 0

Zhiyi Zhang : comctl32/syslink: Don't repaint when handling WM_STYLECHANGED.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: ff514c110433312c4e7f337118b66e9fad4073d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff514c110433312c4e7f337118b66e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 16:23:39 2022 +0800 comctl32/syslink: Don't repaint when handling WM_STYLECHANGED. --- dlls/comctl32/syslink.c | 4 ---- dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 011c8bdb8b2..8130bf19641 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -1676,11 +1676,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, case WM_STYLECHANGED: if (wParam == GWL_STYLE) - { infoPtr->Style = ((LPSTYLESTRUCT)lParam)->styleNew; - - InvalidateRect(infoPtr->Self, NULL, TRUE); - } return 0; case WM_CREATE: diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index f9ec53d4ea9..203d0857ee9 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1104,7 +1104,7 @@ static void test_WM_STYLECHANGED(void) {REBARCLASSNAMEA, wm_stylechanged_seq}, {WC_STATICA, wm_stylechanged_seq}, {STATUSCLASSNAMEA, wm_stylechanged_seq}, - {"SysLink", wm_stylechanged_seq, TRUE}, + {"SysLink", wm_stylechanged_seq}, {WC_TABCONTROLA, wm_stylechanged_seq, TRUE}, {TOOLBARCLASSNAMEA, wm_stylechanged_seq}, {TOOLTIPS_CLASSA, wm_stylechanged_seq},

1 0

Zhiyi Zhang : comctl32/datetime: Don't repaint when handling WM_STYLECHANGED.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 5267d32d6718e86f88284eea8cf8fb870081a7cd URL: https://gitlab.winehq.org/wine/wine/-/commit/5267d32d6718e86f88284eea8cf8fb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 16:17:47 2022 +0800 comctl32/datetime: Don't repaint when handling WM_STYLECHANGED. --- dlls/comctl32/datetime.c | 2 -- dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 53c17798668..ce154aacbea 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1528,8 +1528,6 @@ DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, const STYLESTRU DestroyWindow(infoPtr->hUpdown); infoPtr->hUpdown = 0; } - - InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 5c2b0445fed..f9ec53d4ea9 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1090,7 +1090,7 @@ static void test_WM_STYLECHANGED(void) {WC_BUTTONA, wm_stylechanged_seq}, {WC_COMBOBOXA, wm_stylechanged_combox_seq, TRUE}, {WC_COMBOBOXEXA, wm_stylechanged_seq}, - {DATETIMEPICK_CLASSA, wm_stylechanged_seq, TRUE}, + {DATETIMEPICK_CLASSA, wm_stylechanged_seq}, {WC_EDITA, wm_stylechanged_seq}, {WC_HEADERA, wm_stylechanged_repaint_seq, TRUE}, {HOTKEY_CLASSA, wm_stylechanged_seq},

1 0

Zhiyi Zhang : comctl32/animate: Don't repaint when handling WM_STYLECHANGED.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 07685c37aaf91828f1104b353812177630042ae4 URL: https://gitlab.winehq.org/wine/wine/-/commit/07685c37aaf91828f1104b35381217… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 16:11:57 2022 +0800 comctl32/animate: Don't repaint when handling WM_STYLECHANGED. --- dlls/comctl32/animate.c | 2 -- dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index fff963a6baa..adac333b663 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -866,8 +866,6 @@ static LRESULT ANIMATE_StyleChanged(ANIMATE_INFO *infoPtr, WPARAM wStyleType, co if (wStyleType != GWL_STYLE) return 0; infoPtr->dwStyle = lpss->styleNew; - - InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return 0; } diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index d9f07570fd0..5c2b0445fed 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1086,7 +1086,7 @@ static void test_WM_STYLECHANGED(void) } tests[] = { - {ANIMATE_CLASSA, wm_stylechanged_seq, TRUE}, + {ANIMATE_CLASSA, wm_stylechanged_seq}, {WC_BUTTONA, wm_stylechanged_seq}, {WC_COMBOBOXA, wm_stylechanged_combox_seq, TRUE}, {WC_COMBOBOXEXA, wm_stylechanged_seq},

1 0

Piotr Caban : msvcrt: Fix error handling in _mbslwr_s_l.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: c54e0d93d9145055de2b2ea97bdb2c4af90055b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c54e0d93d9145055de2b2ea97bdb2c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 19 13:44:53 2022 +0200 msvcrt: Fix error handling in _mbslwr_s_l. --- dlls/msvcrt/mbcs.c | 15 ++++++--------- dlls/msvcrt/tests/string.c | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index e275991343d..41a46f40495 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2114,15 +2114,12 @@ unsigned char* CDECL _mbslwr(unsigned char* s) */ int CDECL _mbslwr_s_l(unsigned char* s, size_t len, _locale_t locale) { + unsigned char *p = s; + if (!s && !len) - { return 0; - } - else if (!s || !len) - { - *_errno() = EINVAL; + if (!MSVCRT_CHECK_PMT(s && len)) return EINVAL; - } if (get_mbcinfo()->ismbcodepage) { @@ -2145,12 +2142,12 @@ int CDECL _mbslwr_s_l(unsigned char* s, size_t len, _locale_t locale) *s = _tolower_l(*s, locale); } - if (*s) + if (!MSVCRT_CHECK_PMT(len)) { - *s = '\0'; - *_errno() = EINVAL; + *p = 0; return EINVAL; } + *s = 0; return 0; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 7a3d4b636b3..df3f5fceef8 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2944,7 +2944,7 @@ static void test__mbslwr_s(void) memcpy(buffer, "ABCDEFGH", sizeof("ABCDEFGH")); errno = EBADF; - ret = p_mbslwr_s(buffer, 4); + ret = p_mbslwr_s(buffer, sizeof("ABCDEFGH") - 1); ok(ret == EINVAL, "Expected _mbslwr_s to return EINVAL, got %d\n", ret); ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno);

1 0

Piotr Caban : msvcrt: Fix error handling in _mbsupr_s_l.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 25bbc7e9964d9248afb73cb002a990bee8a441ae URL: https://gitlab.winehq.org/wine/wine/-/commit/25bbc7e9964d9248afb73cb002a990… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 19 13:41:44 2022 +0200 msvcrt: Fix error handling in _mbsupr_s_l. --- dlls/msvcrt/mbcs.c | 15 ++++++--------- dlls/msvcrt/tests/string.c | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index d098f5b23f4..e275991343d 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2194,15 +2194,12 @@ unsigned char* CDECL _mbsupr(unsigned char* s) */ int CDECL _mbsupr_s_l(unsigned char* s, size_t len, _locale_t locale) { + unsigned char *p = s; + if (!s && !len) - { return 0; - } - else if (!s || !len) - { - *_errno() = EINVAL; + if (!MSVCRT_CHECK_PMT(s && len)) return EINVAL; - } if (get_mbcinfo()->ismbcodepage) { @@ -2225,12 +2222,12 @@ int CDECL _mbsupr_s_l(unsigned char* s, size_t len, _locale_t locale) *s = _toupper_l(*s, locale); } - if (*s) + if (!MSVCRT_CHECK_PMT(len)) { - *s = '\0'; - *_errno() = EINVAL; + *p = 0; return EINVAL; } + *s = 0; return 0; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 905607e416d..7a3d4b636b3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2879,7 +2879,7 @@ static void test__mbsupr_s(void) memcpy(buffer, "abcdefgh", sizeof("abcdefgh")); errno = EBADF; - ret = p_mbsupr_s(buffer, 4); + ret = p_mbsupr_s(buffer, sizeof("abcdefgh") - 1); ok(ret == EINVAL, "Expected _mbsupr_s to return EINVAL, got %d\n", ret); ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno);

1 0

Piotr Caban : msvcrt: Add support for multi-byte characters in _mbctoupper_l.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 71144728cfebd8a5b2f355fefa1a7fe6be8d9174 URL: https://gitlab.winehq.org/wine/wine/-/commit/71144728cfebd8a5b2f355fefa1a7f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 19 13:16:17 2022 +0200 msvcrt: Add support for multi-byte characters in _mbctoupper_l. --- dlls/msvcrt/mbcs.c | 30 ++++++++++++++++++++++++++---- dlls/msvcrt/tests/string.c | 8 ++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 1c747ac1573..d098f5b23f4 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -494,12 +494,34 @@ unsigned int CDECL _mbctolower(unsigned int c) */ unsigned int CDECL _mbctoupper_l(unsigned int c, _locale_t locale) { - if (_ismbblead_l(c, locale)) + unsigned char str[2], ret[2]; + pthreadmbcinfo mbcinfo; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + if (c > 0xff) { - FIXME("Handle MBC chars\n"); - return c; + if (!_ismbblead_l((c >> 8) & 0xff, locale)) + return c; + + str[0] = c >> 8; + str[1] = c; + switch(__crtLCMapStringA(mbcinfo->mblcid, LCMAP_UPPERCASE, + (char*)str, 2, (char*)ret, 2, mbcinfo->mbcodepage, 0)) + { + case 0: + return c; + case 1: + return ret[0]; + default: + return ret[1] + (ret[0] << 8); + } } - return _toupper_l(c, locale); /* ASCII CP or SB char */ + + return mbcinfo->mbctype[c + 1] & _SBLOW ? mbcinfo->mbcasemap[c] : c; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 14c0adf0efc..905607e416d 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2839,6 +2839,7 @@ static void test__mbsupr_s(void) { errno_t ret; unsigned char buffer[20]; + int cp = _getmbcp(); if (!p_mbsupr_s) { @@ -2890,6 +2891,13 @@ static void test__mbsupr_s(void) "Expected the output buffer to be \"ABCDEFGH\\0ijklmnop\", got \"%s\"\n", buffer); + _setmbcp(936); + memcpy(buffer, "\xa2\xa1\xa2\xa2q", sizeof("\xa2\xa1\xa2\xa2q")); + ret = p_mbsupr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "\xa2\xf1\xa2\xf2Q", sizeof("\xa2\xf1\xa2\xf2Q")), + "got %s\n", debugstr_a((char*)buffer)); + _setmbcp(cp); } static void test__mbslwr_s(void)

1 0

Piotr Caban : msvcrt: Add support for multi-byte characters in _mbctolower_l.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 3861c1e36ac835eb3584fe71b8294816e1ed7a85 URL: https://gitlab.winehq.org/wine/wine/-/commit/3861c1e36ac835eb3584fe71b82948… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 19 13:14:44 2022 +0200 msvcrt: Add support for multi-byte characters in _mbctolower_l. --- dlls/msvcrt/mbcs.c | 30 ++++++++++++++++++++++++++---- dlls/msvcrt/tests/string.c | 9 +++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index f1d82b5e268..1c747ac1573 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -451,12 +451,34 @@ unsigned int CDECL _mbsnextc(const unsigned char* str) */ unsigned int CDECL _mbctolower_l(unsigned int c, _locale_t locale) { - if (_ismbblead_l(c, locale)) + unsigned char str[2], ret[2]; + pthreadmbcinfo mbcinfo; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + if (c > 0xff) { - FIXME("Handle MBC chars\n"); - return c; + if (!_ismbblead_l((c >> 8) & 0xff, locale)) + return c; + + str[0] = c >> 8; + str[1] = c; + switch(__crtLCMapStringA(mbcinfo->mblcid, LCMAP_LOWERCASE, + (char*)str, 2, (char*)ret, 2, mbcinfo->mbcodepage, 0)) + { + case 0: + return c; + case 1: + return ret[0]; + default: + return ret[1] + (ret[0] << 8); + } } - return _tolower_l(c, locale); /* ASCII CP or SB char */ + + return mbcinfo->mbctype[c + 1] & _SBUP ? mbcinfo->mbcasemap[c] : c; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4e525193ced..14c0adf0efc 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2896,6 +2896,7 @@ static void test__mbslwr_s(void) { errno_t ret; unsigned char buffer[20]; + int cp = _getmbcp(); if (!p_mbslwr_s) { @@ -2946,6 +2947,14 @@ static void test__mbslwr_s(void) ok(!memcmp(buffer, "abcdefgh\0IJKLMNOP", sizeof("abcdefgh\0IJKLMNOP")), "Expected the output buffer to be \"abcdefgh\\0IJKLMNOP\", got \"%s\"\n", buffer); + + _setmbcp(936); + memcpy(buffer, "\xa2\xf1\xa2\xf2Q", sizeof("\xa2\xf1\xa2\xf2Q")); + ret = p_mbslwr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "\xa2\xa1\xa2\xa2q", sizeof("\xa2\xa1\xa2\xa2q")), + "got %s\n", debugstr_a((char*)buffer)); + _setmbcp(cp); } static void test__mbstok(void)

1 0

Piotr Caban : msvcrt: Fix mbcasemap initialization.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: cbcbaf3631257a627a322b41868aa2baf27dd3a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbcbaf3631257a627a322b41868aa2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 19 12:56:53 2022 +0200 msvcrt: Fix mbcasemap initialization. --- dlls/msvcrt/mbcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 23d16ee925d..f1d82b5e268 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -365,7 +365,7 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) { if(!(mbcinfo->mbctype[i + 1] & _M1)) { - if(mbcinfo->mbctype[i] & (C1_UPPER|C1_LOWER)) + if(mbcinfo->mbctype[i + 1] & (_SBUP | _SBLOW)) mbcinfo->mbcasemap[i] = bufA[charcount]; charcount++; }

1 0

Bartosz Kosiorek : msvcrt: Add _mbsupr_s_l partial implementation.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 9b64ea2bf273f9c6db68495b37fa7ba8d2ef5201 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b64ea2bf273f9c6db68495b37fa7b… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Tue Oct 18 18:04:56 2022 +0200 msvcrt: Add _mbsupr_s_l partial implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45273 --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 23 ++++++++++++++++++----- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 8 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 90accd39722..b051cf6a77f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1202,7 +1202,7 @@ @ cdecl _mbsupr(str) @ stub _mbsupr_l @ cdecl _mbsupr_s(str long) -@ stub _mbsupr_s_l +@ cdecl _mbsupr_s_l(str long ptr) @ cdecl _mbtowc_l(ptr str long ptr) @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5ca3156ab0b..593df178536 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1559,7 +1559,7 @@ @ cdecl _mbsupr(str) @ stub _mbsupr_l @ cdecl _mbsupr_s(str long) -@ stub _mbsupr_s_l +@ cdecl _mbsupr_s_l(str long ptr) @ cdecl _mbtowc_l(ptr str long ptr) @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index a514febaa21..cd92da9a8d7 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1570,7 +1570,7 @@ @ cdecl _mbsupr(str) @ stub _mbsupr_l @ cdecl _mbsupr_s(str long) -@ stub _mbsupr_s_l +@ cdecl _mbsupr_s_l(str long ptr) @ cdecl _mbtowc_l(ptr str long ptr) @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9c2498781f0..de0da8e26e9 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -874,7 +874,7 @@ @ cdecl _mbsupr(str) @ stub _mbsupr_l @ cdecl _mbsupr_s(str long) -@ stub _mbsupr_s_l +@ cdecl _mbsupr_s_l(str long ptr) @ cdecl _mbtowc_l(ptr str long ptr) @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ae1add4cb5f..d5f94a65f78 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -852,7 +852,7 @@ @ cdecl _mbsupr(str) @ stub _mbsupr_l @ cdecl _mbsupr_s(str long) -@ stub _mbsupr_s_l +@ cdecl _mbsupr_s_l(str long ptr) @ cdecl _mbtowc_l(ptr str long ptr) @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index b5b4309db54..23d16ee925d 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2145,11 +2145,10 @@ unsigned char* CDECL _mbsupr(unsigned char* s) return ret; } - /********************************************************************* - * _mbsupr_s(MSVCRT.@) + * _mbsupr_s_l(MSVCRT.@) */ -int CDECL _mbsupr_s(unsigned char* s, size_t len) +int CDECL _mbsupr_s_l(unsigned char* s, size_t len, _locale_t locale) { if (!s && !len) { @@ -2160,12 +2159,13 @@ int CDECL _mbsupr_s(unsigned char* s, size_t len) *_errno() = EINVAL; return EINVAL; } + if (get_mbcinfo()->ismbcodepage) { unsigned int c; for ( ; *s && len > 0; len--) { - c = _mbctoupper(_mbsnextc(s)); + c = _mbctoupper_l(_mbsnextc_l(s, locale), locale); /* Note that I assume that the size of the character is unchanged */ if (c > 255) { @@ -2175,7 +2175,12 @@ int CDECL _mbsupr_s(unsigned char* s, size_t len) *s++=c; } } - else for ( ; *s && len > 0; s++, len--) *s = _toupper_l(*s, NULL); + else + { + for ( ; *s && len > 0; s++, len--) + *s = _toupper_l(*s, locale); + } + if (*s) { *s = '\0'; @@ -2185,6 +2190,14 @@ int CDECL _mbsupr_s(unsigned char* s, size_t len) return 0; } +/********************************************************************* + * _mbsupr_s(MSVCRT.@) + */ +int CDECL _mbsupr_s(unsigned char* s, size_t len) +{ + return _mbsupr_s_l(s, len, NULL); +} + /********************************************************************* * _mbsspn_l (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 07b15ae2d98..dab9ae87b5b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -823,7 +823,7 @@ @ cdecl _mbsupr(str) # stub _mbsupr_l(str ptr) @ cdecl _mbsupr_s(str long) -# stub _mbsupr_s_l(str long ptr) +@ cdecl _mbsupr_s_l(str long ptr) @ cdecl _mbtowc_l(ptr str long ptr) @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 9d22ff00f30..3e3fd8d6965 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -717,7 +717,7 @@ @ cdecl _mbsupr(str) @ stub _mbsupr_l @ cdecl _mbsupr_s(str long) -@ stub _mbsupr_s_l +@ cdecl _mbsupr_s_l(str long ptr) @ cdecl _mbtowc_l(ptr str long ptr) @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long)

1 0

Bartosz Kosiorek : msvcrt: Add _mbslwr_s_l partial implementation.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 01f3beef6842d97162c1214116cd37f5f08fe015 URL: https://gitlab.winehq.org/wine/wine/-/commit/01f3beef6842d97162c1214116cd37… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Tue Oct 18 18:03:23 2022 +0200 msvcrt: Add _mbslwr_s_l partial implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45273 --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 22 +++++++++++++++++----- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 8 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b3fd1af1ecb..90accd39722 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1122,7 +1122,7 @@ @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) -@ stub _mbslwr_s_l +@ cdecl _mbslwr_s_l(str long ptr) @ cdecl _mbsnbcat(str str long) @ stub _mbsnbcat_l @ cdecl _mbsnbcat_s(str long ptr long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 28e5e047090..5ca3156ab0b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1479,7 +1479,7 @@ @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) -@ stub _mbslwr_s_l +@ cdecl _mbslwr_s_l(str long ptr) @ cdecl _mbsnbcat(str str long) @ stub _mbsnbcat_l @ cdecl _mbsnbcat_s(str long ptr long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index ae4874a7116..a514febaa21 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1490,7 +1490,7 @@ @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) -@ stub _mbslwr_s_l +@ cdecl _mbslwr_s_l(str long ptr) @ cdecl _mbsnbcat(str str long) @ stub _mbsnbcat_l @ cdecl _mbsnbcat_s(str long ptr long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7b484d8be26..9c2498781f0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -794,7 +794,7 @@ @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) -@ stub _mbslwr_s_l +@ cdecl _mbslwr_s_l(str long ptr) @ cdecl _mbsnbcat(str str long) @ stub _mbsnbcat_l @ cdecl _mbsnbcat_s(str long ptr long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ab1ef139f9a..ae1add4cb5f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -772,7 +772,7 @@ @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) -@ stub _mbslwr_s_l +@ cdecl _mbslwr_s_l(str long ptr) @ cdecl _mbsnbcat(str str long) @ stub _mbsnbcat_l @ cdecl _mbsnbcat_s(str long ptr long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 7073fee5bfd..b5b4309db54 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2065,11 +2065,10 @@ unsigned char* CDECL _mbslwr(unsigned char* s) return ret; } - /********************************************************************* - * _mbslwr_s(MSVCRT.@) + * _mbslwr_s_l(MSVCRT.@) */ -int CDECL _mbslwr_s(unsigned char* s, size_t len) +int CDECL _mbslwr_s_l(unsigned char* s, size_t len, _locale_t locale) { if (!s && !len) { @@ -2080,12 +2079,13 @@ int CDECL _mbslwr_s(unsigned char* s, size_t len) *_errno() = EINVAL; return EINVAL; } + if (get_mbcinfo()->ismbcodepage) { unsigned int c; for ( ; *s && len > 0; len--) { - c = _mbctolower(_mbsnextc(s)); + c = _mbctolower_l(_mbsnextc_l(s, locale), locale); /* Note that I assume that the size of the character is unchanged */ if (c > 255) { @@ -2095,7 +2095,12 @@ int CDECL _mbslwr_s(unsigned char* s, size_t len) *s++=c; } } - else for ( ; *s && len > 0; s++, len--) *s = _tolower_l(*s, NULL); + else + { + for ( ; *s && len > 0; s++, len--) + *s = _tolower_l(*s, locale); + } + if (*s) { *s = '\0'; @@ -2105,6 +2110,13 @@ int CDECL _mbslwr_s(unsigned char* s, size_t len) return 0; } +/********************************************************************* + * _mbslwr_s(MSVCRT.@) + */ +int CDECL _mbslwr_s(unsigned char* str, size_t len) +{ + return _mbslwr_s_l(str, len, NULL); +} /********************************************************************* * _mbsupr(MSVCRT.@) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e1b14ff2a7e..07b15ae2d98 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -743,7 +743,7 @@ @ cdecl _mbslwr(str) # stub _mbslwr_l(str ptr) @ cdecl _mbslwr_s(str long) -# stub _mbslwr_s_l(str long ptr) +@ cdecl _mbslwr_s_l(str long ptr) @ cdecl _mbsnbcat(str str long) # stub _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c803799f4cd..9d22ff00f30 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -637,7 +637,7 @@ @ cdecl _mbslwr(str) @ stub _mbslwr_l @ cdecl _mbslwr_s(str long) -@ stub _mbslwr_s_l +@ cdecl _mbslwr_s_l(str long ptr) @ cdecl _mbsnbcat(str str long) @ stub _mbsnbcat_l @ cdecl _mbsnbcat_s(str long ptr long)

1 0

Bartosz Kosiorek : msvcrt: Add _mbctoupper_l partial implementation.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 36ea6f02104bd5b2537281af5d112bc647045516 URL: https://gitlab.winehq.org/wine/wine/-/commit/36ea6f02104bd5b2537281af5d112b… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Tue Oct 18 18:02:12 2022 +0200 msvcrt: Add _mbctoupper_l partial implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45273 --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 16 ++++++++++++---- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 648092da5a4..b3fd1af1ecb 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1092,7 +1092,7 @@ @ cdecl _mbctombb(long) @ stub _mbctombb_l @ cdecl _mbctoupper(long) -@ stub _mbctoupper_l +@ cdecl _mbctoupper_l(long ptr) @ extern _mbctype MSVCRT_mbctype @ stub _mblen_l @ cdecl _mbsbtype(str long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 03d96e91d86..28e5e047090 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1449,7 +1449,7 @@ @ cdecl _mbctombb(long) @ stub _mbctombb_l @ cdecl _mbctoupper(long) -@ stub _mbctoupper_l +@ cdecl _mbctoupper_l(long ptr) @ extern _mbctype MSVCRT_mbctype @ stub _mblen_l @ cdecl _mbsbtype(str long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8eb007f3945..ae4874a7116 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1460,7 +1460,7 @@ @ cdecl _mbctombb(long) @ stub _mbctombb_l @ cdecl _mbctoupper(long) -@ stub _mbctoupper_l +@ cdecl _mbctoupper_l(long ptr) @ extern _mbctype MSVCRT_mbctype @ stub _mblen_l @ cdecl _mbsbtype(str long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b0c81808198..7b484d8be26 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -764,7 +764,7 @@ @ cdecl _mbctombb(long) @ stub _mbctombb_l @ cdecl _mbctoupper(long) -@ stub _mbctoupper_l +@ cdecl _mbctoupper_l(long ptr) @ extern _mbctype MSVCRT_mbctype @ stub _mblen_l @ cdecl _mbsbtype(str long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f0b6e43b33c..ab1ef139f9a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -742,7 +742,7 @@ @ cdecl _mbctombb(long) @ stub _mbctombb_l @ cdecl _mbctoupper(long) -@ stub _mbctoupper_l +@ cdecl _mbctoupper_l(long ptr) @ extern _mbctype MSVCRT_mbctype @ stub _mblen_l @ cdecl _mbsbtype(str long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 3230a9fc084..7073fee5bfd 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -468,16 +468,24 @@ unsigned int CDECL _mbctolower(unsigned int c) } /********************************************************************* - * _mbctoupper(MSVCRT.@) + * _mbctoupper_l(MSVCRT.@) */ -unsigned int CDECL _mbctoupper(unsigned int c) +unsigned int CDECL _mbctoupper_l(unsigned int c, _locale_t locale) { - if (_ismbblead(c)) + if (_ismbblead_l(c, locale)) { FIXME("Handle MBC chars\n"); return c; } - return _toupper_l(c, NULL); /* ASCII CP or SB char */ + return _toupper_l(c, locale); /* ASCII CP or SB char */ +} + +/********************************************************************* + * _mbctoupper(MSVCRT.@) + */ +unsigned int CDECL _mbctoupper(unsigned int c) +{ + return _mbctoupper_l(c, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4f72b58b4d7..e1b14ff2a7e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -709,7 +709,7 @@ @ cdecl _mbctombb(long) # stub _mbctombb_l(long ptr) @ cdecl _mbctoupper(long) -# stub _mbctoupper_l(long ptr) +@ cdecl _mbctoupper_l(long ptr) @ extern _mbctype MSVCRT_mbctype # stub _mblen_l(str long ptr) @ cdecl _mbsbtype(str long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index f85309a7b42..c803799f4cd 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -607,7 +607,7 @@ @ cdecl _mbctombb(long) @ stub _mbctombb_l @ cdecl _mbctoupper(long) -@ stub _mbctoupper_l +@ cdecl _mbctoupper_l(long ptr) @ stub _mblen_l @ cdecl _mbsbtype(str long) @ stub _mbsbtype_l

1 0

Bartosz Kosiorek : msvcrt: Add _mbctolower_l partial implementation.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 0998dfe08d169f5f6a387dceafa2c411906567af URL: https://gitlab.winehq.org/wine/wine/-/commit/0998dfe08d169f5f6a387dceafa2c4… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Tue Oct 18 18:07:15 2022 +0200 msvcrt: Add _mbctolower_l partial implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45273 --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 16 ++++++++++++---- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index c0bbbc5b86d..648092da5a4 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1088,7 +1088,7 @@ @ cdecl _mbctokata(long) @ stub _mbctokata_l @ cdecl _mbctolower(long) -@ stub _mbctolower_l +@ cdecl _mbctolower_l(long ptr) @ cdecl _mbctombb(long) @ stub _mbctombb_l @ cdecl _mbctoupper(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a272ae98a1c..03d96e91d86 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1445,7 +1445,7 @@ @ cdecl _mbctokata(long) @ stub _mbctokata_l @ cdecl _mbctolower(long) -@ stub _mbctolower_l +@ cdecl _mbctolower_l(long ptr) @ cdecl _mbctombb(long) @ stub _mbctombb_l @ cdecl _mbctoupper(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d16316e7e05..8eb007f3945 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1456,7 +1456,7 @@ @ cdecl _mbctokata(long) @ stub _mbctokata_l @ cdecl _mbctolower(long) -@ stub _mbctolower_l +@ cdecl _mbctolower_l(long ptr) @ cdecl _mbctombb(long) @ stub _mbctombb_l @ cdecl _mbctoupper(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 371d17ecc21..b0c81808198 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -760,7 +760,7 @@ @ cdecl _mbctokata(long) @ stub _mbctokata_l @ cdecl _mbctolower(long) -@ stub _mbctolower_l +@ cdecl _mbctolower_l(long ptr) @ cdecl _mbctombb(long) @ stub _mbctombb_l @ cdecl _mbctoupper(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index dc9d4ae097b..f0b6e43b33c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -738,7 +738,7 @@ @ cdecl _mbctokata(long) @ stub _mbctokata_l @ cdecl _mbctolower(long) -@ stub _mbctolower_l +@ cdecl _mbctolower_l(long ptr) @ cdecl _mbctombb(long) @ stub _mbctombb_l @ cdecl _mbctoupper(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index dc9abca1b44..3230a9fc084 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -447,16 +447,24 @@ unsigned int CDECL _mbsnextc(const unsigned char* str) } /********************************************************************* - * _mbctolower(MSVCRT.@) + * _mbctolower_l(MSVCRT.@) */ -unsigned int CDECL _mbctolower(unsigned int c) +unsigned int CDECL _mbctolower_l(unsigned int c, _locale_t locale) { - if (_ismbblead(c)) + if (_ismbblead_l(c, locale)) { FIXME("Handle MBC chars\n"); return c; } - return _tolower_l(c, NULL); /* ASCII CP or SB char */ + return _tolower_l(c, locale); /* ASCII CP or SB char */ +} + +/********************************************************************* + * _mbctolower(MSVCRT.@) + */ +unsigned int CDECL _mbctolower(unsigned int c) +{ + return _mbctolower_l(c, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3aab3600e1d..4f72b58b4d7 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -705,7 +705,7 @@ @ cdecl _mbctokata(long) # stub _mbctokata_l(long ptr) @ cdecl _mbctolower(long) -# stub _mbctolower_l(long ptr) +@ cdecl _mbctolower_l(long ptr) @ cdecl _mbctombb(long) # stub _mbctombb_l(long ptr) @ cdecl _mbctoupper(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a4acf724d2f..f85309a7b42 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -603,7 +603,7 @@ @ cdecl _mbctokata(long) @ stub _mbctokata_l @ cdecl _mbctolower(long) -@ stub _mbctolower_l +@ cdecl _mbctolower_l(long ptr) @ cdecl _mbctombb(long) @ stub _mbctombb_l @ cdecl _mbctoupper(long)

1 0

Piotr Caban : comctl32: Add helper for drawing header title and subtitle obtained from HPROPSHEETPAGE.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: f3d90dbc890244425633e7bdbf8b35052d4e0ec6 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3d90dbc890244425633e7bdbf8b35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 16:56:52 2022 +0200 comctl32: Add helper for drawing header title and subtitle obtained from HPROPSHEETPAGE. --- dlls/comctl32/propsheet.c | 53 +++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index d713385eec1..e043e34a6cd 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -457,6 +457,22 @@ static void HPSP_set_header_subtitle(HPROPSHEETPAGE hpsp, const WCHAR *subtitle) hpsp->psp.dwFlags |= PSP_USEHEADERSUBTITLE; } +static void HPSP_draw_text(HPROPSHEETPAGE hpsp, HDC hdc, BOOL title, RECT *r, UINT format) +{ + const WCHAR *text = title ? hpsp->psp.pszHeaderTitle : hpsp->psp.pszHeaderSubTitle; + WCHAR buf[256]; + INT len; + + if (!IS_INTRESOURCE(text)) + DrawTextW(hdc, text, -1, r, format); + else + { + len = LoadStringW(hpsp->psp.hInstance, (UINT_PTR)text, buf, ARRAY_SIZE(buf)); + if (len != 0) + DrawTextW(hdc, buf, len, r, format); + } +} + #define add_flag(a) if (dwFlags & a) {strcat(string, #a );strcat(string," ");} /****************************************************************************** * PROPSHEET_UnImplementedFlags @@ -3252,8 +3268,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) HBRUSH hbr; RECT r, rzone; HPROPSHEETPAGE hpsp; - WCHAR szBuffer[256]; - int nLength; + DWORD flags; hdc = hdcParam ? hdcParam : BeginPaint(hwnd, &ps); if (!hdc) return 1; @@ -3267,13 +3282,13 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) hpsp = NULL; else hpsp = psInfo->proppage[psInfo->active_page].hpage; + flags = HPSP_get_flags(hpsp); - if ( hpsp && !(HPSP_get_flags(hpsp) & PSP_HIDEHEADER) && + if ( hpsp && !(flags & PSP_HIDEHEADER) && (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW)) && (psInfo->ppshheader.dwFlags & PSH_HEADER) ) { HWND hwndLineHeader = GetDlgItem(hwnd, IDC_SUNKEN_LINEHEADER); - LPCPROPSHEETPAGEW ppshpage = &hpsp->psp; HFONT hOldFont; COLORREF clrOld = 0; int oldBkMode = 0; @@ -3341,35 +3356,15 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) clrOld = SetTextColor (hdc, 0x00000000); oldBkMode = SetBkMode (hdc, TRANSPARENT); - if (ppshpage->dwFlags & PSP_USEHEADERTITLE) { + if (flags & PSP_USEHEADERTITLE) { SetRect(&r, 20, 10, 0, 0); - if (!IS_INTRESOURCE(ppshpage->pszHeaderTitle)) - DrawTextW(hdc, ppshpage->pszHeaderTitle, -1, &r, DT_LEFT | DT_SINGLELINE | DT_NOCLIP); - else - { - nLength = LoadStringW(ppshpage->hInstance, (UINT_PTR)ppshpage->pszHeaderTitle, - szBuffer, 256); - if (nLength != 0) - { - DrawTextW(hdc, szBuffer, nLength, &r, DT_LEFT | DT_SINGLELINE | DT_NOCLIP); - } - } + HPSP_draw_text(hpsp, hdc, TRUE, &r, DT_LEFT | DT_SINGLELINE | DT_NOCLIP); } - if (ppshpage->dwFlags & PSP_USEHEADERSUBTITLE) { + if (flags & PSP_USEHEADERSUBTITLE) { SelectObject(hdc, psInfo->hFont); SetRect(&r, 40, 25, rzone.right - 69, rzone.bottom); - if (!IS_INTRESOURCE(ppshpage->pszHeaderSubTitle)) - DrawTextW(hdc, ppshpage->pszHeaderSubTitle, -1, &r, DT_LEFT | DT_WORDBREAK); - else - { - nLength = LoadStringW(ppshpage->hInstance, (UINT_PTR)ppshpage->pszHeaderSubTitle, - szBuffer, 256); - if (nLength != 0) - { - DrawTextW(hdc, szBuffer, nLength, &r, DT_LEFT | DT_WORDBREAK); - } - } + HPSP_draw_text(hpsp, hdc, FALSE, &r, DT_LEFT | DT_WORDBREAK); } offsety = rzone.bottom + 2; @@ -3379,7 +3374,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) SelectObject(hdc, hOldFont); } - if ( (HPSP_get_flags(hpsp) & PSP_HIDEHEADER) && + if ( (flags & PSP_HIDEHEADER) && (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW)) && (psInfo->ppshheader.dwFlags & PSH_WATERMARK) ) {

1 0

Piotr Caban : comctl32: Add helper for setting header subtitle in HPROPSHEETPAGE.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 831950882c3b5e7c94f238cd55be25c2e256b7e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/831950882c3b5e7c94f238cd55be25… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 15:43:35 2022 +0200 comctl32: Add helper for setting header subtitle in HPROPSHEETPAGE. --- dlls/comctl32/propsheet.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 48b6625c53e..d713385eec1 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -448,6 +448,14 @@ static void HPSP_set_header_title(HPROPSHEETPAGE hpsp, const WCHAR *title) hpsp->psp.dwFlags |= PSP_USEHEADERTITLE; } +static void HPSP_set_header_subtitle(HPROPSHEETPAGE hpsp, const WCHAR *subtitle) +{ + if (!IS_INTRESOURCE(hpsp->psp.pszHeaderTitle)) + Free((void *)hpsp->psp.pszHeaderTitle); + + hpsp->psp.pszHeaderTitle = heap_strdupW(subtitle); + hpsp->psp.dwFlags |= PSP_USEHEADERSUBTITLE; +} #define add_flag(a) if (dwFlags & a) {strcat(string, #a );strcat(string," ");} /****************************************************************************** @@ -2534,20 +2542,13 @@ static void PROPSHEET_SetHeaderTitleA(HWND hwndDlg, UINT page_index, const char static void PROPSHEET_SetHeaderSubTitleW(HWND hwndDlg, UINT page_index, const WCHAR *subtitle) { PropSheetInfo *psInfo = GetPropW(hwndDlg, PropSheetInfoStr); - PROPSHEETPAGEW *page; TRACE("(%p, %u, %s)\n", hwndDlg, page_index, debugstr_w(subtitle)); if (page_index >= psInfo->nPages) return; - page = &psInfo->proppage[page_index].hpage->psp; - - if (!IS_INTRESOURCE(page->pszHeaderSubTitle)) - Free((void *)page->pszHeaderSubTitle); - - page->pszHeaderSubTitle = heap_strdupW(subtitle); - page->dwFlags |= PSP_USEHEADERSUBTITLE; + HPSP_set_header_subtitle(psInfo->proppage[page_index].hpage, subtitle); } /******************************************************************************

1 0

Piotr Caban : comctl32: Add helper for setting header title in HPROPSHEETPAGE.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 9f42a50a0d1f81bed3128fa2166e10daea760429 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f42a50a0d1f81bed3128fa2166e10… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 15:34:20 2022 +0200 comctl32: Add helper for setting header title in HPROPSHEETPAGE. --- dlls/comctl32/propsheet.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 3f004dfe294..48b6625c53e 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -439,6 +439,16 @@ static HWND HPSP_create_page(HPROPSHEETPAGE hpsp, DLGTEMPLATE *template, HWND pa return hwnd; } +static void HPSP_set_header_title(HPROPSHEETPAGE hpsp, const WCHAR *title) +{ + if (!IS_INTRESOURCE(hpsp->psp.pszHeaderTitle)) + Free((void *)hpsp->psp.pszHeaderTitle); + + hpsp->psp.pszHeaderTitle = heap_strdupW(title); + hpsp->psp.dwFlags |= PSP_USEHEADERTITLE; +} + + #define add_flag(a) if (dwFlags & a) {strcat(string, #a );strcat(string," ");} /****************************************************************************** * PROPSHEET_UnImplementedFlags @@ -2495,20 +2505,13 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) static void PROPSHEET_SetHeaderTitleW(HWND hwndDlg, UINT page_index, const WCHAR *title) { PropSheetInfo *psInfo = GetPropW(hwndDlg, PropSheetInfoStr); - PROPSHEETPAGEW *page; TRACE("(%p, %u, %s)\n", hwndDlg, page_index, debugstr_w(title)); if (page_index >= psInfo->nPages) return; - page = &psInfo->proppage[page_index].hpage->psp; - - if (!IS_INTRESOURCE(page->pszHeaderTitle)) - Free((void *)page->pszHeaderTitle); - - page->pszHeaderTitle = heap_strdupW(title); - page->dwFlags |= PSP_USEHEADERTITLE; + HPSP_set_header_title(psInfo->proppage[page_index].hpage, title); } /******************************************************************************

1 0

Piotr Caban : comctl32: Add helper for getting template from HPROPSHEETPAGE.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: e270a104239dc1ad30e660ff5f53699a01a057e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/e270a104239dc1ad30e660ff5f5369… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 14:48:23 2022 +0200 comctl32: Add helper for getting template from HPROPSHEETPAGE. --- dlls/comctl32/propsheet.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 62374a96ae9..3f004dfe294 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -416,6 +416,11 @@ static HICON HPSP_get_icon(HPROPSHEETPAGE hpsp) return ret; } +static LRESULT HPSP_get_template(HPROPSHEETPAGE hpsp) +{ + return (LRESULT)hpsp->psp.u.pszTemplate; +} + static HWND HPSP_create_page(HPROPSHEETPAGE hpsp, DLGTEMPLATE *template, HWND parent) { HWND hwnd; @@ -517,7 +522,7 @@ static INT PROPSHEET_FindPageByResId(const PropSheetInfo * psInfo, LRESULT resId for (i = 0; i < psInfo->nPages; i++) { /* Fixme: if resource ID is a string shall we use strcmp ??? */ - if (psInfo->proppage[i].hpage->psp.u.pszTemplate == (LPVOID)resId) + if (HPSP_get_template(psInfo->proppage[i].hpage) == resId) break; } @@ -2624,7 +2629,7 @@ static LRESULT PROPSHEET_IdToIndex(HWND hwndDlg, int iPageId) PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); TRACE("(%p, %d)\n", hwndDlg, iPageId); for (index = 0; index < psInfo->nPages; index++) { - if (psInfo->proppage[index].hpage->psp.u.pszTemplate == MAKEINTRESOURCEW(iPageId)) + if (HPSP_get_template(psInfo->proppage[index].hpage) == iPageId) return index; } @@ -2637,17 +2642,20 @@ static LRESULT PROPSHEET_IdToIndex(HWND hwndDlg, int iPageId) static LRESULT PROPSHEET_IndexToId(HWND hwndDlg, int iPageIndex) { PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); - LPCPROPSHEETPAGEW psp; + HPROPSHEETPAGE hpsp; + LRESULT template; + TRACE("(%p, %d)\n", hwndDlg, iPageIndex); + if (iPageIndex<0 || iPageIndex>=psInfo->nPages) { WARN("%d out of range.\n", iPageIndex); return 0; } - psp = &psInfo->proppage[iPageIndex].hpage->psp; - if (psp->dwFlags & PSP_DLGINDIRECT || !IS_INTRESOURCE(psp->u.pszTemplate)) { + hpsp = psInfo->proppage[iPageIndex].hpage; + template = HPSP_get_template(hpsp); + if (HPSP_get_flags(hpsp) & PSP_DLGINDIRECT || !IS_INTRESOURCE(template)) return 0; - } - return (LRESULT)psp->u.pszTemplate; + return template; } /******************************************************************************

1 0

Piotr Caban : comctl32: Add helper for creating page HWND from HPROPSHEETPAGE.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: a3b1a9cf6725e5afd69e4f88ae90b2b486ecb59d URL: https://gitlab.winehq.org/wine/wine/-/commit/a3b1a9cf6725e5afd69e4f88ae90b2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 12:36:53 2022 +0200 comctl32: Add helper for creating page HWND from HPROPSHEETPAGE. --- dlls/comctl32/propsheet.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index a6c1df11d63..62374a96ae9 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -416,6 +416,24 @@ static HICON HPSP_get_icon(HPROPSHEETPAGE hpsp) return ret; } +static HWND HPSP_create_page(HPROPSHEETPAGE hpsp, DLGTEMPLATE *template, HWND parent) +{ + HWND hwnd; + + if(hpsp->psp.dwFlags & PSP_INTERNAL_UNICODE) + { + hwnd = CreateDialogIndirectParamW(hpsp->psp.hInstance, template, + parent, hpsp->psp.pfnDlgProc, (LPARAM)&hpsp->psp); + } + else + { + hwnd = CreateDialogIndirectParamA(hpsp->psp.hInstance, template, + parent, hpsp->psp.pfnDlgProc, (LPARAM)&hpsp->psp); + } + + return hwnd; +} + #define add_flag(a) if (dwFlags & a) {strcat(string, #a );strcat(string," ");} /****************************************************************************** * PROPSHEET_UnImplementedFlags @@ -1429,19 +1447,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, } HPSP_call_callback(hpsp, PSPCB_CREATE); - - if(HPSP_get_flags(hpsp) & PSP_INTERNAL_UNICODE) - hwndPage = CreateDialogIndirectParamW(hpsp->psp.hInstance, - pTemplateCopy, - hwndParent, - hpsp->psp.pfnDlgProc, - (LPARAM)&hpsp->psp); - else - hwndPage = CreateDialogIndirectParamA(hpsp->psp.hInstance, - pTemplateCopy, - hwndParent, - hpsp->psp.pfnDlgProc, - (LPARAM)&hpsp->psp); + hwndPage = HPSP_create_page(hpsp, pTemplateCopy, hwndParent); /* Free a no more needed copy */ Free(pTemplateCopy);

1 0

Alex Henrie : include: Move strto[iu]max(_l) from stdlib.h to inttypes.h.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 5235526b1601e9d8461dd3f590c8ffaa2f581c10 URL: https://gitlab.winehq.org/wine/wine/-/commit/5235526b1601e9d8461dd3f590c8ff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 18 21:38:39 2022 -0600 include: Move strto[iu]max(_l) from stdlib.h to inttypes.h. Needed to compile PuTTY. --- include/msvcrt/inttypes.h | 5 +++++ include/msvcrt/stdlib.h | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/inttypes.h b/include/msvcrt/inttypes.h index dd30bc97c85..d6ad4868d05 100644 --- a/include/msvcrt/inttypes.h +++ b/include/msvcrt/inttypes.h @@ -234,6 +234,11 @@ typedef struct { #define SCNuPTR "u" #endif +_ACRTIMP __int64 __cdecl strtoimax(const char*,char**,int); +_ACRTIMP __int64 __cdecl strtoimax_l(const char*,char**,int,_locale_t); +_ACRTIMP unsigned __int64 __cdecl strtoumax(const char*,char**,int); +_ACRTIMP unsigned __int64 __cdecl strtoumax_l(const char*,char**,int,_locale_t); + #ifdef __cplusplus } #endif diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index f7acdda73cb..a6e1c7eee02 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -229,10 +229,6 @@ _ACRTIMP __msvcrt_long __cdecl strtol(const char*,char**,int); _ACRTIMP __msvcrt_ulong __cdecl strtoul(const char*,char**,int); _ACRTIMP __int64 __cdecl _strtoll_l(const char*,char**,int,_locale_t); _ACRTIMP unsigned __int64 __cdecl _strtoull_l(const char*,char**,int,_locale_t); -_ACRTIMP __int64 __cdecl strtoimax(const char*,char**,int); -_ACRTIMP __int64 __cdecl strtoimax_l(const char*,char**,int,_locale_t); -_ACRTIMP unsigned __int64 __cdecl strtoumax(const char*,char**,int); -_ACRTIMP unsigned __int64 __cdecl strtoumax_l(const char*,char**,int,_locale_t); _ACRTIMP __int64 __cdecl _strtoi64(const char*,char**,int); _ACRTIMP __int64 __cdecl _strtoi64_l(const char*,char**,int,_locale_t); _ACRTIMP unsigned __int64 __cdecl _strtoui64(const char*,char**,int);

1 0

Zebediah Figura : wined3d: Do not enforce GL map access for resources with WINED3D_RESOURCE_ACCESS_CPU.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: ebbcc10b0593948657b8e684c3a9be8ace1a5d25 URL: https://gitlab.winehq.org/wine/wine/-/commit/ebbcc10b0593948657b8e684c3a9be… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 19 13:21:32 2022 -0500 wined3d: Do not enforce GL map access for resources with WINED3D_RESOURCE_ACCESS_CPU. d3d maps of such resources will map the CPU copy, and uploads and downloads use glBufferSubData() and glGetBufferSubData() respectively. There is no need to map the BO. This improves performance of Indivisible on NVidia GPUs. The game uses a d3d9 MANAGED buffer for streaming vertex data, which results in poor performance on NVidia when using GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT. With this change we use neither. This change should only affect managed resources, i.e. those with both CPU and GPU access. We never create a BO for CPU-only resources. --- dlls/wined3d/resource.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 08edce3630c..c32c9580ae9 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -379,10 +379,13 @@ GLbitfield wined3d_resource_gl_storage_flags(const struct wined3d_resource *reso if (resource->usage & WINED3DUSAGE_DYNAMIC) flags |= GL_CLIENT_STORAGE_BIT; - if (access & WINED3D_RESOURCE_ACCESS_MAP_W) - flags |= GL_MAP_WRITE_BIT; - if (access & WINED3D_RESOURCE_ACCESS_MAP_R) - flags |= GL_MAP_READ_BIT; + if (!(access & WINED3D_RESOURCE_ACCESS_CPU)) + { + if (access & WINED3D_RESOURCE_ACCESS_MAP_W) + flags |= GL_MAP_WRITE_BIT; + if (access & WINED3D_RESOURCE_ACCESS_MAP_R) + flags |= GL_MAP_READ_BIT; + } return flags; }

1 0

Alexandre Julliard : nls: Allow specifying a locale's native digits.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 4172c0482626b56c76fd1e5e362a3711594a25e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/4172c0482626b56c76fd1e5e362a37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 12:33:39 2022 +0200 nls: Allow specifying a locale's native digits. Inspired by a patch from Nikolay Sivov. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53770 --- nls/locale.nls | Bin 738990 -> 738786 bytes tools/make_unicode | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nls/locale.nls b/nls/locale.nls index 8ee39e44222..9ad47b1872e 100644 Binary files a/nls/locale.nls and b/nls/locale.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 12076252e3d..165afe53b62 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -479,7 +479,7 @@ my @locales = { name => "ar-AE", lcid => 0x00003801, sabbrevlangname => "ARU" }, { name => "ar-BH", lcid => 0x00003c01, sabbrevlangname => "ARH" }, { name => "ar-DJ" }, - { name => "ar-DZ", lcid => 0x00001401, sabbrevlangname => "ARG" }, + { name => "ar-DZ", lcid => 0x00001401, sabbrevlangname => "ARG", nativedigits => "0123456789" }, { name => "ar-EG", lcid => 0x00000c01, sabbrevlangname => "ARE" }, { name => "ar-EH" }, { name => "ar-ER" }, @@ -489,8 +489,8 @@ my @locales = { name => "ar-KM" }, { name => "ar-KW", lcid => 0x00003401, sabbrevlangname => "ARK" }, { name => "ar-LB", lcid => 0x00003001, sabbrevlangname => "ARB" }, - { name => "ar-LY", lcid => 0x00001001, sabbrevlangname => "ARL" }, - { name => "ar-MA", lcid => 0x00001801, sabbrevlangname => "ARM" }, + { name => "ar-LY", lcid => 0x00001001, sabbrevlangname => "ARL", nativedigits => "0123456789" }, + { name => "ar-MA", lcid => 0x00001801, sabbrevlangname => "ARM", nativedigits => "0123456789" }, { name => "ar-MR" }, { name => "ar-OM", lcid => 0x00002001, sabbrevlangname => "ARO" }, { name => "ar-PS" }, @@ -501,7 +501,7 @@ my @locales = { name => "ar-SS" }, { name => "ar-SY", lcid => 0x00002801, sabbrevlangname => "ARS" }, { name => "ar-TD" }, - { name => "ar-TN", lcid => 0x00001c01, sabbrevlangname => "ART" }, + { name => "ar-TN", lcid => 0x00001c01, sabbrevlangname => "ART", nativedigits => "0123456789" }, { name => "ar-YE", lcid => 0x00002401, sabbrevlangname => "ARY" }, { name => "arn", lcid => 0x0000007a, oemcp => 850, ebcdiccp => 20284, slist => ",", dir => "seed", sabbrevlangname => "MPD", sopentypelang => "MAP" }, { name => "arn-CL", lcid => 0x0000047a, dir => "seed" }, @@ -622,7 +622,7 @@ my @locales = { name => "dsb-DE", lcid => 0x0000082e }, { name => "dua" }, { name => "dua-CM" }, - { name => "dv", lcid => 0x00000065, slist => "\x{060c}", group => 13, dir => "seed" }, + { name => "dv", lcid => 0x00000065, slist => "\x{060c}", group => 13, dir => "seed", nativedigits => "0123456789" }, { name => "dv-MV", lcid => 0x00000465, dir => "seed" }, { name => "dyo" }, { name => "dyo-SN" }, @@ -961,7 +961,7 @@ my @locales = { name => "jgo-CM" }, { name => "jmc" }, { name => "jmc-TZ" }, - { name => "jv", oemcp => 850 }, + { name => "jv", oemcp => 850, nativedigits => "0123456789" }, { name => "jv-ID", alias => "jv-Latn-ID" }, ## name => "jv-Java" }, ## name => "jv-Java-ID" }, @@ -1087,7 +1087,7 @@ my @locales = { name => "mn-Cyrl", lcid => 0x00007850, file => "mn", sabbrevlangname => "MNN" }, { name => "mn-Cyrl-MN", alias => "mn-MN" }, { name => "mn-MN", lcid => 0x00000450, sparent => "mn-Cyrl", group => 5 }, - { name => "mn-Mong", lcid => 0x00007c50, oemcp => 65001, slist => ",", group => 15, dir => "seed", sabbrevlangname => "MNG" }, + { name => "mn-Mong", lcid => 0x00007c50, oemcp => 65001, slist => ",", group => 15, dir => "seed", sabbrevlangname => "MNG", nativedigits => "0123456789" }, { name => "mn-Mong-CN", lcid => 0x00000850, dir => "seed" }, { name => "mn-Mong-MN", lcid => 0x00000c50, dir => "seed", sabbrevlangname => "MNM" }, { name => "mni", lcid => 0x00000058, slist => ",", sabbrevlangname => "ZZZ" }, @@ -1416,7 +1416,7 @@ my @locales = ## name => "tzm-Arab-MA", lcid => 0x0000045f }, ## name => "tzm-Tfng", lcid => 0x0000785f }, ## name => "tzm-Tfng-MA", lcid => 0x0000105f }, - { name => "ug", lcid => 0x00000080, oemcp => 720, slist => ",", group => 13, sopentypelang => "UYG" }, + { name => "ug", lcid => 0x00000080, oemcp => 720, slist => ",", group => 13, sopentypelang => "UYG", nativedigits => "0123456789" }, { name => "ug-Arab", alias => "ug" }, { name => "ug-Arab-CN", alias => "ug-CN" }, { name => "ug-CN", lcid => 0x00000480 }, @@ -1482,7 +1482,7 @@ my @locales = { name => "zgh-MA", alias => "zgh-Tfng-MA" }, { name => "zgh-Tfng", file => "zgh" }, { name => "zgh-Tfng-MA", file => "zgh_MA" }, - { name => "zh", lcid => 0x00007804, ireadinglayout => 2, oemcp => 936, slist => ",", sscripts => "Hani Hans", sabbrevlangname => "CHS", sopentypelang => "ZHS" }, + { name => "zh", lcid => 0x00007804, ireadinglayout => 2, oemcp => 936, slist => ",", sscripts => "Hani Hans", sabbrevlangname => "CHS", sopentypelang => "ZHS", nativedigits => "0123456789" }, { name => "zh-CN", lcid => 0x00000804, file => "zh_Hans_CN", sparent => "zh-Hans" }, { name => "zh-CN_phoneb", lcid => 0x00050804, alias => "zh-CN" }, { name => "zh-CN_stroke", lcid => 0x00020804, alias => "zh-CN" }, @@ -1490,8 +1490,8 @@ my @locales = { name => "zh-Hans-CN", alias => "zh-CN" }, { name => "zh-Hans-CN-u-co-phonebk", alias => "zh-CN_phoneb" }, { name => "zh-Hans-CN-u-co-stroke", alias => "zh-CN_stroke" }, - { name => "zh-Hans-HK", slist => ";" }, - { name => "zh-Hans-MO", slist => ";" }, + { name => "zh-Hans-HK", slist => ";", nativedigits => "" }, + { name => "zh-Hans-MO", slist => ";", nativedigits => "" }, { name => "zh-Hans-SG", alias => "zh-SG" }, { name => "zh-Hans-SG-u-co-phonebk", alias => "zh-SG_phoneb" }, { name => "zh-Hans-SG-u-co-stroke", alias => "zh-SG_stroke" }, @@ -4726,7 +4726,7 @@ sub build_locale_data() my ($icurrency, $inegcurr) = parse_currency_format( $sname, $currencyformat ); my ($ipospercent, $inegpercent) = parse_percent_format( $percentformat ); my $native_numbering = loc_query( $loc, "/ldml/numbers/otherNumberingSystems/native" ); - my @snativedigits = split //, xml_query( $numbers, "/supplementalData/numberingSystems/numberingSystem[\@id='$native_numbering']/\@digits" ); + my @snativedigits = split //, (locale_entry( $loc, "nativedigits", "" ) || xml_query( $numbers, "/supplementalData/numberingSystems/numberingSystem[\@id='$native_numbering']/\@digits" )); my $digitsubstitution = !(ord($snativedigits[0]) >= 0x600 && ord($snativedigits[0]) <= 0x6ff); my $measure = defined xml_query( $suppl, "/supplementalData/measurementData/measurementSystem[\@type='US' and $territory_match]" ); my $papersize = defined xml_query( $suppl, "/supplementalData/measurementData/paperSize[\@type='US-Letter' and $territory_match]" );

1 0

Alistair Leslie-Hughes : crypt32: Only report Unimplemented decoder when not found in external dll.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 42bd5ea4c4c4c42af872b5a6a12e6109fc3e2ddf URL: https://gitlab.winehq.org/wine/wine/-/commit/42bd5ea4c4c4c42af872b5a6a12e61… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Aug 28 12:22:30 2021 +1000 crypt32: Only report Unimplemented decoder when not found in external dll. Some applications spam this fixme. fixme:cryptasn:CRYPT_GetBuiltinDecoder Unsupported decoder for lpszStructType 1.3.6.1.4.1.311.2.1.4 This OID is supported in wintrust.dll which crypt32 uses, so this console fixme doesn't make sense. The fixme will only appear if no support for the requested decoder is available. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53800 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/crypt32/decode.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 22e15360cf3..b834c9828b6 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -6805,7 +6805,7 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodeOCSPBasicResponse; break; default: - FIXME("Unimplemented decoder for lpszStructType OID %d\n", LOWORD(lpszStructType)); + break; } } else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS)) @@ -6862,8 +6862,6 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodeCTL; else if (!strcmp(lpszStructType, szOID_ECC_PUBLIC_KEY)) decodeFunc = CRYPT_AsnDecodeObjectIdentifier; - else - FIXME("Unsupported decoder for lpszStructType %s\n", lpszStructType); return decodeFunc; } @@ -6942,6 +6940,13 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, debugstr_a(lpszStructType)); decodeFunc = CRYPT_LoadDecoderExFunc(dwCertEncodingType, lpszStructType, &hFunc); + if (!decodeFunc) + { + if (IS_INTOID(lpszStructType)) + FIXME("Unimplemented decoder for lpszStructType OID %d\n", LOWORD(lpszStructType)); + else + FIXME("Unsupported decoder for lpszStructType %s\n", lpszStructType); + } } if (decodeFunc) ret = decodeFunc(dwCertEncodingType, lpszStructType, pbEncoded,

1 0

Rémi Bernon : winex11.drv: Use session BaseNamedObjects for display_device_init mutex.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 9062314aedb940a00ce1e44317b73d6c498cafa3 URL: https://gitlab.winehq.org/wine/wine/-/commit/9062314aedb940a00ce1e44317b73d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 19 01:21:36 2022 +0200 winex11.drv: Use session BaseNamedObjects for display_device_init mutex. The mutex is also used in user32, gdi32, and winevulkan, where it is opened through kernel32, which opens it from the session directory. Note that this was also not even using the global BaseNamedObjects and was silently failing to open the mutex. --- dlls/winex11.drv/x11drv_main.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 7f9ada291a0..497e270ee8a 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -1009,14 +1009,19 @@ NTSTATUS CDECL X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDP static HANDLE get_display_device_init_mutex(void) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t'}; - UNICODE_STRING name = { sizeof(init_mutexW), sizeof(init_mutexW), (WCHAR *)init_mutexW }; + WCHAR bufferW[256]; + UNICODE_STRING name = {.Buffer = bufferW}; OBJECT_ATTRIBUTES attr; - HANDLE mutex = 0; + char buffer[256]; + HANDLE mutex; + + snprintf( buffer, ARRAY_SIZE(buffer), "\\Sessions\\%u\\BaseNamedObjects\\display_device_init", + NtCurrentTeb()->Peb->SessionId ); + name.Length = name.MaximumLength = asciiz_to_unicode( bufferW, buffer ); InitializeObjectAttributes( &attr, &name, OBJ_OPENIF, NULL, NULL ); - NtCreateMutant( &mutex, MUTEX_ALL_ACCESS, &attr, FALSE ); - if (mutex) NtWaitForSingleObject( mutex, FALSE, NULL ); + if (NtCreateMutant( &mutex, MUTEX_ALL_ACCESS, &attr, FALSE ) < 0) return 0; + NtWaitForSingleObject( mutex, FALSE, NULL ); return mutex; }

1 0

Rémi Bernon : win32u: Use session BaseNamedObjects for display_device_init mutex.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 94ece19f8ec005d1bb4e960a18bd70654eccb325 URL: https://gitlab.winehq.org/wine/wine/-/commit/94ece19f8ec005d1bb4e960a18bd70… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 19 01:19:42 2022 +0200 win32u: Use session BaseNamedObjects for display_device_init mutex. The mutex is also used in user32, gdi32, and winevulkan, where it is opened through kernel32, which opens it from the session directory. --- dlls/win32u/sysparams.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 6b5a6f65aef..498ed386386 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -406,14 +406,16 @@ void user_check_not_lock(void) static HANDLE get_display_device_init_mutex( void ) { - static const WCHAR display_device_initW[] = - {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s', - '\\','d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t'}; - UNICODE_STRING name = { sizeof(display_device_initW), sizeof(display_device_initW), - (WCHAR *)display_device_initW }; + WCHAR bufferW[256]; + UNICODE_STRING name = {.Buffer = bufferW}; OBJECT_ATTRIBUTES attr; + char buffer[256]; HANDLE mutex; + snprintf( buffer, ARRAY_SIZE(buffer), "\\Sessions\\%u\\BaseNamedObjects\\display_device_init", + NtCurrentTeb()->Peb->SessionId ); + name.Length = name.MaximumLength = asciiz_to_unicode( bufferW, buffer ); + InitializeObjectAttributes( &attr, &name, OBJ_OPENIF, NULL, NULL ); if (NtCreateMutant( &mutex, MUTEX_ALL_ACCESS, &attr, FALSE ) < 0) return 0; NtWaitForSingleObject( mutex, FALSE, NULL );

1 0

Gabriel Ivăncescu : mshtml: Move the OleObj interfaces out of basedoc.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: da4a45cdaf59c6a5dc5ce691bb469bea66f9a135 URL: https://gitlab.winehq.org/wine/wine/-/commit/da4a45cdaf59c6a5dc5ce691bb469b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 17 21:20:03 2022 +0300 mshtml: Move the OleObj interfaces out of basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/editor.c | 4 +- dlls/mshtml/htmldoc.c | 68 +- dlls/mshtml/mshtml_private.h | 28 +- dlls/mshtml/oleobj.c | 1424 ++++++++++++++++++++++++++++++------------ dlls/mshtml/persist.c | 6 +- dlls/mshtml/pluginhost.c | 2 +- dlls/mshtml/view.c | 9 +- 7 files changed, 1105 insertions(+), 436 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Move the IOleCommandTarget interface out of basedoc.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 6c706e02aeb6a2233a7b0b5c7af253e88e893b0a URL: https://gitlab.winehq.org/wine/wine/-/commit/6c706e02aeb6a2233a7b0b5c7af253… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 17 21:20:02 2022 +0300 mshtml: Move the IOleCommandTarget interface out of basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/editor.c | 2 +- dlls/mshtml/htmldoc.c | 11 ++-- dlls/mshtml/mshtml_private.h | 6 ++- dlls/mshtml/olecmd.c | 126 +++++++++++++++++++++++++++++++------------ dlls/mshtml/view.c | 2 +- 5 files changed, 105 insertions(+), 42 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Move the Persist interfaces out of basedoc.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 07bf1d73046099e099074067a4da6397f88917e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/07bf1d73046099e099074067a4da63… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 17 21:20:02 2022 +0300 mshtml: Move the Persist interfaces out of basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/editor.c | 2 +- dlls/mshtml/htmldoc.c | 45 ++- dlls/mshtml/mshtml_private.h | 21 +- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/persist.c | 928 +++++++++++++++++++++++++++++++------------ 6 files changed, 726 insertions(+), 274 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Move the IServiceProvider interface out of basedoc.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: ac56d24e36c844d40b8179ebec51f070cdb6544e URL: https://gitlab.winehq.org/wine/wine/-/commit/ac56d24e36c844d40b8179ebec51f0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 17 21:20:02 2022 +0300 mshtml: Move the IServiceProvider interface out of basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 9 ++-- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 6 ++- dlls/mshtml/service.c | 112 ++++++++++++++++++++++++++++++------------- 4 files changed, 91 insertions(+), 38 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Move the ConnectionPointContainer out of basedoc.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 5e062a994858513a087fde0111320fbcb77a4177 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e062a994858513a087fde0111320f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 17 21:20:02 2022 +0300 mshtml: Move the ConnectionPointContainer out of basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 64 +++++++++++++++++++++++++++++--------------- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 4 +-- dlls/mshtml/mutation.c | 2 +- dlls/mshtml/persist.c | 2 +- 5 files changed, 48 insertions(+), 26 deletions(-)

1 0

Gabriel Ivăncescu : netprofm: Handle non-internet connectivity.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 01fb4b5e7a1823233fc28648eaaeb3647323ddbf URL: https://gitlab.winehq.org/wine/wine/-/commit/01fb4b5e7a1823233fc28648eaaeb3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 18 19:40:05 2022 +0300 netprofm: Handle non-internet connectivity. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/netprofm/list.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 254cf60c263..e22609dcaf6 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -480,9 +480,17 @@ static HRESULT WINAPI network_GetConnectivity( INetwork *iface, NLM_CONNECTIVITY *pConnectivity ) { + struct network *network = impl_from_INetwork( iface ); + FIXME( "%p, %p\n", iface, pConnectivity ); - *pConnectivity = NLM_CONNECTIVITY_IPV4_INTERNET; + *pConnectivity = NLM_CONNECTIVITY_DISCONNECTED; + + if (network->connected_to_internet) + *pConnectivity |= NLM_CONNECTIVITY_IPV4_INTERNET; + else if (network->connected) + *pConnectivity |= NLM_CONNECTIVITY_IPV4_LOCALNETWORK; + return S_OK; } @@ -1330,9 +1338,21 @@ static HRESULT WINAPI list_manager_GetConnectivity( INetworkListManager *iface, NLM_CONNECTIVITY *pConnectivity ) { + struct list_manager *mgr = impl_from_INetworkListManager( iface ); + struct network *network; + FIXME( "%p, %p\n", iface, pConnectivity ); - *pConnectivity = NLM_CONNECTIVITY_IPV4_INTERNET; + *pConnectivity = NLM_CONNECTIVITY_DISCONNECTED; + + LIST_FOR_EACH_ENTRY( network, &mgr->networks, struct network, entry ) + { + if (network->connected_to_internet) + *pConnectivity |= NLM_CONNECTIVITY_IPV4_INTERNET; + else if (network->connected) + *pConnectivity |= NLM_CONNECTIVITY_IPV4_LOCALNETWORK; + } + return S_OK; } @@ -1565,9 +1585,17 @@ static HRESULT WINAPI connection_GetConnectivity( INetworkConnection *iface, NLM_CONNECTIVITY *pConnectivity ) { + struct connection *connection = impl_from_INetworkConnection( iface ); + FIXME( "%p, %p\n", iface, pConnectivity ); - *pConnectivity = NLM_CONNECTIVITY_IPV4_INTERNET; + *pConnectivity = NLM_CONNECTIVITY_DISCONNECTED; + + if (connection->connected_to_internet) + *pConnectivity |= NLM_CONNECTIVITY_IPV4_INTERNET; + else if (connection->connected) + *pConnectivity |= NLM_CONNECTIVITY_IPV4_LOCALNETWORK; + return S_OK; }

1 0

Gabriel Ivăncescu : wininet: Handle offline state in InternetGetConnectedStateExW.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: wine Branch: master Commit: 0ad36ed3e7d2c6955e76fb3a7fab1c1946a9f2ac URL: https://gitlab.winehq.org/wine/wine/-/commit/0ad36ed3e7d2c6955e76fb3a7fab1c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 18 19:40:05 2022 +0300 wininet: Handle offline state in InternetGetConnectedStateExW. Some applications (e.g. Deus Ex Human Revolution: Director's Cut) use the output from this function to determine whether they should connect. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/wininet/internet.c | 59 +++++++++++++++++++++++++++++++++++++++---- dlls/wininet/tests/internet.c | 9 +++++-- 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 120cc9af4cc..292fd44dd8e 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1206,24 +1206,73 @@ BOOL WINAPI InternetGetConnectedState(LPDWORD lpdwStatus, DWORD dwReserved) BOOL WINAPI InternetGetConnectedStateExW(LPDWORD lpdwStatus, LPWSTR lpszConnectionName, DWORD dwNameLen, DWORD dwReserved) { + IP_ADAPTER_ADDRESSES *buf = NULL, *aa; + ULONG size = 0; + DWORD status; + TRACE("(%p, %p, %ld, 0x%08lx)\n", lpdwStatus, lpszConnectionName, dwNameLen, dwReserved); /* Must be zero */ if(dwReserved) return FALSE; - if (lpdwStatus) { - WARN("always returning LAN connection and RAS installed.\n"); - *lpdwStatus = INTERNET_CONNECTION_LAN | INTERNET_RAS_INSTALLED; + for (;;) + { + ULONG flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER | + GAA_FLAG_SKIP_FRIENDLY_NAME | GAA_FLAG_INCLUDE_ALL_GATEWAYS; + ULONG errcode = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, buf, &size); + + if (errcode == ERROR_SUCCESS) + break; + heap_free(buf); + if (errcode == ERROR_BUFFER_OVERFLOW && !(buf = heap_alloc(size))) + errcode = ERROR_NOT_ENOUGH_MEMORY; + if (errcode != ERROR_BUFFER_OVERFLOW) + { + if (errcode != ERROR_NO_DATA) + { + SetLastError(errcode); + return FALSE; + } + buf = NULL; + break; + } + } + + status = INTERNET_RAS_INSTALLED; + for (aa = buf; aa; aa = aa->Next) + { + /* Connected, but not necessarily to internet */ + if (aa->FirstUnicastAddress) + status |= INTERNET_CONNECTION_OFFLINE; + + /* Connected to internet */ + if (aa->FirstGatewayAddress) + { + WARN("always returning LAN connection.\n"); + status &= ~INTERNET_CONNECTION_OFFLINE; + status |= INTERNET_CONNECTION_LAN; + break; + } } + heap_free(buf); + + if (lpdwStatus) *lpdwStatus = status; /* When the buffer size is zero LoadStringW fills the buffer with a pointer to * the resource, avoid it as we must not change the buffer in this case */ - if(lpszConnectionName && dwNameLen) { + if (lpszConnectionName && dwNameLen) + { *lpszConnectionName = '\0'; - LoadStringW(WININET_hModule, IDS_LANCONNECTION, lpszConnectionName, dwNameLen); + if (status & INTERNET_CONNECTION_LAN) + LoadStringW(WININET_hModule, IDS_LANCONNECTION, lpszConnectionName, dwNameLen); } + if (!(status & (INTERNET_CONNECTION_LAN | INTERNET_CONNECTION_MODEM | INTERNET_CONNECTION_PROXY))) + { + SetLastError(ERROR_SUCCESS); + return FALSE; + } return TRUE; } diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 97bd36f9427..0d58a12558e 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1730,12 +1730,17 @@ static void test_InternetGetConnectedStateExW(void) } flags = 0; - buffer[0] = 0; + wcscpy(buffer, L"wine"); + SetLastError(0xdeadbeef); res = pInternetGetConnectedStateExW(&flags, buffer, ARRAY_SIZE(buffer), 0); trace("Internet Connection: Flags 0x%02lx - Name '%s'\n", flags, wine_dbgstr_w(buffer)); ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n"); if(!res) { - win_skip("InternetGetConnectedStateExW tests require a valid connection\n"); + DWORD error = GetLastError(); + ok(error == ERROR_SUCCESS, "Last error = %#lx\n", error); + ok(!buffer[0], "Expected empty connection name, got %s\n", wine_dbgstr_w(buffer)); + + skip("InternetGetConnectedStateExW tests require a valid connection\n"); return; }

1 0

Giovanni Mascellani : tests: Test float operations with uniform inputs.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: c644244bcd410d94c322f79e23173ee7f7b79ab9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c644244bcd410d94c322f79e23173… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 14 15:45:04 2022 +0200 tests: Test float operations with uniform inputs. The point of the "uniform" variants is to avoid hiding code generation bugs because of the constant folding optimization. --- Makefile.am | 1 + tests/arithmetic-float-uniform.shader_test | 78 ++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/Makefile.am b/Makefile.am index b9068728..5a5a01c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,6 +53,7 @@ vkd3d_cross_tests = \ vkd3d_shader_tests = \ tests/abs.shader_test \ tests/arithmetic-float.shader_test \ + tests/arithmetic-float-uniform.shader_test \ tests/arithmetic-int.shader_test \ tests/arithmetic-int-uniform.shader_test \ tests/arithmetic-uint.shader_test \ diff --git a/tests/arithmetic-float-uniform.shader_test b/tests/arithmetic-float-uniform.shader_test new file mode 100644 index 00000000..708dc270 --- /dev/null +++ b/tests/arithmetic-float-uniform.shader_test @@ -0,0 +1,78 @@ +[pixel shader] +uniform float2 a; + +float4 main() : SV_TARGET +{ + float x = a.x; + float y = a.y; + return float4(x + y, x - y, x * y, x / y); +} + +[test] +uniform 0 float4 5.0 15.0 0.0 0.0 +draw quad +probe all rgba (20.0, -10.0, 75.0, 0.33333333) 1 + +[pixel shader] +uniform float2 a; + +float4 main() : SV_TARGET +{ + float x = a.x; + float y = a.y; + return float4(x % y, +x, -x, y / x); +} + +[test] +uniform 0 float4 5.0 15.0 0.0 0.0 +draw quad +probe all rgba (5.0, 5.0, -5.0, 3.0) 1 + +[pixel shader] +uniform float2 a; + +float4 main() : SV_TARGET +{ + float x = a.x; + float y = a.y; + return float4(x % y, -x % y, x % -y, -x % -y); +} + +[test] +uniform 0 float4 42.0 5.0 0.0 0.0 +draw quad +probe all rgba (2.0, -2.0, 2.0, -2.0) 16 + +[pixel shader] +uniform float2 a; + +float4 main() : SV_TARGET +{ + float x = a.x; + float y = a.y; + return float4(x % y, -x % y, x % -y, -x % -y); +} + +[test] +uniform 0 float4 45.0 5.0 0.0 0.0 +draw quad +probe all rgba (0.0, 0.0, 0.0, 0.0) + +[require] +% Infinities are not allowed in SM1 +shader model >= 4.0 + +[pixel shader] +uniform float2 a; + +float4 main() : SV_TARGET +{ + float x = a.x; + float y = a.y; + return x / y; +} + +[test] +uniform 0 float4 1.0 0.0 0.0 0.0 +draw quad +probe all rgba (1e99, 1e99, 1e99, 1e99)

1 0

Giovanni Mascellani : tests: Test sign rules for float modulus.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: b6a6a927a73c63a8cfa5362eb60753d9e66a462d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b6a6a927a73c63a8cfa5362eb6075… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 14 15:35:39 2022 +0200 tests: Test sign rules for float modulus. --- tests/arithmetic-float.shader_test | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/arithmetic-float.shader_test b/tests/arithmetic-float.shader_test index 36838d95..558d5d10 100644 --- a/tests/arithmetic-float.shader_test +++ b/tests/arithmetic-float.shader_test @@ -24,6 +24,32 @@ float4 main() : SV_TARGET draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 42; + float y = 5; + + return float4(x % y, -x % y, x % -y, -x % -y); +} + +[test] +draw quad +probe all rgba (2.0, -2.0, 2.0, -2.0) 16 + +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 45; + float y = 5; + + return float4(x % y, -x % y, x % -y, -x % -y); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 0.0) + [require] % Infinities are not allowed in SM1 shader model >= 4.0

1 0

Giovanni Mascellani : tests: Test sign rules for integer division and modulus.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: d1da5436f4535a46a7936f823b57a4d4e831a7ef URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d1da5436f4535a46a7936f823b57a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 14 15:10:13 2022 +0200 tests: Test sign rules for integer division and modulus. --- tests/arithmetic-int-uniform.shader_test | 60 ++++++++++++++++++++++++++++++++ tests/arithmetic-int.shader_test | 52 +++++++++++++++++++++++++++ 2 files changed, 112 insertions(+) diff --git a/tests/arithmetic-int-uniform.shader_test b/tests/arithmetic-int-uniform.shader_test index cac2a234..bd35f566 100644 --- a/tests/arithmetic-int-uniform.shader_test +++ b/tests/arithmetic-int-uniform.shader_test @@ -28,6 +28,66 @@ uniform 0 float4 5.0 16.0 0.0 0.0 draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) +[pixel shader] +uniform float2 a; + +float4 main() : SV_TARGET +{ + int x = a.x; + int y = a.y; + return float4(x / y, -x / y, x / -y, -x / -y); +} + +[test] +uniform 0 float4 42.0 5.0 0.0 0.0 +draw quad +probe all rgba (8.0, -8.0, -8.0, 8.0) + +[pixel shader] +uniform float2 a; + +float4 main() : SV_TARGET +{ + int x = a.x; + int y = a.y; + return float4(x % y, -x % y, x % -y, -x % -y); +} + +[test] +uniform 0 float4 42.0 5.0 0.0 0.0 +draw quad +probe all rgba (2.0, -2.0, 2.0, -2.0) + +[pixel shader] +uniform float2 a; + +float4 main() : SV_TARGET +{ + int x = a.x; + int y = a.y; + return float4(x / y, -x / y, x / -y, -x / -y); +} + +[test] +uniform 0 float4 45.0 5.0 0.0 0.0 +draw quad +probe all rgba (9.0, -9.0, -9.0, 9.0) + +[pixel shader] +uniform float2 a; + +float4 main() : SV_TARGET +{ + int x = a.x; + int y = a.y; + return float4(x % y, -x % y, x % -y, -x % -y); +} + +[test] +uniform 0 float4 45.0 5.0 0.0 0.0 +draw quad +probe all rgba (0.0, 0.0, 0.0, 0.0) + [pixel shader] uniform float4 a; diff --git a/tests/arithmetic-int.shader_test b/tests/arithmetic-int.shader_test index 8b6d6d7c..f4c98904 100644 --- a/tests/arithmetic-int.shader_test +++ b/tests/arithmetic-int.shader_test @@ -24,6 +24,58 @@ float4 main() : SV_TARGET draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 42; + int y = 5; + + return float4(x / y, -x / y, x / -y, -x / -y); +} + +[test] +draw quad +probe all rgba (8.0, -8.0, -8.0, 8.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 42; + int y = 5; + + return float4(x % y, -x % y, x % -y, -x % -y); +} + +[test] +draw quad +probe all rgba (2.0, -2.0, 2.0, -2.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 45; + int y = 5; + + return float4(x / y, -x / y, x / -y, -x / -y); +} + +[test] +draw quad +probe all rgba (9.0, -9.0, -9.0, 9.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 45; + int y = 5; + + return float4(x % y, -x % y, x % -y, -x % -y); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 0.0) + [pixel shader fail] float4 main() : SV_TARGET {

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Lower float modulus.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: 0a07ac6f88a8787e265644f20de455585e195783 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0a07ac6f88a8787e265644f20de45… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jun 14 14:32:22 2022 +0200 vkd3d-shader/hlsl: Lower float modulus. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 70 ++++++++++++++++++++++++++++++++++++++ tests/arithmetic-float.shader_test | 2 +- 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 18e35736..aacaa95c 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1485,6 +1485,75 @@ static bool lower_int_abs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void return true; } +static bool lower_float_modulus(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_node *arg1, *arg2, *mul1, *neg1, *ge, *neg2, *div, *mul2, *frc; + struct hlsl_type *type = instr->data_type, *btype; + struct hlsl_ir_constant *one; + struct hlsl_ir_load *cond; + struct hlsl_ir_expr *expr; + unsigned int i; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + arg1 = expr->operands[0].node; + arg2 = expr->operands[1].node; + if (expr->op != HLSL_OP2_MOD) + return false; + if (type->type != HLSL_CLASS_SCALAR && type->type != HLSL_CLASS_VECTOR) + return false; + if (type->base_type != HLSL_TYPE_FLOAT) + return false; + btype = hlsl_get_numeric_type(ctx, type->type, HLSL_TYPE_BOOL, type->dimx, type->dimy); + + if (!(mul1 = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, arg2, arg1))) + return false; + list_add_before(&instr->entry, &mul1->entry); + + if (!(neg1 = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, mul1, instr->loc))) + return false; + list_add_before(&instr->entry, &neg1->entry); + + if (!(ge = hlsl_new_binary_expr(ctx, HLSL_OP2_GEQUAL, mul1, neg1))) + return false; + ge->data_type = btype; + list_add_before(&instr->entry, &ge->entry); + + if (!(neg2 = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, arg2, instr->loc))) + return false; + list_add_before(&instr->entry, &neg2->entry); + + if (!(cond = add_conditional(ctx, &instr->entry, ge, arg2, neg2))) + return false; + + if (!(one = hlsl_new_constant(ctx, type, &instr->loc))) + return false; + for (i = 0; i < type->dimx; ++i) + one->value[i].f = 1.0f; + list_add_before(&instr->entry, &one->node.entry); + + if (!(div = hlsl_new_binary_expr(ctx, HLSL_OP2_DIV, &one->node, &cond->node))) + return false; + list_add_before(&instr->entry, &div->entry); + + if (!(mul2 = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, div, arg1))) + return false; + list_add_before(&instr->entry, &mul2->entry); + + if (!(frc = hlsl_new_unary_expr(ctx, HLSL_OP1_FRACT, mul2, instr->loc))) + return false; + list_add_before(&instr->entry, &frc->entry); + + expr->op = HLSL_OP2_MUL; + hlsl_src_remove(&expr->operands[0]); + hlsl_src_remove(&expr->operands[1]); + hlsl_src_from_node(&expr->operands[0], frc); + hlsl_src_from_node(&expr->operands[1], &cond->node); + + return true; +} + static bool dce(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { switch (instr->type) @@ -2472,6 +2541,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry transform_ir(ctx, lower_int_division, body, NULL); transform_ir(ctx, lower_int_modulus, body, NULL); transform_ir(ctx, lower_int_abs, body, NULL); + transform_ir(ctx, lower_float_modulus, body, NULL); do { progress = transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); diff --git a/tests/arithmetic-float.shader_test b/tests/arithmetic-float.shader_test index 6824c3f1..36838d95 100644 --- a/tests/arithmetic-float.shader_test +++ b/tests/arithmetic-float.shader_test @@ -21,7 +21,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) [require]

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Lower int modulus.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: eb119878f78317e2cbb4c71acfde0246c9ad76e8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eb119878f78317e2cbb4c71acfde0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 22 10:27:07 2021 +0200 vkd3d-shader/hlsl: Lower int modulus. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 69 ++++++++++++++++++++++++++++++++ tests/arithmetic-int-uniform.shader_test | 2 +- 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 656e2e93..18e35736 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1388,6 +1388,74 @@ static bool lower_int_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, return true; } +static bool lower_int_modulus(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_node *arg1, *arg2, *and, *abs1, *abs2, *div, *neg; + struct hlsl_type *type = instr->data_type, *utype; + struct hlsl_ir_expr *cast1, *cast2, *cast3; + struct hlsl_ir_constant *high_bit; + struct hlsl_ir_expr *expr; + struct hlsl_ir_load *cond; + unsigned int i; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + arg1 = expr->operands[0].node; + arg2 = expr->operands[1].node; + if (expr->op != HLSL_OP2_MOD) + return false; + if (type->type != HLSL_CLASS_SCALAR && type->type != HLSL_CLASS_VECTOR) + return false; + if (type->base_type != HLSL_TYPE_INT) + return false; + utype = hlsl_get_numeric_type(ctx, type->type, HLSL_TYPE_UINT, type->dimx, type->dimy); + + if (!(high_bit = hlsl_new_constant(ctx, type, &instr->loc))) + return false; + for (i = 0; i < type->dimx; ++i) + high_bit->value[i].u = 0x80000000; + list_add_before(&instr->entry, &high_bit->node.entry); + + if (!(and = hlsl_new_binary_expr(ctx, HLSL_OP2_BIT_AND, arg1, &high_bit->node))) + return false; + list_add_before(&instr->entry, &and->entry); + + if (!(abs1 = hlsl_new_unary_expr(ctx, HLSL_OP1_ABS, arg1, instr->loc))) + return false; + list_add_before(&instr->entry, &abs1->entry); + + if (!(cast1 = hlsl_new_cast(ctx, abs1, utype, &instr->loc))) + return false; + list_add_before(&instr->entry, &cast1->node.entry); + + if (!(abs2 = hlsl_new_unary_expr(ctx, HLSL_OP1_ABS, arg2, instr->loc))) + return false; + list_add_before(&instr->entry, &abs2->entry); + + if (!(cast2 = hlsl_new_cast(ctx, abs2, utype, &instr->loc))) + return false; + list_add_before(&instr->entry, &cast2->node.entry); + + if (!(div = hlsl_new_binary_expr(ctx, HLSL_OP2_MOD, &cast1->node, &cast2->node))) + return false; + list_add_before(&instr->entry, &div->entry); + + if (!(cast3 = hlsl_new_cast(ctx, div, type, &instr->loc))) + return false; + list_add_before(&instr->entry, &cast3->node.entry); + + if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, &cast3->node, instr->loc))) + return false; + list_add_before(&instr->entry, &neg->entry); + + if (!(cond = add_conditional(ctx, &instr->entry, and, neg, &cast3->node))) + return false; + hlsl_replace_node(instr, &cond->node); + + return true; +} + static bool lower_int_abs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_type *type = instr->data_type; @@ -2402,6 +2470,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry transform_ir(ctx, lower_narrowing_casts, body, NULL); transform_ir(ctx, lower_casts_to_bool, body, NULL); transform_ir(ctx, lower_int_division, body, NULL); + transform_ir(ctx, lower_int_modulus, body, NULL); transform_ir(ctx, lower_int_abs, body, NULL); do { diff --git a/tests/arithmetic-int-uniform.shader_test b/tests/arithmetic-int-uniform.shader_test index 3190be00..cac2a234 100644 --- a/tests/arithmetic-int-uniform.shader_test +++ b/tests/arithmetic-int-uniform.shader_test @@ -25,7 +25,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 16.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) [pixel shader]

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 fractional part instructions.
by Alexandre Julliard 19 Oct '22

19 Oct '22

Module: vkd3d Branch: master Commit: 85856473f645a2499c2bf65d02c9efedf0e9598d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/85856473f645a2499c2bf65d02c9e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 10 11:34:47 2022 +0200 vkd3d-shader/hlsl: Write SM4 fractional part instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index aa89b6a0..4118ce88 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1637,6 +1637,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_unary_op(buffer, VKD3D_SM4_OP_ROUND_NI, &expr->node, arg1, 0); break; + case HLSL_OP1_FRACT: + assert(type_is_float(dst_type)); + write_sm4_unary_op(buffer, VKD3D_SM4_OP_FRC, &expr->node, arg1, 0); + break; + case HLSL_OP1_LOG2: assert(type_is_float(dst_type)); write_sm4_unary_op(buffer, VKD3D_SM4_OP_LOG, &expr->node, arg1, 0);

1 0

Piotr Caban : comctl32: Add helper for getting icon from HPROPSHEETPAGE.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: wine Branch: master Commit: 6c161f33591ba81287c302c6afc19ce30093f3d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6c161f33591ba81287c302c6afc19c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 11:46:17 2022 +0200 comctl32: Add helper for getting icon from HPROPSHEETPAGE. --- dlls/comctl32/propsheet.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 2429e28cb0b..a6c1df11d63 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -396,6 +396,26 @@ static WCHAR* HPSP_get_title(HPROPSHEETPAGE hpsp, const WCHAR *template_title) return heap_strdupW(pTitle); } +static HICON HPSP_get_icon(HPROPSHEETPAGE hpsp) +{ + HICON ret; + + if (hpsp->psp.dwFlags & PSP_USEICONID) + { + int cx = GetSystemMetrics(SM_CXSMICON); + int cy = GetSystemMetrics(SM_CYSMICON); + + ret = LoadImageW(hpsp->psp.hInstance, hpsp->psp.u2.pszIcon, IMAGE_ICON, + cx, cy, LR_DEFAULTCOLOR); + } + else + { + ret = hpsp->psp.u2.hIcon; + } + + return ret; +} + #define add_flag(a) if (dwFlags & a) {strcat(string, #a );strcat(string," ");} /****************************************************************************** * PROPSHEET_UnImplementedFlags @@ -734,13 +754,7 @@ static BOOL PROPSHEET_CollectPageInfo(HPROPSHEETPAGE hpsp, int icon_cx = GetSystemMetrics(SM_CXSMICON); int icon_cy = GetSystemMetrics(SM_CYSMICON); - if (dwFlags & PSP_USEICONID) - hIcon = LoadImageW(hpsp->psp.hInstance, hpsp->psp.u2.pszIcon, IMAGE_ICON, - icon_cx, icon_cy, LR_DEFAULTCOLOR); - else - hIcon = hpsp->psp.u2.hIcon; - - if ( hIcon ) + if ((hIcon = HPSP_get_icon(hpsp))) { if (psInfo->hImageList == 0 ) psInfo->hImageList = ImageList_Create(icon_cx, icon_cy, ILC_COLOR, 1, 1);

1 0

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 October 2022