March 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : amstream: Return E_INVALIDARG if AMMSF_ADDDEFAULTRENDERER is requested with a non-NULL ret_stream parameter.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: 2227facdd67e809e6fe43142edf556c9c053a9af URL: https://source.winehq.org/git/wine.git/?a=commit;h=2227facdd67e809e6fe43142… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 17:19:16 2020 -0600 amstream: Return E_INVALIDARG if AMMSF_ADDDEFAULTRENDERER is requested with a non-NULL ret_stream parameter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 3 +++ dlls/amstream/tests/amstream.c | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 48abcaf8b4..6fb3ebd17c 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -307,6 +307,9 @@ static HRESULT WINAPI multimedia_stream_AddMediaStream(IAMMultiMediaStream *ifac { IBaseFilter *dsound_render; + if (ret_stream) + return E_INVALIDARG; + if (!IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) { WARN("AMMSF_ADDDEFAULTRENDERER requested with id %s, returning MS_E_PURPOSEID.\n", debugstr_guid(PurposeId)); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 16663bf441..f9d348c6e0 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -798,7 +798,7 @@ static void test_add_stream(void) hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, AMMSF_ADDDEFAULTRENDERER, &video_stream); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, AMMSF_ADDDEFAULTRENDERER, NULL); @@ -806,7 +806,7 @@ static void test_add_stream(void) hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, &audio_stream); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, AMMSF_ADDDEFAULTRENDERER, NULL); @@ -827,9 +827,9 @@ static void test_add_stream(void) hr = IGraphBuilder_EnumFilters(graph, &enum_filters); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumFilters_Next(enum_filters, 3, filters, &count); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); - todo_wine ok(count == 2, "Got count %u.\n", count); - todo_wine ok(filters[1] == (IBaseFilter *)stream_filter, + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + ok(filters[1] == (IBaseFilter *)stream_filter, "Expected filter %p, got %p.\n", stream_filter, filters[1]); hr = IBaseFilter_GetClassID(filters[0], &clsid); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: 3b0db0ce34b9696c5e4336edccae975617358fbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b0db0ce34b9696c5e4336ed… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Mar 4 09:19:57 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/lt.po b/po/lt.po index 24529763a0..24b9a18c50 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,11 +1,11 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011-2020. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-02-26 10:03+0200\n" +"PO-Revision-Date: 2020-03-04 09:19+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -8437,7 +8437,7 @@ msgstr "Išrinkite tiekėją." msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." -msgstr "" +msgstr "Tiekėjas nebeprieinamas. Įsitikinkite, kad tiekėjas įdiegtas tinkamai." #: version.rc:36 msgid "Data Link Properties"

1 0

Sven Baars : d3dx9: Add a very basic ID3DXFont_DrawText implementation.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: 316a8d0ae11ae1a9654bc731d2c9dc23febc7a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=316a8d0ae11ae1a9654bc731… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Mar 3 09:38:28 2020 +0100 d3dx9: Add a very basic ID3DXFont_DrawText implementation. Based on a patch by Tony Wasserka. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 128 ++++++++++++++++++++++++++++++++++++++++++--- dlls/d3dx9_36/tests/core.c | 59 ++++++++++----------- 2 files changed, 149 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=316a8d0ae11ae1a9654b…

1 0

Nikolay Sivov : mf/tests: Fix a test failure on older versions.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: 044520a4f77dc04cc2b2853d492fd2219e84c67f URL: https://source.winehq.org/git/wine.git/?a=commit;h=044520a4f77dc04cc2b2853d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 4 11:06:07 2020 +0300 mf/tests: Fix a test failure on older versions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index aa72e71292..cf98f3d03f 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1138,7 +1138,7 @@ todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaSession_GetClock(session, &clock); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN || broken(hr == E_UNEXPECTED) /* Win7 */, "Unexpected hr %#x.\n", hr); hr = IMFMediaSession_GetSessionCapabilities(session, &caps); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : include: Fix VMR9AlphaBitmap definition.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: 83db71eb13ead4b3451ffa611276ecc3d281446b URL: https://source.winehq.org/git/wine.git/?a=commit;h=83db71eb13ead4b3451ffa61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 4 17:41:13 2020 +0300 include: Fix VMR9AlphaBitmap definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vmr9.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vmr9.idl b/include/vmr9.idl index 5340273f91..98524b0e75 100644 --- a/include/vmr9.idl +++ b/include/vmr9.idl @@ -272,7 +272,7 @@ typedef struct _VMR9AlphaBitmap HDC hdc; IDirect3DSurface9 *pDDS; RECT rSrc; - VMR9NormalizedRect *rDest; + VMR9NormalizedRect rDest; FLOAT fAlpha; COLORREF clrSrcKey; DWORD dwFilterMode;

