wine-devel January 2022

wine-devel@winehq.org

86 participants
717 discussions

[PATCH 3/5] wined3d: Use wined3d_bit_scan() in draw_primitive_immediate_mode().
by Henri Verbeet 27 Jan '22

27 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index eed27dd445d..29794fe0f35 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4708,7 +4708,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, * them is printed after decoding the vertex declaration. */ for (vertex_idx = 0; vertex_idx < vertex_count; ++vertex_idx) { - unsigned int tmp_tex_mask; + uint32_t tmp_tex_mask; stride_idx = get_stride_idx(idx_data, idx_size, base_vertex_idx, start_idx, vertex_idx); @@ -4747,11 +4747,9 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, } tmp_tex_mask = tex_mask; - for (texture_idx = 0; tmp_tex_mask; tmp_tex_mask >>= 1, ++texture_idx) + while (tmp_tex_mask) { - if (!(tmp_tex_mask & 1)) - continue; - + texture_idx = wined3d_bit_scan(&tmp_tex_mask); coord_idx = state->texture_states[texture_idx][WINED3D_TSS_TEXCOORD_INDEX]; ptr = tex_coords[coord_idx] + (stride_idx * si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].stride); ops->texcoord[si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].format->emit_idx]( -- 2.30.2

1 0

[PATCH 2/5] wined3d: Use wined3d_bit_scan() in context_preload_textures().
by Henri Verbeet 27 Jan '22

27 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6aa5ae4e997..1dc691c46a0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -390,12 +390,12 @@ void context_preload_textures(struct wined3d_context *context, const struct wine } else { - WORD ffu_map = context->fixed_function_usage_map; + uint32_t ffu_map = context->fixed_function_usage_map; - for (i = 0; ffu_map; ffu_map >>= 1, ++i) + while (ffu_map) { - if (ffu_map & 1) - context_preload_texture(context, state, i); + i = wined3d_bit_scan(&ffu_map); + context_preload_texture(context, state, i); } } } -- 2.30.2

1 0

[PATCH 1/5] wined3d: Get rid of a superfluous cast.
by Henri Verbeet 27 Jan '22

27 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9fd2ed67dcc..eed27dd445d 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2706,7 +2706,7 @@ static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_ map: if (bo->b.map_ptr) - return (uint8_t *)bo->b.map_ptr; + return bo->b.map_ptr; gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); -- 2.30.2

1 0

[PATCH 2/2] winecoreaudio: Remove unnecessary buffer sizes.
by Huw Davies 27 Jan '22

27 Jan '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index a2bbc3e45c9..f242ebe54a8 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -92,7 +92,6 @@ struct coreaudio_stream INT32 getbuf_last; WAVEFORMATEX *fmt; BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; - SIZE_T local_buffer_size, tmp_buffer_size; }; static HRESULT osstatus_to_hresult(OSStatus sc) @@ -617,6 +616,7 @@ static NTSTATUS create_stream(void *args) struct coreaudio_stream *stream = calloc(1, sizeof(*stream)); AURenderCallbackStruct input; OSStatus sc; + SIZE_T size; if(!stream){ params->result = E_OUTOFMEMORY; @@ -679,8 +679,8 @@ static NTSTATUS create_stream(void *args) goto end; } - stream->local_buffer_size = stream->bufsize_frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &stream->local_buffer_size, + size = stream->bufsize_frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto end; @@ -1337,6 +1337,7 @@ static NTSTATUS get_render_buffer(void *args) { struct get_render_buffer_params *params = args; struct coreaudio_stream *stream = params->stream; + SIZE_T size; UINT32 pad; OSSpinLockLock(&stream->lock); @@ -1359,14 +1360,14 @@ static NTSTATUS get_render_buffer(void *args) if(stream->wri_offs_frames + params->frames > stream->bufsize_frames){ if(stream->tmp_buffer_frames < params->frames){ if(stream->tmp_buffer){ - SIZE_T size = 0; + size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); stream->tmp_buffer = NULL; } - stream->tmp_buffer_size = params->frames * stream->fmt->nBlockAlign; + size = params->frames * stream->fmt->nBlockAlign; if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, - &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){ + &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; params->result = E_OUTOFMEMORY; goto end; @@ -1439,6 +1440,7 @@ static NTSTATUS get_capture_buffer(void *args) struct coreaudio_stream *stream = params->stream; UINT32 chunk_bytes, chunk_frames; LARGE_INTEGER stamp, freq; + SIZE_T size; OSSpinLockLock(&stream->lock); @@ -1461,9 +1463,9 @@ static NTSTATUS get_capture_buffer(void *args) if(chunk_frames < stream->period_frames){ chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; if(!stream->tmp_buffer){ - stream->tmp_buffer_size = stream->period_frames * stream->fmt->nBlockAlign; + size = stream->period_frames * stream->fmt->nBlockAlign; NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, - &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE); + &size, MEM_COMMIT, PAGE_READWRITE); } *params->data = stream->tmp_buffer; memcpy(*params->data, stream->local_buffer + stream->lcl_offs_frames * stream->fmt->nBlockAlign, -- 2.23.0

