April 2022 - Wine-commits - list.winehq.org

Huw Davies : wineoss: Move is_started to the unixlib.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: wine Branch: master Commit: 4b469fe157244821319489070d2401ffdb37eb94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b469fe15724482131948907… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 21:40:42 2022 +0100 wineoss: Move is_started to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 8 ++++---- dlls/wineoss.drv/oss.c | 11 +++++++++++ dlls/wineoss.drv/unixlib.h | 7 +++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c921b4975c9..cdd9b09bff7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1596,6 +1596,7 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, AudioSessionState *state) { AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); + struct is_started_params params; ACImpl *client; TRACE("(%p)->(%p)\n", This, state); @@ -1612,14 +1613,13 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, } LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry){ - oss_lock(client->stream); - if(client->stream->playing){ + params.stream = client->stream; + OSS_CALL(is_started, &params); + if(params.result == S_OK){ *state = AudioSessionStateActive; - oss_unlock(client->stream); LeaveCriticalSection(&g_sessions_lock); return S_OK; } - oss_unlock(client->stream); } LeaveCriticalSection(&g_sessions_lock); diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index a39b0bc4f66..79f2e994d89 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1336,6 +1336,16 @@ static NTSTATUS set_event_handle(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS is_started(void *args) +{ + struct is_started_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + return oss_unlock_result(stream, &params->result, stream->playing ? S_OK : S_FALSE); +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, @@ -1359,4 +1369,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_frequency, get_position, set_event_handle, + is_started, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 982b11ec44f..ed93f0836b1 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -215,6 +215,12 @@ struct set_event_handle_params HRESULT result; }; +struct is_started_params +{ + struct oss_stream *stream; + HRESULT result; +}; + enum oss_funcs { oss_test_connect, @@ -238,6 +244,7 @@ enum oss_funcs oss_get_frequency, oss_get_position, oss_set_event_handle, + oss_is_started, }; extern unixlib_handle_t oss_handle;

1 0

Huw Davies : wineoss: Move set_volumes to the unixlib.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: wine Branch: master Commit: 1a2482be2dce854bed01bcf0202be0eb7cef8931 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a2482be2dce854bed01bcf0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 21:40:43 2022 +0100 wineoss: Move set_volumes to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 35 ++++++----------------------------- dlls/wineoss.drv/oss.c | 35 +++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 31 ++++++++++--------------------- 3 files changed, 51 insertions(+), 50 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index cdd9b09bff7..9e3380ca8d9 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -18,22 +18,7 @@ */ #define COBJMACROS -#include "config.h" - #include <stdarg.h> -#include <errno.h> -#include <limits.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/ioctl.h> -#include <fcntl.h> -#include <unistd.h> -#include <math.h> -#include <sys/soundcard.h> -#include <pthread.h> #include "windef.h" #include "winbase.h" @@ -277,16 +262,6 @@ static DWORD WINAPI timer_thread(void *user) return 0; } -static void oss_lock(struct oss_stream *stream) -{ - pthread_mutex_lock(&stream->lock); -} - -static void oss_unlock(struct oss_stream *stream) -{ - pthread_mutex_unlock(&stream->lock); -} - static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -361,11 +336,13 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) static void set_stream_volumes(ACImpl *This) { - struct oss_stream *stream = This->stream; + struct set_volumes_params params; - oss_lock(stream); - stream->mute = This->session->mute; - oss_unlock(stream); + params.stream = This->stream; + params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol); + params.volumes = This->vols; + params.session_volumes = This->session->channel_vols; + OSS_CALL(set_volumes, &params); } static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 79f2e994d89..b4e2cbda704 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -44,6 +44,28 @@ #include "unixlib.h" +struct oss_stream +{ + WAVEFORMATEX *fmt; + EDataFlow flow; + UINT flags; + AUDCLNT_SHAREMODE share; + HANDLE event; + + int fd; + + BOOL playing, mute, please_quit; + UINT64 written_frames, last_pos_frames; + UINT32 period_frames, bufsize_frames, held_frames, tmp_buffer_frames, in_oss_frames; + UINT32 oss_bufsize_bytes, lcl_offs_frames; /* offs into local_buffer where valid data starts */ + REFERENCE_TIME period; + + BYTE *local_buffer, *tmp_buffer; + INT32 getbuf_last; /* <0 when using tmp_buffer */ + + pthread_mutex_t lock; +}; + WINE_DEFAULT_DEBUG_CHANNEL(oss); /* copied from kernelbase */ @@ -1316,6 +1338,18 @@ static NTSTATUS get_position(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS set_volumes(void *args) +{ + struct set_volumes_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + stream->mute = !params->master_volume; + oss_unlock(stream); + + return STATUS_SUCCESS; +} + static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; @@ -1368,6 +1402,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_next_packet_size, get_frequency, get_position, + set_volumes, set_event_handle, is_started, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index ed93f0836b1..1ed152fe794 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -18,27 +18,7 @@ #include "mmdeviceapi.h" -struct oss_stream -{ - WAVEFORMATEX *fmt; - EDataFlow flow; - UINT flags; - AUDCLNT_SHAREMODE share; - HANDLE event; - - int fd; - - BOOL playing, mute, please_quit; - UINT64 written_frames, last_pos_frames; - UINT32 period_frames, bufsize_frames, held_frames, tmp_buffer_frames, in_oss_frames; - UINT32 oss_bufsize_bytes, lcl_offs_frames; /* offs into local_buffer where valid data starts */ - REFERENCE_TIME period; - - BYTE *local_buffer, *tmp_buffer; - INT32 getbuf_last; /* <0 when using tmp_buffer */ - - pthread_mutex_t lock; -}; +struct stream_oss; /* From <dlls/mmdevapi/mmdevapi.h> */ enum DriverPriority @@ -208,6 +188,14 @@ struct get_position_params UINT64 *qpctime; }; +struct set_volumes_params +{ + struct oss_stream *stream; + float master_volume; + const float *volumes; + const float *session_volumes; +}; + struct set_event_handle_params { struct oss_stream *stream; @@ -243,6 +231,7 @@ enum oss_funcs oss_get_next_packet_size, oss_get_frequency, oss_get_position, + oss_set_volumes, oss_set_event_handle, oss_is_started, };

1 0

Brendan Shanks : wow64cpu: Use different JMP instruction to work around Rosetta bug.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: wine Branch: master Commit: 6d19495ed7baea31dc27a46bcd039db8152d274b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d19495ed7baea31dc27a46b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 14 10:19:07 2022 -0700 wow64cpu: Use different JMP instruction to work around Rosetta bug. Rosetta 2 on macOS 11 and 12 (before 12.4) does not support the 0xEA JMP instruction, use the indirect form instead. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64cpu/cpu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index a029b251be0..34c3f3ad493 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -33,7 +33,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wow); #include "pshpack1.h" struct thunk_32to64 { - BYTE ljmp; /* ljmp %cs:1f */ + BYTE ljmp; /* jump far, absolute indirect */ + BYTE modrm; /* address=disp32, opcode=5 */ + DWORD op; DWORD addr; WORD cs; }; @@ -195,7 +197,9 @@ NTSTATUS WINAPI BTCpuProcessInit(void) ds64_sel = context.SegDs; fs32_sel = context.SegFs; - thunk->ljmp = 0xea; + thunk->ljmp = 0xff; + thunk->modrm = 0x2d; + thunk->op = PtrToUlong( &thunk->addr ); thunk->addr = PtrToUlong( syscall_32to64 ); thunk->cs = cs64_sel; NtProtectVirtualMemory( GetCurrentProcess(), (void **)&thunk, &size, PAGE_EXECUTE_READ, &old_prot );

1 0

Brendan Shanks : ntdll/tests: Test that threads have unique TEBs.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: wine Branch: master Commit: 6d4ec1255acceec7152ed98764ee29991ac04f10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d4ec1255acceec7152ed987… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Apr 18 11:25:10 2022 -0700 ntdll/tests: Test that threads have unique TEBs. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/thread.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/ntdll/tests/thread.c b/dlls/ntdll/tests/thread.c index a41b1f2cc6a..7a47486a3b6 100644 --- a/dlls/ntdll/tests/thread.c +++ b/dlls/ntdll/tests/thread.c @@ -118,9 +118,45 @@ static void test_dbg_hidden_thread_creation(void) CloseHandle( thread ); } +static void CALLBACK test_unique_teb_proc(void *param) +{ + TEB **teb = param; + *teb = NtCurrentTeb(); +} + +static void test_unique_teb(void) +{ + HANDLE threads[2]; + TEB *teb1, *teb2; + NTSTATUS status; + + if (!pNtCreateThreadEx) + { + win_skip( "NtCreateThreadEx is not available.\n" ); + return; + } + + status = pNtCreateThreadEx( &threads[0], THREAD_ALL_ACCESS, NULL, GetCurrentProcess(), test_unique_teb_proc, + &teb1, 0, 0, 0, 0, NULL ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); + + status = pNtCreateThreadEx( &threads[1], THREAD_ALL_ACCESS, NULL, GetCurrentProcess(), test_unique_teb_proc, + &teb2, 0, 0, 0, 0, NULL ); + ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status ); + + WaitForMultipleObjects( 2, threads, TRUE, INFINITE ); + CloseHandle( threads[0] ); + CloseHandle( threads[1] ); + + ok( NtCurrentTeb() != teb1, "Multiple threads have TEB %p.\n", teb1 ); + ok( NtCurrentTeb() != teb2, "Multiple threads have TEB %p.\n", teb2 ); + ok( teb1 != teb2, "Multiple threads have TEB %p.\n", teb1 ); +} + START_TEST(thread) { init_function_pointers(); test_dbg_hidden_thread_creation(); + test_unique_teb(); }

