February 2022 - Wine-commits

Eric Pouech : wldap32: Use correct integral type.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: d1265abbc48cf6fee43c4c0cde8daa4ea7160169 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1265abbc48cf6fee43c4c0c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:50:00 2022 +0100 wldap32: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/ber.c | 8 ++++---- dlls/wldap32/libldap.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index 8387ce36033..f3b18e530b4 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -145,7 +145,7 @@ void CDECL ber_bvfree( BERVAL *berval ) */ ULONG CDECL ber_first_element( BerElement *ber, ULONG *len, char **opaque ) { - struct ber_first_element_params params = { BER(ber), len, opaque }; + struct ber_first_element_params params = { BER(ber), (unsigned int *)len, opaque }; return LDAP_CALL( ber_first_element, &params ); } @@ -265,7 +265,7 @@ BerElement * CDECL ber_init( BERVAL *berval ) */ ULONG CDECL ber_next_element( BerElement *ber, ULONG *len, char *opaque ) { - struct ber_next_element_params params = { BER(ber), len, opaque }; + struct ber_next_element_params params = { BER(ber), (unsigned int *)len, opaque }; return LDAP_CALL( ber_next_element, &params ); } @@ -285,7 +285,7 @@ ULONG CDECL ber_next_element( BerElement *ber, ULONG *len, char *opaque ) */ ULONG CDECL ber_peek_tag( BerElement *ber, ULONG *len ) { - struct ber_peek_tag_params params = { BER(ber), len }; + struct ber_peek_tag_params params = { BER(ber), (unsigned int *)len }; return LDAP_CALL( ber_peek_tag, &params ); } @@ -305,7 +305,7 @@ ULONG CDECL ber_peek_tag( BerElement *ber, ULONG *len ) */ ULONG CDECL ber_skip_tag( BerElement *ber, ULONG *len ) { - struct ber_skip_tag_params params = { BER(ber), len }; + struct ber_skip_tag_params params = { BER(ber), (unsigned int *)len }; return LDAP_CALL( ber_skip_tag, &params ); } diff --git a/dlls/wldap32/libldap.h b/dlls/wldap32/libldap.h index c398b501602..65487f16fe6 100644 --- a/dlls/wldap32/libldap.h +++ b/dlls/wldap32/libldap.h @@ -106,7 +106,7 @@ struct ber_alloc_t_params struct ber_first_element_params { void *ber; - ULONG *ret_len; + unsigned int *ret_len; char **last; };

1 0