2 1

[PATCH 1/2] winepulse: Remove unnecessary alloc_size.
by Huw Davies 27 Jan '22

27 Jan '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winepulse.drv/pulse.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index f32f2a3d26c..3e65936a18f 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -59,7 +59,7 @@ struct pulse_stream INT32 locked; BOOL started; - SIZE_T bufsize_frames, alloc_size, real_bufsize_bytes, period_bytes; + SIZE_T bufsize_frames, real_bufsize_bytes, period_bytes; SIZE_T peek_ofs, read_offs_bytes, lcl_offs_bytes, pa_offs_bytes; SIZE_T tmp_buffer_bytes, held_bytes, peek_len, peek_buffer_len, pa_held_bytes; BYTE *local_buffer, *tmp_buffer, *peek_buffer; @@ -868,14 +868,16 @@ static NTSTATUS pulse_create_stream(void *args) if (SUCCEEDED(hr)) { UINT32 unalign; const pa_buffer_attr *attr = pa_stream_get_buffer_attr(stream->stream); + SIZE_T size; + stream->attr = *attr; /* Update frames according to new size */ dump_attr(attr); if (stream->dataflow == eRender) { - stream->alloc_size = stream->real_bufsize_bytes = + size = stream->real_bufsize_bytes = stream->bufsize_frames * 2 * pa_frame_size(&stream->ss); if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, - 0, &stream->alloc_size, MEM_COMMIT, PAGE_READWRITE)) + 0, &size, MEM_COMMIT, PAGE_READWRITE)) hr = E_OUTOFMEMORY; } else { UINT32 i, capture_packets; @@ -887,9 +889,9 @@ static NTSTATUS pulse_create_stream(void *args) capture_packets = stream->real_bufsize_bytes / stream->period_bytes; - stream->alloc_size = stream->real_bufsize_bytes + capture_packets * sizeof(ACPacket); + size = stream->real_bufsize_bytes + capture_packets * sizeof(ACPacket); if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, - 0, &stream->alloc_size, MEM_COMMIT, PAGE_READWRITE)) + 0, &size, MEM_COMMIT, PAGE_READWRITE)) hr = E_OUTOFMEMORY; else { ACPacket *cur_packet = (ACPacket*)((char*)stream->local_buffer + stream->real_bufsize_bytes); -- 2.23.0

2 1

[PATCH vkd3d v2] build: Disable crosstests as well if tests are disabled.
by Zebediah Figura 27 Jan '22