1 0

Francois Gouget : conhost: Fix the spelling of a couple of comments.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: wine Branch: master Commit: 7b63a5f44606cc4f6458c07175f6710513bfda9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b63a5f44606cc4f6458c071… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 16 13:12:35 2022 +0200 conhost: Fix the spelling of a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 +- programs/conhost/conhost.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 6ea64395e1a..792daeb520f 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -328,7 +328,7 @@ static void init_tty_output( struct console *console ) console->tty_cursor_visible = TRUE; } -/* no longer use relative cursor positionning (legacy API have been used) */ +/* no longer use relative cursor positioning (legacy API have been used) */ static void enter_absolute_mode( struct console *console ) { console->use_relative_cursor = 0; diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 65cf5d39ebd..9f2a90cd510 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -78,7 +78,7 @@ struct console unsigned int mode; /* input mode */ struct screen_buffer *active; /* active screen buffer */ int is_unix; /* UNIX terminal mode */ - int use_relative_cursor; /* use relative cursor positionning */ + int use_relative_cursor; /* use relative cursor positioning */ int no_window; /* don't create console window */ INPUT_RECORD *records; /* input records */ unsigned int record_count; /* number of input records */

1 0

Francois Gouget : winegstreamer: Fix the spelling of a comment.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: wine Branch: master Commit: 86e0a2489a7e82bff3eb751094661270a40a2167 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86e0a2489a7e82bff3eb7510… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 16 13:12:30 2022 +0200 winegstreamer: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_transform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 0327b92ce8e..49c7bfaa927 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -218,7 +218,7 @@ NTSTATUS wg_transform_create(void *args) { case WG_MAJOR_TYPE_H264: /* Call of Duty: Black Ops 3 doesn't care about the ProcessInput/ProcessOutput - * return values, it calls them in a specific order and and expects the decoder + * return values, it calls them in a specific order and expects the decoder * transform to be able to queue its input buffers. We need to use a buffer list * to match its expectations. */

1 0

Francois Gouget : crypt32/tests: Fix the spelling of an ok() message.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: wine Branch: master Commit: 2fa950f6b70916e12ea6a079c5c9dfb9f51bd093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fa950f6b70916e12ea6a079… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 16 13:12:24 2022 +0200 crypt32/tests: Fix the spelling of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/object.c b/dlls/crypt32/tests/object.c index 0fd082c57db..22936d3738d 100644 --- a/dlls/crypt32/tests/object.c +++ b/dlls/crypt32/tests/object.c @@ -316,7 +316,7 @@ static void test_query_object(void) ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, &content_type, NULL, NULL, NULL, NULL); - ok(!ret, "CryptQueryObject succeded\n"); + ok(!ret, "CryptQueryObject succeeded\n"); ok(GetLastError() == CRYPT_E_NO_MATCH, "Unexpected error %lu.\n", GetLastError()); SetEnvironmentVariableW(L"TMP", tmp_path);

1 0

Jinoh Kang : include: Remove duplicate definitions of UOI_* macros.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: wine Branch: master Commit: 949edcec172cc690100394433afba3d9c714f2fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=949edcec172cc69010039443… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Apr 17 00:24:42 2022 +0900 include: Remove duplicate definitions of UOI_* macros. Commit 5ec458fd41f (Add declarations for GetClassLongPtr{A,W}, GCLP_* defines and user object information defines., 2004-10-14) inadvertently introduced duplicate definitions of UOI_* macros. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 4f79face860..f9af7db0331 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2874,12 +2874,6 @@ typedef struct { #define DSS_PREFIXONLY 0x0400 #define DSS_RIGHT 0x8000 -/* UserObjectInformation classes */ -#define UOI_FLAGS 1 -#define UOI_NAME 2 -#define UOI_TYPE 3 -#define UOI_USER_SID 4 - /* Sent as the lParam of a WM_DRAWITEM message to instruct how an * owner drawn control is to be drawn */

1 0

Jacek Caban : win32u: Use winuser.h inline rect helpers.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: wine Branch: master Commit: 62e51da2cdb6bf033c6820db93002b68873aca93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62e51da2cdb6bf033c6820db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:05:36 2022 +0200 win32u: Use winuser.h inline rect helpers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/bitblt.c | 26 +++++++++++++------------- dlls/win32u/clipping.c | 8 ++++---- dlls/win32u/dc.c | 4 ++-- dlls/win32u/dce.c | 8 ++++---- dlls/win32u/dib.c | 14 +++++++------- dlls/win32u/dibdrv/bitblt.c | 10 +++++----- dlls/win32u/dibdrv/dc.c | 12 ++++++------ dlls/win32u/dibdrv/objects.c | 10 +++++----- dlls/win32u/dibdrv/primitives.c | 14 +++++++------- dlls/win32u/font.c | 2 +- dlls/win32u/ntgdi_private.h | 35 +++++------------------------------ dlls/win32u/painting.c | 2 +- dlls/win32u/sysparams.c | 4 ++-- dlls/win32u/window.c | 36 ++++++++++++++++++------------------ 14 files changed, 80 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=62e51da2cdb6bf033c68…

1 0

Jacek Caban : ntdll: Provide RtlInitUnicodeString for unixlibs.
by Alexandre Julliard 18 Apr '22

18 Apr '22

Module: wine Branch: master Commit: 1c0288413a5dc5ab2f1f38855885de2bd18643c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c0288413a5dc5ab2f1f3885… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 14:05:53 2022 +0200 ntdll: Provide RtlInitUnicodeString for unixlibs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index ee958ae71f4..5b192f39732 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2356,6 +2356,15 @@ NTSTATUS WINAPI RtlUnicodeToUTF8N( char *dst, DWORD dstlen, DWORD *reslen, const return status; } +/********************************************************************** + * RtlInitUnicodeString (ntdll.so) + */ +void WINAPI RtlInitUnicodeString( UNICODE_STRING *str, const WCHAR *data ) +{ + if (data) init_unicode_string( str, data ); + else str->Length = str->MaximumLength = 0; +} + /********************************************************************** * RtlNtStatusToDosError (ntdll.so) */

1 0