Eric Pouech : winmm: Use correct integral type.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: b5ad46a58a1d6d620fe722204d84199188408738 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5ad46a58a1d6d620fe72220… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:49:54 2022 +0100 winmm: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/waveform.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index ecffa700662..66444ee82dc 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -183,7 +183,7 @@ typedef struct _WINMM_QueryInterfaceInfo { BOOL is_out; UINT index; WCHAR *str; - UINT *len_bytes; + ULONG *len_bytes; } WINMM_QueryInterfaceInfo; static LRESULT WOD_Open(WINMM_OpenInfo *info); @@ -1771,7 +1771,8 @@ exit: static void WID_PullACMData(WINMM_Device *device) { - UINT32 packet, packet_bytes; + UINT32 packet; + DWORD packet_bytes; DWORD flags; BYTE *data; WAVEHDR *queue;

1 0

Eric Pouech : xaudio2_7: Use correct integral type.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: d4bd5aaa910b5e5a8d3c0d2fafd8cc28cfe79f1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4bd5aaa910b5e5a8d3c0d2f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:50:06 2022 +0100 xaudio2_7: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 12383896b42..e5a83ebdbf8 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1291,7 +1291,7 @@ static void WINAPI XA2M_GetChannelMask(IXAudio2MasteringVoice *iface, TRACE("%p, %p\n", This, pChannelMask); - FAudioMasteringVoice_GetChannelMask(This->faudio_voice, pChannelMask); + FAudioMasteringVoice_GetChannelMask(This->faudio_voice, (uint32_t *)pChannelMask); } static const struct IXAudio2MasteringVoiceVtbl XAudio2MasteringVoice_Vtbl = {

1 0

Bastien Orivel : ws2_32: Fix setsockopt(TCP_NODELAY) when optlen is less than 4.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: d6ea38f32dfd3edbe107a255c37e9f7f3da06ae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6ea38f32dfd3edbe107a255… Author: Bastien Orivel <eijebong(a)bananium.fr> Date: Thu Feb 3 11:28:27 2022 +0100 ws2_32: Fix setsockopt(TCP_NODELAY) when optlen is less than 4. According to MSDN [1], the `TCP_NODELAY` parameter should be of type `BOOL` which is 4 bytes. Due to a bug [2] in rustc passing a byte instead of an int, any program written in rust that tries to set that option on a socket will fail with a "Invalid parameter supplied" error. Turns out that setsockopt on linux does not want optlen to be less than 4 bytes [3]. Windows' behavior is the following: - For optlen <= 0, return SOCKET_ERROR and set last error to WSAEFAULT - For optlen > 0, ignore the optlen value and set the TCP_NODELAY value to one if the first byte of the given optvalue is not 0. This will fix any rust program using the hyper library to do HTTP requests. [1]: https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-tcp-socket-o… [2]: https://github.com/rust-lang/rust/blob/44593aeb1387b1be355aeaf0040d5927bd80… [3]: https://github.com/torvalds/linux/blob/d58071a8a76d779eedab38033ae4c821c302… Signed-off-by: Bastien Orivel <eijebong(a)bananium.fr> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 10 ++++++-- dlls/ws2_32/tests/sock.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a75aaee68be..4b3ca3c2507 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2903,8 +2903,14 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int switch(optname) { case TCP_NODELAY: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, optval, optlen ); - + { + INT nodelay = *optval; + if (optlen <= 0) { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&nodelay, sizeof(nodelay) ); + } default: FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b38357954b7..d208c17e43f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1259,6 +1259,69 @@ static void test_set_getsockopt(void) ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + /* TCP_NODELAY: optlen doesn't matter on windows, it should work with any positive value */ + size = sizeof(value); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 1); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 1\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 42); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 42\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 0); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, -1); + /* On win 10 pro, this sets the error to WSAENOBUFS instead of WSAEFAULT */ + ok(err == SOCKET_ERROR && (WSAGetLastError() == WSAEFAULT || WSAGetLastError() == WSAENOBUFS), + "got %d with %d (expected SOCKET_ERROR with either WSAEFAULT or WSAENOBUFS)\n", err, WSAGetLastError()); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + + value = 0x100; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4 and optvalue = 0x100\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + /* Test for erroneously passing a value instead of a pointer as optval */ size = sizeof(char); err = setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)1, size);

1 0

Zebediah Figura : opencl: Rename cl_{enums,types} to header_{enums,types}.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 2a35d9a4c5d32b6260cf3310e940af2a77801460 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a35d9a4c5d32b6260cf3310… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 3 15:08:14 2022 -0600 opencl: Rename cl_{enums,types} to header_{enums,types}. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/make_opencl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/opencl/make_opencl b/dlls/opencl/make_opencl index 088120c8081..a93946b2d2b 100755 --- a/dlls/opencl/make_opencl +++ b/dlls/opencl/make_opencl @@ -297,8 +297,8 @@ sub generate_spec_entry($$) } my %core_functions; -my %cl_enums; -my (%cl_types, @cl_types); # also use an array to preserve declaration order +my %header_enums; +my (%header_types, @header_types); # also use an array to preserve declaration order # some functions need a hand-written wrapper sub needs_pe_wrapper($) @@ -440,13 +440,13 @@ sub parse_file($) } foreach my $enum ($feature->findnodes("./require/enum")) { - $cl_enums{$enum->{name}} = $enums{$enum->{name}}; + $header_enums{$enum->{name}} = $enums{$enum->{name}}; } foreach my $type ($feature->findnodes("./require/type")) { next unless $types{$type->{name}}; - push @cl_types, $type->{name} unless $cl_types{$type->{name}}; - $cl_types{$type->{name}} = $types{$type->{name}}; + push @header_types, $type->{name} unless $header_types{$type->{name}}; + $header_types{$type->{name}} = $types{$type->{name}}; } } @@ -588,9 +588,9 @@ typedef uint64_t DECLSPEC_ALIGN(8) cl_ulong; END ; -foreach (@cl_types) +foreach (@header_types) { - my $type = $cl_types{$_}; + my $type = $header_types{$_}; if ($type->{category} eq "define") { print TYPES $type->textContent() . "\n"; @@ -603,9 +603,9 @@ foreach (@cl_types) print TYPES "\n"; -foreach (sort keys %cl_enums) +foreach (sort keys %header_enums) { - printf TYPES "#define %s %s\n", $_, $cl_enums{$_}; + printf TYPES "#define %s %s\n", $_, $header_enums{$_}; } close(TYPES);