27 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Actually disable them in the makefile. Makefile.am | 10 ++++++++++ configure.ac | 9 +++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3b2e7d718..3c3858e8b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -381,6 +381,9 @@ CLEANFILES += include/private/vkd3d_version.h dummy-vkd3d-version: ## Cross-compile tests + +if BUILD_CROSSTESTS + cross_implibs = crosslibs/d3d12 CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=0 @@ -440,6 +443,13 @@ else crosstest64: endif +else + +crosstest32: +crosstest64: + +endif # BUILD_CROSSTESTS + .PHONY: crosstest crosstest32 crosstest64 crosstest: crosstest32 crosstest64 diff --git a/configure.ac b/configure.ac index d296dfd4b..b13858d2d 100644 --- a/configure.ac +++ b/configure.ac @@ -143,13 +143,14 @@ AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" != "xno"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) +AM_CONDITIONAL([BUILD_CROSSTESTS], + [test "x$enable_tests" != "xno" -a $ "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno" $]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT dnl Output configuration summary -AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], - [HAVE_CROSSTEST=yes], [HAVE_CROSSTEST=no]) +AM_COND_IF([BUILD_CROSSTESTS],[HAVE_CROSSTEST=yes], [HAVE_CROSSTEST=no]) AS_IF([test $DX_FLAG_doc = 1], [HAVE_DOCS=yes], [HAVE_DOCS=no]) AS_ECHO([" @@ -166,6 +167,6 @@ AS_ECHO([" Building documentation: ${HAVE_DOCS} Building crosstests: ${HAVE_CROSSTEST}"]) -AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) -AS_IF([test "x$CROSSTARGET64" != "xno"], [AS_ECHO([" Using 64-bit cross compiler: $CROSSCC64"])]) +AS_IF([test "$HAVE_CROSSTEST" == "yes" -a "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) +AS_IF([test "$HAVE_CROSSTEST" == "yes" -a "x$CROSSTARGET64" != "xno"], [AS_ECHO([" Using 64-bit cross compiler: $CROSSCC64"])]) AS_ECHO([]) -- 2.34.1

4 3

[PATCH v3 01/13] loader: Use long instead of int for syscall return type in i386 code.
by Jinoh Kang 27 Jan '22

27 Jan '22

Although int = long effectively in i386, this makes it clear that a machine word-width value is being returned. Also, future patches adding syscalls returning pointers can use the same type (long) for return value consistently. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v1 -> v2: don't change SYSCALL_RET(). loader/preloader.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 585be50624f..937843eb9c5 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -247,7 +247,7 @@ static inline __attribute__((noreturn)) void wld_exit( int code ) static inline int wld_open( const char *name, int flags ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (5 /* SYS_open */), "r" (name), "c" (flags) ); return SYSCALL_RET(ret); @@ -255,7 +255,7 @@ static inline int wld_open( const char *name, int flags ) static inline int wld_close( int fd ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (6 /* SYS_close */), "r" (fd) ); return SYSCALL_RET(ret); @@ -263,7 +263,7 @@ static inline int wld_close( int fd ) static inline ssize_t wld_read( int fd, void *buffer, size_t len ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (3 /* SYS_read */), "r" (fd), "c" (buffer), "d" (len) @@ -273,7 +273,7 @@ static inline ssize_t wld_read( int fd, void *buffer, size_t len ) static inline ssize_t wld_write( int fd, const void *buffer, size_t len ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (4 /* SYS_write */), "r" (fd), "c" (buffer), "d" (len) ); return SYSCALL_RET(ret); @@ -281,7 +281,7 @@ static inline ssize_t wld_write( int fd, const void *buffer, size_t len ) static inline int wld_mprotect( const void *addr, size_t len, int prot ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (125 /* SYS_mprotect */), "r" (addr), "c" (len), "d" (prot) ); return SYSCALL_RET(ret); @@ -328,7 +328,7 @@ __ASM_GLOBAL_FUNC(wld_mmap, static inline int wld_prctl( int code, long arg ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (172 /* SYS_prctl */), "r" (code), "c" (arg) ); return SYSCALL_RET(ret); -- 2.31.1