1 0

Piotr Caban : winemac: Fix leaks in macdrv_surface_destroy.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: c4becb85f17c1406ff8d05aca5ecabaa8d304b48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4becb85f17c1406ff8d05ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 4 18:22:23 2020 +0100 winemac: Fix leaks in macdrv_surface_destroy. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/surface.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 73daecaa81..9850c92aaa 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -208,6 +208,9 @@ static void macdrv_surface_destroy(struct window_surface *window_surface) struct macdrv_window_surface *surface = get_mac_surface(window_surface); TRACE("freeing %p bits %p\n", surface, surface->bits); + if (surface->region) DeleteObject(surface->region); + if (surface->drawn) DeleteObject(surface->drawn); + HeapFree(GetProcessHeap(), 0, surface->blit_data); HeapFree(GetProcessHeap(), 0, surface->bits); pthread_mutex_destroy(&surface->mutex); HeapFree(GetProcessHeap(), 0, surface);

1 0

Nikolay Sivov : include: Add some types used for MF pipeline objects.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: 43f608851f0991dea07f3e3756e74b095fe4616d URL: https://source.winehq.org/git/wine.git/?a=commit;h=43f608851f0991dea07f3e37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 4 12:16:56 2020 +0300 include: Add some types used for MF pipeline objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index e27294d488..82f69518df 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -82,6 +82,16 @@ typedef enum MFSESSION_GETFULLTOPOLOGY_FLAGS MFSESSION_GETFULLTOPOLOGY_CURRENT = 0x00000001, } MFSESSION_GETFULLTOPOLOGY_FLAGS; +typedef enum _MF_CONNECT_METHOD +{ + MF_CONNECT_DIRECT = 0x00000000, + MF_CONNECT_ALLOW_CONVERTER = 0x00000001, + MF_CONNECT_ALLOW_DECODER = 0x00000003, + MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES = 0x00000004, + MF_CONNECT_AS_OPTIONAL = 0x00010000, + MF_CONNECT_AS_OPTIONAL_BRANCH = 0x00020000, +} MF_CONNECT_METHOD; + typedef enum _MF_TOPOLOGY_RESOLUTION_STATUS_FLAGS { MF_TOPOLOGY_RESOLUTION_SUCCEEDED = 0x00000000, @@ -640,6 +650,19 @@ interface IMFMediaSource : IMFMediaEventGenerator HRESULT Shutdown(); } +[ + object, + uuid(3c9b2eb9-86d5-4514-a394-f56664f9f0d8) +] +interface IMFMediaSourceEx : IMFMediaSource +{ + HRESULT GetSourceAttributes([out] IMFAttributes **attributes); + HRESULT GetStreamAttributes( + [in] DWORD streamid, + [out] IMFAttributes **attributes); + HRESULT SetD3DManager([in] IUnknown *manager); +} + [ object, uuid(d182108f-4ec6-443f-aa42-a71106ec825f), @@ -689,6 +712,16 @@ interface IMFPresentationClock : IMFClock HRESULT Pause(); } +[ + object, + uuid(6ef2a662-47c0-4666-b13d-cbb717f2fa2c) +] +interface IMFClockConsumer : IUnknown +{ + HRESULT SetPresentationClock([in] IMFPresentationClock *clock); + HRESULT GetPresentationClock([out] IMFPresentationClock **clock); +} + cpp_quote("#define MEDIASINK_FIXED_STREAMS 0x00000001") cpp_quote("#define MEDIASINK_CANNOT_MATCH_CLOCK 0x00000002") cpp_quote("#define MEDIASINK_RATELESS 0x00000004") @@ -730,6 +763,26 @@ interface IMFFinalizableMediaSink : IMFMediaSink HRESULT EndFinalize([in] IMFAsyncResult *result); } +[ + object, + uuid(5dfd4b2a-7674-4110-a4e6-8a68fd5f3688) +] +interface IMFMediaSinkPreroll : IUnknown +{ + HRESULT NotifyPreroll([in] MFTIME start_time); +} + +[ + object, + uuid(9db7aa41-3cc5-40d4-8509-555804ad34cc) +] +interface IMFStreamingSinkConfig : IUnknown +{ + HRESULT StartStreaming( + [in] BOOL is_byte_offset, + [in] QWORD seek_offset); +} + [ object, uuid(0a97b3cf-8e7c-4a3d-8f8c-0c843dc247fb), @@ -786,6 +839,62 @@ interface IMFQualityManager : IUnknown HRESULT Shutdown(); } +typedef enum _MF_QUALITY_DROP_MODE +{ + MF_DROP_MODE_NONE, + MF_DROP_MODE_1, + MF_DROP_MODE_2, + MF_DROP_MODE_3, + MF_DROP_MODE_4, + MF_DROP_MODE_5, + MF_NUM_DROP_MODES +} MF_QUALITY_DROP_MODE; + +typedef enum _MF_QUALITY_LEVEL +{ + MF_QUALITY_NORMAL, + MF_QUALITY_NORMAL_MINUS_1, + MF_QUALITY_NORMAL_MINUS_2, + MF_QUALITY_NORMAL_MINUS_3, + MF_QUALITY_NORMAL_MINUS_4, + MF_QUALITY_NORMAL_MINUS_5, + MF_NUM_QUALITY_LEVELS +} MF_QUALITY_LEVEL; + +[ + object, + uuid(ec15e2e9-e36b-4f7c-8758-77d452ef4ce7) +] +interface IMFQualityAdvise : IUnknown +{ + HRESULT SetDropMode([in] MF_QUALITY_DROP_MODE mode); + HRESULT SetQualityLevel([in] MF_QUALITY_LEVEL level); + HRESULT GetDropMode([out] MF_QUALITY_DROP_MODE *mode); + HRESULT GetQualityLevel([out] MF_QUALITY_LEVEL *level); + HRESULT DropTime([in] LONGLONG interval); +} + +[ + object, + uuid(f3706f0d-8ea2-4886-8000-7155e9ec2eae) +] +interface IMFQualityAdvise2 : IMFQualityAdvise +{ + HRESULT NotifyQualityEvent( + [in] IMFMediaEvent *event, + [out] DWORD *flags); +} + +[ + object, + uuid(dfcd8e4d-30b5-4567-acaa-8eb5b7853dc9) +] +interface IMFQualityAdviseLimits : IUnknown +{ + HRESULT GetMaximumDropMode([out] MF_QUALITY_DROP_MODE *mode); + HRESULT GetMinimumQualityLevel([out] MF_QUALITY_LEVEL *level); +} + typedef struct _MFT_REGISTRATION_INFO { CLSID clsid;