1 0

Zebediah Figura : opencl: Factor out parse_feature().
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 9fbe2f5767e4a0c40a4f9194b17f509912f577b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fbe2f5767e4a0c40a4f9194… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 3 15:08:15 2022 -0600 opencl: Factor out parse_feature(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/make_opencl | 53 ++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/opencl/make_opencl b/dlls/opencl/make_opencl index a93946b2d2b..c2c4d7f6e63 100755 --- a/dlls/opencl/make_opencl +++ b/dlls/opencl/make_opencl @@ -369,13 +369,34 @@ sub generate_struct($) return $ret; } +my %all_functions; +my %all_enums; +my %all_types; + +sub parse_feature($) +{ + my $feature = shift; + + foreach my $cmd ($feature->findnodes("./require/command")) + { + $core_functions{$cmd->{name}} = $all_functions{$cmd->{name}}; + } + foreach my $enum ($feature->findnodes("./require/enum")) + { + $header_enums{$enum->{name}} = $all_enums{$enum->{name}}; + } + foreach my $type ($feature->findnodes("./require/type")) + { + next unless $all_types{$type->{name}}; + push @header_types, $type->{name} unless $header_types{$type->{name}}; + $header_types{$type->{name}} = $all_types{$type->{name}}; + } +} + sub parse_file($) { my $file = shift; my $xml = XML::LibXML->load_xml( location => $file ); - my %functions; - my %enums; - my %types; # save all functions foreach my $command ($xml->findnodes("/registry/commands/command")) @@ -384,7 +405,7 @@ sub parse_file($) my $name = @{$command->findnodes("./proto/name")}[0]; $proto->removeChild( $name ); my @params = $command->findnodes("./param"); - $functions{$name->textContent()} = [ $proto, \@params ]; + $all_functions{$name->textContent()} = [ $proto, \@params ]; } # save all enums @@ -392,11 +413,11 @@ sub parse_file($) { if (defined $enum->{value}) { - $enums{$enum->{name}} = $enum->{value}; + $all_enums{$enum->{name}} = $enum->{value}; } else { - $enums{$enum->{name}} = "(1 << " . $enum->{bitpos} . ")"; + $all_enums{$enum->{name}} = "(1 << " . $enum->{bitpos} . ")"; } } @@ -407,7 +428,7 @@ sub parse_file($) { my $name = @{$type->findnodes("./name")}[0]; $name = $name->textContent; - $types{$name} = $type; + $all_types{$name} = $type; my $basetype = @{$type->findnodes("./type")}[0]; if ($type->textContent() =~ /[[*]/) @@ -426,28 +447,14 @@ sub parse_file($) elsif ($type->{category} eq "struct") { my $name = $type->{name}; - $types{$name} = $type; + $all_types{$name} = $type; } } # generate core functions foreach my $feature ($xml->findnodes("/registry/feature")) { - next unless defined $core_categories{$feature->{name}}; - foreach my $cmd ($feature->findnodes("./require/command")) - { - $core_functions{$cmd->{name}} = $functions{$cmd->{name}}; - } - foreach my $enum ($feature->findnodes("./require/enum")) - { - $header_enums{$enum->{name}} = $enums{$enum->{name}}; - } - foreach my $type ($feature->findnodes("./require/type")) - { - next unless $types{$type->{name}}; - push @header_types, $type->{name} unless $header_types{$type->{name}}; - $header_types{$type->{name}} = $types{$type->{name}}; - } + parse_feature($feature) if defined $core_categories{$feature->{name}}; } # generate extension list

1 0

Zebediah Figura : opencl: Export unsuffixed KHR_gl_sharing functions.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: b5f115e8dfeb50b3ec49cbf6e8a3048ea065c40a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5f115e8dfeb50b3ec49cbf6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 3 15:08:16 2022 -0600 opencl: Export unsuffixed KHR_gl_sharing functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46470 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/make_opencl | 52 ++++++++++++++++++++++++++++--- dlls/opencl/opencl.spec | 9 ++++++ dlls/opencl/opencl_types.h | 23 ++++++++++++++ dlls/opencl/pe_wrappers.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 157 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b5f115e8dfeb50b3ec49…

1 0

Michael Stefaniuc : dmusic/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: ade67db2cb3881cdce9fff97efb4554ef7aa2139 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ade67db2cb3881cdce9fff97… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 3 22:51:34 2022 +0100 dmusic/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/tests/Makefile.in | 1 - dlls/dmusic/tests/dmusic.c | 380 +++++++++++++++++++++--------------------- 2 files changed, 190 insertions(+), 191 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ade67db2cb3881cdce9f…

1 0

Kevin Puetz : winegcc: --out-implib needs to propagate -m32/-m64 to winebuild.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: ccf7b4459bc6a8303aa93a9743e7a3b01ffb9783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccf7b4459bc6a8303aa93a97… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Feb 3 16:08:25 2022 -0600 winegcc: --out-implib needs to propagate -m32/-m64 to winebuild. This was already passed through for linking, and for spec.o files, but was overlooked when implementing -Wl,--out-implib Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 8644afe7535..2eb0bdbcf3b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -888,6 +888,8 @@ static struct strarray get_winebuild_args(struct options *opts) strarray_add( &spec_args, "--target" ); strarray_add( &spec_args, opts->target_alias ); } + if (opts->force_pointer_size) + strarray_add(&spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); for (i = 0; i < opts->prefix.count; i++) strarray_add( &spec_args, strmake( "-B%s", opts->prefix.str[i] )); strarray_addall( &spec_args, opts->winebuild_args ); @@ -1016,8 +1018,6 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file, } spec_o_name = get_temp_file(output_name, ".spec.o"); - if (opts->force_pointer_size) - strarray_add(&spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); if (opts->pic && !is_pe) strarray_add(&spec_args, "-fPIC"); strarray_add(&spec_args, opts->shared ? "--dll" : "--exe"); if (opts->fake_module)