2 20

[PATCH v2 5/5] secur32/tests: Add tests for DTLS handshake retransmission.
by Hans Leidekker 27 Jan '22

27 Jan '22

From: Connor McAdams <cmcadams(a)codeweavers.com> Successive calls to InitializeSecurityContext without a new pInput buffer will result in retransmission, creating a handshake packet with an incremented sequence number value, but otherwise identical to the last call to InitializeSecurityContext. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/tests/schannel.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 902a490a296..abddfa138ab 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1623,6 +1623,7 @@ static void test_dtls(void) CtxtHandle ctx_handle, ctx_handle2; SecBufferDesc buffers[3]; ULONG flags_req, flags_ret, attr, prev_buf_len; + char *buf, *buf2; init_cred( &cred ); cred.grbitEnabledProtocols = SP_PROT_DTLS_CLIENT | SP_PROT_DTLS1_2_CLIENT; @@ -1663,6 +1664,9 @@ static void test_dtls(void) ok( buffers[1].pBuffers[1].BufferType == SECBUFFER_ALERT, "Expected buffertype SECBUFFER_ALERT, got %#x\n", buffers[1].pBuffers[1].BufferType); ok( !buffers[1].pBuffers[1].cbBuffer, "Expected SECBUFFER_ALERT buffer to be empty, got %#x\n", buffers[1].pBuffers[1].cbBuffer); prev_buf_len = buffers[1].pBuffers[0].cbBuffer; + buf = HeapAlloc( GetProcessHeap(), 0, prev_buf_len ); + memcpy( buf, buffers[1].pBuffers[0].pvBuffer, prev_buf_len ); + ok( buf[10] == 0, "Expected initial packet to have sequence number value of 0, got %d\n", buf[10]); /* * If we don't set the SECBUFFER_ALERT cbBuffer value, we will get @@ -1709,7 +1713,17 @@ static void test_dtls(void) ok(buffers[1].pBuffers[0].cbBuffer == prev_buf_len, "Output buffer size mismatch, expected %#x, got %#x\n", prev_buf_len, buffers[1].pBuffers[0].cbBuffer); + /* + * The retransmission packet and the original packet should only differ in + * their sequence number value. + */ + buf2 = (char *)buffers[1].pBuffers[0].pvBuffer; + ok( buf2[10] == 1, "Expected retransmitted packet to have sequence number value of 1, got %d\n", buf2[10]); + ok( !memcmp(buf2, buf, 9), "Lower portion mismatch between retransmitted packet and original packet\n"); + ok( !memcmp(buf2 + 11, buf + 11, prev_buf_len - 11), "Upper portion mismatch between retransmitted packet and original packet\n"); + free_buffers( &buffers[0] ); + HeapFree(GetProcessHeap(), 0, buf); HeapFree(GetProcessHeap(), 0, buffers[1].pBuffers[1].pvBuffer); free_buffers( &buffers[1] ); DeleteSecurityContext( &ctx_handle ); -- 2.30.2

2 1

[tools 1/2] testbot/SetWinLocale: Use Powershell to collect all the locales at once.
by Francois Gouget 27 Jan '22

27 Jan '22