1 0

Ziqing Hui : comctl32/tests: Remove duplicate line in imagelist.c.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: d26a23d7405ee45ef15f06ec13eb3d3c076ae4d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d26a23d7405ee45ef15f06ec… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Mar 4 11:21:20 2020 +0800 comctl32/tests: Remove duplicate line in imagelist.c. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index aa563574ed..d4da38b151 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2460,7 +2460,6 @@ static void init_functions(void) X(ImageList_AddMasked); X(ImageList_DrawIndirect); X(ImageList_SetImageCount); - X(ImageList_SetImageCount); X2(ImageList_SetColorTable, 390); X(ImageList_GetFlags); X(ImageList_BeginDrag);

1 0

Giovanni Mascellani : d2d1: Implement ellipse and rounded rectangle filling with arcs.
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: a6bf2c429eb726aef9cb01da49f51d952d31ce4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6bf2c429eb726aef9cb01da… Author: Giovanni Mascellani <gio(a)debian.org> Date: Tue Mar 3 18:59:46 2020 +0100 d2d1: Implement ellipse and rounded rectangle filling with arcs. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 3 +- dlls/d2d1/d2d1_private.h | 15 ++++--- dlls/d2d1/device.c | 111 ++++++++++++++++++++++++++++++++--------------- dlls/d2d1/geometry.c | 30 ++++++------- dlls/d2d1/tests/d2d1.c | 14 +++--- 5 files changed, 110 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6bf2c429eb726aef9cb…