1 0

Derek Lesho : userenv: Set ProgramData in CreateEnvironmentBlock.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: c29621ff70a988ff25e5c5202d04df93be2a6e9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c29621ff70a988ff25e5c520… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Feb 3 17:09:08 2022 -0500 userenv: Set ProgramData in CreateEnvironmentBlock. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/tests/userenv.c | 17 ++++++++++++++++- dlls/userenv/userenv_main.c | 3 +++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index a91edeef260..c7a6791e2be 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -78,7 +78,7 @@ static void test_create_env(void) BOOL r, is_wow64 = FALSE; HANDLE htok; WCHAR * env[4]; - char * st, systemroot[100]; + char * st, systemroot[100], programdata[100]; int i, j; static const struct profile_item common_vars[] = { @@ -96,6 +96,7 @@ static void test_create_env(void) }; static const struct profile_item common_post_nt4_vars[] = { { "ALLUSERSPROFILE" }, + { "ProgramData" }, { "TEMP" }, { "TMP" }, { "CommonProgramFiles" }, @@ -119,6 +120,12 @@ static void test_create_env(void) r = SetEnvironmentVariableA("SystemRoot", "overwrite"); expect(TRUE, r); + r = GetEnvironmentVariableA("ProgramData", programdata, sizeof(programdata)); + ok(r != 0, "GetEnvironmentVariable failed (%d)\n", GetLastError()); + + r = SetEnvironmentVariableA("ProgramData", "overwrite"); + expect(TRUE, r); + if (0) { /* Crashes on NT4 */ @@ -151,12 +158,20 @@ static void test_create_env(void) r = SetEnvironmentVariableA("SystemRoot", systemroot); expect(TRUE, r); + r = SetEnvironmentVariableA("ProgramData", programdata); + expect(TRUE, r); + for(i=0; i<4; i++) { r = get_env(env[i], "SystemRoot", &st); ok(!strcmp(st, "SystemRoot=overwrite"), "%s\n", st); expect(TRUE, r); HeapFree(GetProcessHeap(), 0, st); + + r = get_env(env[i], "ProgramData", &st); + ok(strcmp(st, "ProgramData=overwrite"), "%s\n", st); + expect(TRUE, r); + HeapFree(GetProcessHeap(), 0, st); } /* Test for common environment variables (NT4 and higher) */ diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 87ace7d5c11..08dede60d35 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -243,7 +243,10 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, } if (get_reg_value(env, hkey, L"Public", buf, UNICODE_STRING_MAX_CHARS)) + { set_env_var(&env, L"ALLUSERSPROFILE", buf); + set_env_var(&env, L"ProgramData", buf); + } } else {

1 0