The new Powershell script can also be used independently on Windows. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 103 +++++++++++++++++++------------- testbot/bin/SetWinLocale.ps1 | 110 +++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 42 deletions(-) create mode 100644 testbot/bin/SetWinLocale.ps1 diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 42a106b77d..25023bb94f 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -3,7 +3,7 @@ # # Sets the locale of the specified Windows machine. # -# Copyright 2018, 2021 Francois Gouget +# Copyright 2018, 2021-2022 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -41,12 +41,7 @@ use WineTestBot::Log; use WineTestBot::TestAgent; use WineTestBot::Utils; -my $HKCU_INTERNATIONAL = "HKCU\\Control Panel\\International"; -my $HKCU_GEO = "HKCU\\Control Panel\\International\\Geo"; my $HKCU_USER_PROFILE = "HKCU\\Control Panel\\International\\User Profile"; -my $HKCU_DESKTOP = "HKCU\\Control Panel\\Desktop"; -my $HKLM_LANGUAGE = "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Language"; -my $HKLM_LOCALE = "HKLM\\SYSTEM\\CurrentControlSet\\Control\\Nls\\Locale"; my $HKLM_CODE_PAGE = "HKLM\\System\\CurrentControlSet\\Control\\Nls\\CodePage"; @@ -74,11 +69,26 @@ sub Debug(@) print STDERR @_ if ($Debug); } +my $TA; +sub Cleanup() +{ + return if (!$TA); + if ($Debug) + { + Debug("Not deleting the $name0* files for debugging\n"); + } + else + { + $TA->Rm("$name0.out", "$name0.ps1"); + } +} + my $Start = Time(); sub FatalError(@) { - Error( @_); + Error(@_); Debug(Elapsed($Start), " Aborting\n"); + Cleanup(); exit(1); } @@ -487,7 +497,7 @@ if (defined $Usage) exit 0; } -my $TA = TestAgent->new($OptHostName, $AgentPort); +$TA = TestAgent->new($OptHostName, $AgentPort); # @@ -558,42 +568,44 @@ sub RegSetValue($$$$) # Show the host's locale settings # -sub GetWinSettings($) +if (open(my $fh, "<", "$0.ps1")) { - my ($All) = @_; - my $Settings; + my $Script = join("", <$fh>); + close($fh); - if ($OptLocale or $All) - { - my $Values = RegGetValues($HKCU_INTERNATIONAL, "Locale*"); - map { $Settings->{$_} = $Values->{$_} } ("Locale", "LocaleName"); - } - if ($OptCountry or $All) - { - my $Values = RegGetValues($HKCU_GEO, "N*"); - $Settings->{Country} = $Values->{Nation}; - $Settings->{CountryName} = $Values->{Name}; - } - if (($OptKeyboard || $OptDefault) or $All) - { - my $Values = RegGetValues($HKCU_USER_PROFILE, "*"); - $Settings->{InputMethod} = $Values->{InputMethodOverride}; - $Settings->{Languages} = $Values->{Languages}; - } - if ($OptMUI or $All) - { - my $Values = RegGetValues($HKCU_DESKTOP, "*PreferredUILanguages*"); - map { $Settings->{$_} = $Values->{$_} } ("PreferredUILanguages", "PreferredUILanguagesPending", "PreviousPreferredUILanguages"); - } - if ($OptSystem or $All) + $Script =~ s~\n~\r\n~g; + if (!$TA->SendFileFromString($Script, "$name0.ps1", 0)) { - $Settings->{SysLanguage} = RegGetValue($HKLM_LANGUAGE, "Default"); - $Settings->{SysLocale} = RegGetValue($HKLM_LOCALE, "(Default)"); + FatalError("could not send the batch file:", $TA->GetLastError(), "\n"); } - if ($OptUTF8 or $All) +} +else +{ + FatalError("could not open '$0.ps1' for reading: $!\n"); +} + +sub GetWinSettings() +{ + my $Cmd = ["powershell.exe", "-ExecutionPolicy", "ByPass", "-File", + "$name0.ps1", "settings"]; + my $Ret = $TA->RunAndWait($Cmd, 0, 30, undef, "$name0.out", "$name0.out"); + FatalError("failed to run @$Cmd: ", $TA->GetLastError(), "\n") if ($Ret < 0); + my $Out = $TA->GetFileToString("$name0.out") if (!$Ret); + + my ($Settings, $Key); + foreach my $Line (split /\n/, $Out || "") { - my $Values = RegGetValues($HKLM_CODE_PAGE, "*CP"); - map { $Settings->{$_} = $Values->{$_} } ("ACP", "MACCP", "OEMCP"); + $Line =~ s/\r$//; + if ($Line =~ /^([a-zA-Z]+)=\[(.*)\]$/) + { + my ($Name, $Value) = ($1, $2); + $Settings->{$Name} = [split /, /, $Value]; + } + elsif ($Line =~ /^([a-zA-Z]+)=(.*)$/) + { + my ($Name, $Value) = ($1, $2); + $Settings->{$Name} = $Value eq "<undef>" ? undef : $Value; + } } return $Settings; } @@ -609,6 +621,8 @@ sub Value2Str($) sub ShowWinSettings($) { my ($Settings) = @_; + + print "Current account:\n"; print "Locale (--locale) = ", Value2Str($Settings->{Locale}), "\n"; print "LocaleName (--locale) = ", Value2Str($Settings->{LocaleName}), "\n"; print "Geo:Nation (--country) = ", Value2Str($Settings->{Country}), "\n"; @@ -618,6 +632,9 @@ sub ShowWinSettings($) print "PreferredUILanguages (--mui) = ", Value2Str($Settings->{PreferredUILanguages}), "\n"; print " ...Pending (--mui) = ", Value2Str($Settings->{PreferredUILanguagesPending}), "\n"; print " Previous... (--mui) = ", Value2Str($Settings->{PreviousPreferredUILanguages}), "\n"; + + print "\n"; + print "System settings:\n"; print "Nls:Language (--system) = ", Value2Str($Settings->{SysLanguage}), "\n"; print "Nls:Locale (--system) = ", Value2Str($Settings->{SysLocale}), "\n"; print "ACP (--utf8) = ", Value2Str($Settings->{ACP}), "\n"; @@ -627,7 +644,8 @@ sub ShowWinSettings($) if ($OptShow) { - ShowWinSettings(GetWinSettings("all")); + ShowWinSettings(GetWinSettings()); + Cleanup(); exit(0); } @@ -856,7 +874,7 @@ sub CheckSetting($$$$;$) my ($Settings, $VName, $Expected, $For, $IgnoreCase) = @_; my $Value = $Settings->{$VName}; - if (defined $Value) + if (defined $Value and $Value !~ /^<.+>$/) { if ((!$IgnoreCase and $Value ne $Expected) or ($IgnoreCase and uc($Value) ne uc($Expected))) @@ -868,7 +886,7 @@ sub CheckSetting($$$$;$) } Debug(Elapsed($Start), " Checking the new locale settings\n"); -my $Settings = GetWinSettings($Debug); +my $Settings = GetWinSettings(); ShowWinSettings($Settings) if ($Debug); if ($OptLocale) { @@ -901,6 +919,7 @@ if ($KeyboardIds) CheckSetting($Settings, "InputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); } +Cleanup(); exit(1) if (!$Success); Debug(Elapsed($Start), " All done!\n"); exit(0); diff --git a/testbot/bin/SetWinLocale.ps1 b/testbot/bin/SetWinLocale.ps1 new file mode 100644 index 0000000000..8d6b3a94bc --- /dev/null +++ b/testbot/bin/SetWinLocale.ps1 @@ -0,0 +1,110 @@ +# Shows the Windows locale settings +# +# Copyright 2022 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +$Name0 = (Get-Item $MyInvocation.InvocationName).Basename + + +# +# Dump the Windows locales settings +# + +$HKCU_INTERNATIONAL = "HKCU:\Control Panel\International" +$HKCU_GEO = "HKCU:\Control Panel\International\Geo" +$HKCU_USER_PROFILE = "HKCU:\Control Panel\International\User Profile" +$HKCU_DESKTOP = "HKCU:\Control Panel\Desktop" +$HKLM_LANGUAGE = "HKLM:\SYSTEM\CurrentControlSet\Control\Nls\Language" +$HKLM_LOCALE = "HKLM:\SYSTEM\CurrentControlSet\Control\Nls\Locale" +$HKLM_CODE_PAGE = "HKLM:\System\CurrentControlSet\Control\Nls\CodePage" +$CODE_PAGES = "ACP", "MACCP", "OEMCP" + + +function ShowSetting([string]$Key, [string]$VName, [string]$SName) +{ + if ($SName -eq "") { $SName = $VName } + # Don't use Get-ItemPropertyValue because it ignores -ErrorAction and is + # not available on Windows 7. + $Value = Get-ItemProperty -Path $Key -Name $VName -ErrorAction SilentlyContinue + $Value = if ($Value -eq $null) { "<undef>" } else { $Value.$($VName) } + if ($Value.GetType().Name -eq "Object[]") + { + $Value = "[" + ($Value -join ", ") + "]" + } + Write-Output "$SName=$Value" +} + +function ShowSettings() +{ + Write-Output "Current account:" + ShowSetting $HKCU_INTERNATIONAL "Locale" + ShowSetting $HKCU_INTERNATIONAL "LocaleName" + ShowSetting $HKCU_GEO "Nation" "Country" + ShowSetting $HKCU_GEO "Name" "CountryName" + ShowSetting $HKCU_USER_PROFILE "InputMethodOverride" "InputMethod" + ShowSetting $HKCU_USER_PROFILE "Languages" + ShowSetting $HKCU_DESKTOP "PreferredUILanguages" + ShowSetting $HKCU_DESKTOP "PreferredUILanguagesPending" + ShowSetting $HKCU_DESKTOP "PreviousPreferredUILanguages" + + Write-Output "" + Write-Output "System settings:" + ShowSetting $HKLM_LANGUAGE "Default" "SysLanguage" + try + { + ShowSetting $HKLM_LOCALE "(Default)" "SysLocale" + } + catch + { + # On Windows 7 Get-ItemProperty confuses the key's default value + # with the value called "(Default)"! + Write-Output "SysLocale=<cannot-get-on-windows-7>" + } + foreach ($CodePage in $CODE_PAGES) + { + ShowSetting $HKLM_CODE_PAGE $CodePage + } + + exit 0 +} + + +# +# Main +# + +function ShowUsage() +{ + Write-Output "Usage: $Name0 settings" + Write-Output "or $Name0 -?" + Write-Output "" + Write-Output "Shows the Windows locales." + Write-Output "" + Write-Output "Where:" + Write-Output " settings Show the current Windows locale settings." + Write-Output " -? Shows this help message." +} + +$Action = $args[0] +if ($Action -eq "settings") { ShowSettings } +$Rc = 0 +if ($Action -and $Action -ne "-?" -and $Action -ne "-h" -and $Action -ne "help") +{ + echo "$Name0:error: unknown action $Action" + $Rc = 2 +} +ShowUsage +exit $Rc -- 2.30.2