1 0

Zebediah Figura : kernel32: Reimplement CreateHardLink() on top of NtSetInformationFile(FileLinkInformation).
by Alexandre Julliard March 4, 2020

March 4, 2020

Module: wine Branch: master Commit: 4e98b0810bb0fcaf5e3acae0f4eccf38710de9b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e98b0810bb0fcaf5e3acae0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 23:20:37 2020 -0600 kernel32: Reimplement CreateHardLink() on top of NtSetInformationFile(FileLinkInformation). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index c50b631d7c..617b14a717 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -663,10 +663,13 @@ BOOL WINAPI MoveFileA( LPCSTR source, LPCSTR dest ) BOOL WINAPI CreateHardLinkW(LPCWSTR lpFileName, LPCWSTR lpExistingFileName, LPSECURITY_ATTRIBUTES lpSecurityAttributes) { - NTSTATUS status; UNICODE_STRING ntDest, ntSource; - ANSI_STRING unixDest, unixSource; + FILE_LINK_INFORMATION *info = NULL; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; BOOL ret = FALSE; + HANDLE file; + ULONG size; TRACE("(%s, %s, %p)\n", debugstr_w(lpFileName), debugstr_w(lpExistingFileName), lpSecurityAttributes); @@ -679,37 +682,30 @@ BOOL WINAPI CreateHardLinkW(LPCWSTR lpFileName, LPCWSTR lpExistingFileName, goto err; } - unixSource.Buffer = unixDest.Buffer = NULL; - status = wine_nt_to_unix_file_name( &ntSource, &unixSource, FILE_OPEN, FALSE ); - if (!status) + size = offsetof( FILE_LINK_INFORMATION, FileName ) + ntDest.Length; + if (!(info = HeapAlloc( GetProcessHeap(), 0, size ))) { - status = wine_nt_to_unix_file_name( &ntDest, &unixDest, FILE_CREATE, FALSE ); - if (!status) /* destination must not exist */ - { - status = STATUS_OBJECT_NAME_EXISTS; - } else if (status == STATUS_NO_SUCH_FILE) - { - status = STATUS_SUCCESS; - } + SetLastError( ERROR_OUTOFMEMORY ); + goto err; } - if (status) - SetLastError( RtlNtStatusToDosError(status) ); - else if (!link( unixSource.Buffer, unixDest.Buffer )) - { - TRACE("Hardlinked '%s' to '%s'\n", debugstr_a( unixDest.Buffer ), - debugstr_a( unixSource.Buffer )); - ret = TRUE; - } - else - FILE_SetDosError(); + InitializeObjectAttributes( &attr, &ntSource, OBJ_CASE_INSENSITIVE, 0, NULL ); + if (!(ret = set_ntstatus( NtOpenFile( &file, SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT ) ))) + goto err; + + info->ReplaceIfExists = FALSE; + info->RootDirectory = NULL; + info->FileNameLength = ntDest.Length; + memcpy( info->FileName, ntDest.Buffer, ntDest.Length ); + ret = set_ntstatus( NtSetInformationFile( file, &io, info, size, FileLinkInformation ) ); - RtlFreeAnsiString( &unixSource ); - RtlFreeAnsiString( &unixDest ); + NtClose( file ); err: RtlFreeUnicodeString( &ntSource ); RtlFreeUnicodeString( &ntDest ); + HeapFree( GetProcessHeap(), 0, info ); return ret; }

1 0