1 1

[PATCH] comctl32/tests: Add some tests for TBBUTTON.iBitmap for separators.
by Nikolay Sivov 27 Jan '22

27 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52465 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 92 +++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 1c52c70f2aa..cfe4f16f430 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2705,6 +2705,96 @@ static void init_functions(void) #undef X } +static void test_BTNS_SEP(void) +{ + TBBUTTON buttons[1], button; + LRESULT ret; + HWND hwnd; + + rebuild_toolbar(&hwnd); + + /* 0 iBitmap */ + memset(buttons, 0, sizeof(buttons)); + buttons[0].idCommand = 5; + buttons[0].fsStyle = BTNS_SEP; + buttons[0].fsState = TBSTATE_ENABLED; + buttons[0].iString = -1; + + ret = SendMessageA(hwnd, TB_ADDBUTTONSA, 1, (LPARAM)buttons); + ok(ret == 1, "Unexpected return value.\n"); + ret = SendMessageA(hwnd, TB_AUTOSIZE, 0, 0); + ok(!ret, "Unexpected return value.\n"); + + memset(&button, 0, sizeof(button)); + ret = SendMessageA(hwnd, TB_GETBUTTON, 0, (LPARAM)&button); + ok(ret == 1, "Unexpected return value.\n"); +todo_wine + ok(button.iBitmap == 8, "Unexpected iBitmap value %d.\n", button.iBitmap); + + rebuild_toolbar(&hwnd); + + /* Nonzero iBitmap */ + memset(buttons, 0, sizeof(buttons)); + buttons[0].idCommand = 5; + buttons[0].fsStyle = BTNS_SEP; + buttons[0].fsState = TBSTATE_ENABLED; + buttons[0].iString = -1; + buttons[0].iBitmap = 2; + + ret = SendMessageA(hwnd, TB_ADDBUTTONSA, 1, (LPARAM)buttons); + ok(ret == 1, "Unexpected return value.\n"); + ret = SendMessageA(hwnd, TB_AUTOSIZE, 0, 0); + ok(!ret, "Unexpected return value.\n"); + + memset(&button, 0, sizeof(button)); + ret = SendMessageA(hwnd, TB_GETBUTTON, 0, (LPARAM)&button); + ok(ret == 1, "Unexpected return value.\n"); + ok(button.iBitmap == 2, "Unexpected iBitmap value %d.\n", button.iBitmap); + + rebuild_toolbar(&hwnd); + + /* Exceeds default width */ + memset(buttons, 0, sizeof(buttons)); + buttons[0].idCommand = 5; + buttons[0].fsStyle = BTNS_SEP; + buttons[0].fsState = TBSTATE_ENABLED; + buttons[0].iString = -1; + buttons[0].iBitmap = 32; + + ret = SendMessageA(hwnd, TB_ADDBUTTONSA, 1, (LPARAM)buttons); + ok(ret == 1, "Unexpected return value.\n"); + ret = SendMessageA(hwnd, TB_AUTOSIZE, 0, 0); + ok(!ret, "Unexpected return value.\n"); + + memset(&button, 0, sizeof(button)); + ret = SendMessageA(hwnd, TB_GETBUTTON, 0, (LPARAM)&button); + ok(ret == 1, "Unexpected return value.\n"); + ok(button.iBitmap == 32, "Unexpected iBitmap value %d.\n", button.iBitmap); + + rebuild_toolbar(&hwnd); + + /* Negative */ + memset(buttons, 0, sizeof(buttons)); + buttons[0].idCommand = 5; + buttons[0].fsStyle = BTNS_SEP; + buttons[0].fsState = TBSTATE_ENABLED; + buttons[0].iString = -1; + buttons[0].iBitmap = -3; + + ret = SendMessageA(hwnd, TB_ADDBUTTONSA, 1, (LPARAM)buttons); + ok(ret == 1, "Unexpected return value.\n"); + ret = SendMessageA(hwnd, TB_AUTOSIZE, 0, 0); + ok(!ret, "Unexpected return value.\n"); + + memset(&button, 0, sizeof(button)); + ret = SendMessageA(hwnd, TB_GETBUTTON, 0, (LPARAM)&button); + ok(ret == 1, "Unexpected return value.\n"); +todo_wine + ok(button.iBitmap == 8, "Unexpected iBitmap value %d.\n", button.iBitmap); + + DestroyWindow(hwnd); +} + START_TEST(toolbar) { ULONG_PTR ctx_cookie; @@ -2755,12 +2845,14 @@ START_TEST(toolbar) test_save(); test_drawtext_flags(); test_imagelist(); + test_BTNS_SEP(); if (!load_v6_module(&ctx_cookie, &ctx)) return; test_create(TRUE); test_visual(); + test_BTNS_SEP(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { -- 2.34.1

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
72
Older →

Jump to page:

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-devel January 2022