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

Julian Rüger : German translation for release 5.6.
by Alexandre Julliard 30 Apr '20

30 Apr '20

Module: website Branch: master Commit: aabbaebc0726717ae253ba5e4159ac62a28d9b14 URL: https://source.winehq.org/git/website.git/?a=commit;h=aabbaebc0726717ae253b… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Apr 30 16:33:16 2020 +0200 German translation for release 5.6. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020041001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2020041001.xml b/news/de/2020041001.xml new file mode 100644 index 00000000..bfba13e0 --- /dev/null +++ b/news/de/2020041001.xml @@ -0,0 +1,16 @@ +<news> +<date>10. April 2020</date> +<title>Wine 5.6 freigegeben</title> +<body> + Die Entwicklungsversion 5.6 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.6">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Weitere Arbeit an der Media-Foundation.</li> + <li>Verbesserung der Active-Directory-LDAP-Unterstützung.</li> + <li>Eine kleine Zahl weiterer Module nach PE konvertiert.</li> + <li>Verbesserung des GDB-Proxymodus.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.6.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Jacek Caban : winbase.h: Support using int for LONG in MSVC interlocked functions.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: c49fb1ecc9774c382abbec223853bf9573f90944 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c49fb1ecc9774c382abbec22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 28 20:51:54 2020 +0200 winbase.h: Support using int for LONG in MSVC interlocked functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 53 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 1d8e32d6cb..1f36782d20 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2913,19 +2913,42 @@ extern WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ); #pragma intrinsic(_InterlockedIncrement) #pragma intrinsic(_InterlockedDecrement) -#define InterlockedCompareExchange _InterlockedCompareExchange -#define InterlockedCompareExchange64 _InterlockedCompareExchange64 -#define InterlockedExchange _InterlockedExchange -#define InterlockedExchangeAdd _InterlockedExchangeAdd -#define InterlockedIncrement _InterlockedIncrement -#define InterlockedDecrement _InterlockedDecrement - -long InterlockedCompareExchange(long volatile*,long,long); -long long InterlockedCompareExchange64(long long volatile*,long long,long long); -long InterlockedDecrement(long volatile*); -long InterlockedExchange(long volatile*,long); -long InterlockedExchangeAdd(long volatile*,long); -long InterlockedIncrement(long volatile*); +long _InterlockedCompareExchange(long volatile*,long,long); +long long _InterlockedCompareExchange64(long long volatile*,long long,long long); +long _InterlockedDecrement(long volatile*); +long _InterlockedExchange(long volatile*,long); +long _InterlockedExchangeAdd(long volatile*,long); +long _InterlockedIncrement(long volatile*); + +static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) +{ + return _InterlockedCompareExchange( (long volatile *)dest, xchg, compare ); +} + +static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) +{ + return _InterlockedCompareExchange64( (long long volatile *)dest, compare, xchg ); +} + +static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) +{ + return _InterlockedExchange( (long volatile *)dest, val ); +} + +static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +{ + return _InterlockedExchangeAdd( (long volatile *)dest, incr ); +} + +static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) +{ + return _InterlockedIncrement( (long volatile *)dest ); +} + +static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) +{ + return _InterlockedDecrement( (long volatile *)dest ); +} #ifndef __i386__ @@ -2942,12 +2965,12 @@ void *InterlockedExchangePointer(void *volatile*,void*); static FORCEINLINE void *WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) { - return (void *)InterlockedCompareExchange( (long volatile*)dest, (long)xchg, (long)compare ); + return (void *)_InterlockedCompareExchange( (long volatile*)dest, (long)xchg, (long)compare ); } static FORCEINLINE void *WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) { - return (void *)InterlockedExchange( (long volatile*)dest, (long)val ); + return (void *)_InterlockedExchange( (long volatile*)dest, (long)val ); } #endif

1 0

Vijay Kiran Kamuju : include: Add IWbemRefresher related interfaces.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: 5d4db497adbb86c31a2d23dc857a8f1987e64331 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d4db497adbb86c31a2d23dc… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 29 12:50:40 2020 +0200 include: Add IWbemRefresher related interfaces. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49044 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wbemcli.idl | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 5b5ca61bec..4a2c1f785c 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -255,6 +255,12 @@ typedef [v1_enum] enum tag_CIMTYPE_ENUMERATION CIM_FLAG_ARRAY = 0x2000 } CIMTYPE_ENUMERATION; +typedef [v1_enum] enum tag_WBEM_REFRESHER_FLAGS +{ + WBEM_FLAG_REFRESH_AUTO_RECONNECT = 0, + WBEM_FLAG_REFRESH_NO_AUTO_RECONNECT = 1 +} WBEM_REFRESHER_FLAGS; + typedef long CIMTYPE; [ @@ -761,6 +767,141 @@ interface IWbemUnsecuredApartment : IUnsecuredApartment [out] IWbemObjectSink **stub); }; +[ + object, + restricted, + local, + uuid(49353c9a-516b-11d1-aea6-00c04fb68820) +] +interface IWbemObjectAccess : IWbemClassObject +{ + HRESULT GetPropertyHandle( + [in, string] LPCWSTR wszPropertyName, + [out] CIMTYPE *pType, + [out] long *plHandle); + + HRESULT WritePropertyValue( + [in] long lHandle, + [in] long lNumBytes, + [in, size_is(lNumBytes)] const byte *aData); + + HRESULT ReadPropertyValue( + [in] long lHandle, + [in] long lBufferSize, + [out] long *plNumBytes, + [out, size_is(lBufferSize), length_is(*plNumBytes)] byte *aData); + + HRESULT ReadDWORD( + [in] long lHandle, + [out] DWORD *pdw); + + HRESULT WriteDWORD( + [in] long lHandle, + [in] DWORD dw); + + HRESULT ReadQWORD( + [in] long lHandle, + [out] unsigned __int64 *pqw); + + HRESULT WriteQWORD( + [in] long lHandle, + [in] unsigned __int64 qw); + + HRESULT GetPropertyInfoByHandle( + [in] long lHandle, + [out] BSTR *pstrName, + [out] CIMTYPE *pType); + + HRESULT Lock( + [in] long lFlags); + + HRESULT Unlock( + [in] long lFlags); +}; + +[ + object, + restricted, + local, + uuid(49353c99-516b-11d1-aea6-00c04fb68820) +] +interface IWbemRefresher : IUnknown +{ + HRESULT Refresh( + [in] long lFlags); +}; + +[ + object, + restricted, + local, + uuid(2705c288-79ae-11d2-b348-00105a1f8177) +] +interface IWbemHiPerfEnum : IUnknown +{ + HRESULT AddObjects( + [in] long lFlags, + [in] ULONG uNumObjects, + [in, size_is(uNumObjects)] long *apIds, + [in, size_is(uNumObjects)] IWbemObjectAccess **apObj); + + HRESULT RemoveObjects( + [in] long lFlags, + [in] ULONG uNumObjects, + [in, size_is(uNumObjects)] long *apIds); + + HRESULT GetObjects( + [in] long lFlags, + [in] ULONG uNumObjects, + [out, size_is(uNumObjects), length_is(*puReturned)] IWbemObjectAccess **apObj, + [out] ULONG *puReturned); + + HRESULT RemoveAll( + [in] long lFlags); +}; + +[ + object, + restricted, + local, + uuid(49353c92-516b-11d1-aea6-00c04fb68820) +] +interface IWbemConfigureRefresher : IUnknown +{ + HRESULT AddObjectByPath( + [in] IWbemServices *pNamespace, + [in, string] LPCWSTR wszPath, + [in] long lFlags, + [in] IWbemContext *pContext, + [out] IWbemClassObject **ppRefreshable, + [out] long *plId); + + HRESULT AddObjectByTemplate( + [in] IWbemServices *pNamespace, + [in] IWbemClassObject *pTemplate, + [in] long lFlags, + [in] IWbemContext *pContext, + [out] IWbemClassObject **ppRefreshable, + [out] long *plId); + + HRESULT AddRefresher( + [in] IWbemRefresher *pRefresher, + [in] long lFlags, + [out] long *plId); + + HRESULT Remove( + [in] long lId, + [in] long lFlags); + + HRESULT AddEnum( + [in] IWbemServices *pNamespace, + [in, string] LPCWSTR wszClassName, + [in] long lFlags, + [in] IWbemContext *pContext, + [out] IWbemHiPerfEnum **ppEnum, + [out] long *plId); +}; + [ uuid(49bd2028-1523-11d1-ad79-00c04fd8fdff) ] @@ -785,3 +926,13 @@ coclass WbemStatusCodeText { interface IWbemStatusCodeText; }; + +[ + uuid(c71566f2-561e-11d1-ad87-00c04fd8fdff) +] +coclass WbemRefresher +{ + interface IMarshal; + interface IWbemRefresher; + interface IWbemConfigureRefresher; +};

1 0

Jeff Smith : gdiplus/tests: Indicate which encoder failed when attempting to save image.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: f3c03ecb82af7bb65c726891a8dfb1799b87d740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3c03ecb82af7bb65c726891… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Apr 28 16:25:07 2020 -0500 gdiplus/tests: Indicate which encoder failed when attempting to save image. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 956e55302a..5703db09b2 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5106,22 +5106,17 @@ static void test_CloneBitmapArea(void) static void test_supported_encoders(void) { - static const WCHAR bmp_mimetype[] = { 'i', 'm', 'a','g', 'e', '/', 'b', 'm', 'p',0 }; - static const WCHAR jpeg_mimetype[] = { 'i','m','a','g','e','/','j','p','e','g',0 }; - static const WCHAR gif_mimetype[] = { 'i','m','a','g','e','/','g','i','f',0 }; - static const WCHAR tiff_mimetype[] = { 'i','m','a','g','e','/','t','i','f','f',0 }; - static const WCHAR png_mimetype[] = { 'i','m','a','g','e','/','p','n','g',0 }; static const struct test_data { LPCWSTR mime; const GUID *format; } td[] = { - { bmp_mimetype, &ImageFormatBMP }, - { jpeg_mimetype, &ImageFormatJPEG }, - { gif_mimetype, &ImageFormatGIF }, - { tiff_mimetype, &ImageFormatTIFF }, - { png_mimetype, &ImageFormatPNG } + { L"image/bmp", &ImageFormatBMP }, + { L"image/jpeg", &ImageFormatJPEG }, + { L"image/gif", &ImageFormatGIF }, + { L"image/tiff", &ImageFormatTIFF }, + { L"image/png", &ImageFormatPNG } }; GUID format, clsid; BOOL ret; @@ -5147,7 +5142,7 @@ static void test_supported_encoders(void) ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); status = GdipSaveImageToStream((GpImage *)bm, stream, &clsid, NULL); - ok(status == Ok, "GdipSaveImageToStream error %d\n", status); + ok(status == Ok, "%s encoder, GdipSaveImageToStream error %d\n", wine_dbgstr_w(td[i].mime), status); IStream_Release(stream); }

1 0

Jeff Smith : gdiplus: Include palette when writing PNG indexed formats.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: 252a53825ae23d437bac656efece4914396022e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=252a53825ae23d437bac656e… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Apr 28 18:24:46 2020 -0500 gdiplus: Include palette when writing PNG indexed formats. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 32 +++++++++++++++++++-- dlls/gdiplus/tests/image.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f33e2328bf..4fd7d95a9c 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -53,11 +53,11 @@ static const struct WICBitmapPaletteType palette_type; } pixel_formats[] = { - { &GUID_WICPixelFormatBlackWhite, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, { &GUID_WICPixelFormat1bppIndexed, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, + { &GUID_WICPixelFormatBlackWhite, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, { &GUID_WICPixelFormat4bppIndexed, PixelFormat4bppIndexed, WICBitmapPaletteTypeFixedHalftone8 }, - { &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 }, { &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 }, { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat32bppBGR, PixelFormat32bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, @@ -126,6 +126,31 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT return palette; } +static HRESULT set_palette(IWICBitmapFrameEncode *frame, ColorPalette *palette) +{ + HRESULT hr; + IWICImagingFactory *factory; + IWICPalette *wic_palette; + + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); + if (FAILED(hr)) + return hr; + + hr = IWICImagingFactory_CreatePalette(factory, &wic_palette); + IWICImagingFactory_Release(factory); + if (SUCCEEDED(hr)) + { + hr = IWICPalette_InitializeCustom(wic_palette, palette->Entries, palette->Count); + + if (SUCCEEDED(hr)) + hr = IWICBitmapFrameEncode_SetPalette(frame, wic_palette); + + IWICPalette_Release(wic_palette); + } + + return hr; +} + GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap* bitmap, CGpEffect* effect, RECT* roi, BOOL useAuxData, VOID** auxData, INT* auxDataSize) { @@ -4566,6 +4591,9 @@ static GpStatus encode_frame_wic(IWICBitmapEncoder *encoder, GpImage *image) } } + if (SUCCEEDED(hr) && IsIndexedPixelFormat(gdipformat) && image->palette) + hr = set_palette(frameencode, image->palette); + if (SUCCEEDED(hr)) { stat = GdipBitmapLockBits(bitmap, &rc, ImageLockModeRead, gdipformat, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 5703db09b2..f63346e1db 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5615,6 +5615,75 @@ static void test_png_color_formats(void) #undef PNG_COLOR_TYPE_GRAY_ALPHA #undef PNG_COLOR_TYPE_RGB_ALPHA +static void test_png_save_palette(void) +{ + GpStatus status; + GpBitmap *bitmap; + HGLOBAL hglob; + BOOL result; + IStream *stream; + GUID enc_format, clsid; + LARGE_INTEGER seek; + ULARGE_INTEGER pos; + UINT i, ptr; + BYTE *data; + + PixelFormat formats[] = { + PixelFormat1bppIndexed, + PixelFormat4bppIndexed, + PixelFormat8bppIndexed, + PixelFormat16bppGrayScale, + PixelFormat16bppRGB555, + PixelFormat16bppRGB565, + PixelFormat16bppARGB1555, + PixelFormat24bppRGB, + PixelFormat32bppRGB, + PixelFormat32bppARGB, + PixelFormat32bppPARGB, + }; + + result = get_encoder_clsid(L"image/png", &enc_format, &clsid); + ok(result, "getting PNG encoding clsid failed"); + + hglob = GlobalAlloc(GMEM_MOVEABLE | GMEM_NODISCARD | GMEM_ZEROINIT, 1024); + + for (i = 0; i < ARRAY_SIZE(formats); i++) + { + status = GdipCreateBitmapFromScan0(8, 8, 0, formats[i], NULL, &bitmap); + ok(status == Ok, "Unexpected return value %d creating bitmap for PixelFormat %#x\n", status, formats[i]); + + CreateStreamOnHGlobal(hglob, FALSE, &stream); + status = GdipSaveImageToStream((GpImage *)bitmap, stream, &clsid, NULL); + GdipDisposeImage((GpImage*)bitmap); + + todo_wine_if(formats[i] == PixelFormat16bppGrayScale) + ok(formats[i] == PixelFormat16bppGrayScale ? + (status == GenericError || status == Win32Error) : status == Ok, + "Unexpected return value %d saving image for PixelFormat %#x\n", status, formats[i]); + + if (status == Ok) + { + data = GlobalLock(hglob); + seek.QuadPart = 0; + IStream_Seek(stream, seek, STREAM_SEEK_CUR, &pos); + for (ptr = 0; ptr < pos.QuadPart - 4; ptr++) + if (!memcmp(data + ptr, "PLTE", 4)) + break; + memset(data, 0, 1024); + GlobalUnlock(hglob); + + if (IsIndexedPixelFormat(formats[i])) + ok(ptr < pos.QuadPart - 4, "Expected palette not found for PixelFormat %#x\n", formats[i]); + else + ok(ptr >= pos.QuadPart - 4, "Unexpected palette found for PixelFormat %#x\n", formats[i]); + } + + IStream_Release(stream); + } + + GlobalFree(hglob); +} + static void test_GdipLoadImageFromStream(void) { IStream *stream; @@ -5858,6 +5927,7 @@ START_TEST(image) test_GdipInitializePalette(); test_png_color_formats(); + test_png_save_palette(); test_supported_encoders(); test_CloneBitmapArea(); test_ARGB_conversion();

1 0

Rémi Bernon : devenum: Use free for memory allocated with wcsdup.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: 01dd935d1ec10570c9159632e1c60fcfb3029248 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01dd935d1ec10570c9159632… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 29 17:01:21 2020 +0200 devenum: Use free for memory allocated with wcsdup. The memory is otherwise released to the process heap, although msvcrt allocated it from its internal heap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index c0006ad53e..9176d8470d 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -323,7 +323,7 @@ static ULONG WINAPI moniker_Release(IMoniker *iface) TRACE("(%p) ref=%d\n", This, ref); if (ref == 0) { - CoTaskMemFree(This->name); + free(This->name); free(This); DEVENUM_UnlockModule(); }

1 0

Alexandre Julliard : ntdll: Use server_enter_uninterrupted_section() for LDT locking.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: 53b305c35e6cfb489e2e9f4996d36ae82cac5e6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=53b305c35e6cfb489e2e9f49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 29 19:53:57 2020 +0200 ntdll: Use server_enter_uninterrupted_section() for LDT locking. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 4743f095f0..2f2a36a579 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2328,30 +2328,9 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = 0, 0, { (DWORD_PTR)(__FILE__ ": ldt_section") } }; static RTL_CRITICAL_SECTION ldt_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -static sigset_t ldt_sigset; static const LDT_ENTRY null_entry; -static void ldt_lock(void) -{ - sigset_t sigset; - - pthread_sigmask( SIG_BLOCK, &server_block_set, &sigset ); - RtlEnterCriticalSection( &ldt_section ); - if (ldt_section.RecursionCount == 1) ldt_sigset = sigset; -} - -static void ldt_unlock(void) -{ - if (ldt_section.RecursionCount == 1) - { - sigset_t sigset = ldt_sigset; - RtlLeaveCriticalSection( &ldt_section ); - pthread_sigmask( SIG_SETMASK, &sigset, NULL ); - } - else RtlLeaveCriticalSection( &ldt_section ); -} - static inline void *ldt_get_base( LDT_ENTRY ent ) { return (void *)(ent.BaseLow | @@ -2510,14 +2489,16 @@ NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_ */ NTSTATUS WINAPI NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_ENTRY entry2 ) { + sigset_t sigset; + if (sel1 >> 16 || sel2 >> 16) return STATUS_INVALID_LDT_DESCRIPTOR; if (sel1 && (sel1 >> 3) < first_ldt_entry) return STATUS_INVALID_LDT_DESCRIPTOR; if (sel2 && (sel2 >> 3) < first_ldt_entry) return STATUS_INVALID_LDT_DESCRIPTOR; - ldt_lock(); + server_enter_uninterrupted_section( &ldt_section, &sigset ); if (sel1) ldt_set_entry( sel1, entry1 ); if (sel2) ldt_set_entry( sel2, entry2 ); - ldt_unlock(); + server_leave_uninterrupted_section( &ldt_section, &sigset ); return STATUS_SUCCESS; } @@ -2555,6 +2536,7 @@ NTSTATUS signal_alloc_thread( TEB *teb ) if (!gdt_fs_sel) { static int first_thread = 1; + sigset_t sigset; int idx; LDT_ENTRY entry = ldt_make_entry( teb, teb_size - 1, LDT_FLAGS_DATA | LDT_FLAGS_32BIT ); @@ -2568,14 +2550,14 @@ NTSTATUS signal_alloc_thread( TEB *teb ) } else { - ldt_lock(); + server_enter_uninterrupted_section( &ldt_section, &sigset ); for (idx = first_ldt_entry; idx < LDT_SIZE; idx++) { if (__wine_ldt_copy.flags[idx]) continue; ldt_set_entry( (idx << 3) | 7, entry ); break; } - ldt_unlock(); + server_leave_uninterrupted_section( &ldt_section, &sigset ); if (idx == LDT_SIZE) return STATUS_TOO_MANY_THREADS; } thread_data->fs = (idx << 3) | 7; @@ -2592,12 +2574,13 @@ NTSTATUS signal_alloc_thread( TEB *teb ) void signal_free_thread( TEB *teb ) { struct x86_thread_data *thread_data = (struct x86_thread_data *)teb->SystemReserved2; + sigset_t sigset; if (gdt_fs_sel) return; - ldt_lock(); + server_enter_uninterrupted_section( &ldt_section, &sigset ); __wine_ldt_copy.flags[thread_data->fs >> 3] = 0; - ldt_unlock(); + server_leave_uninterrupted_section( &ldt_section, &sigset ); }

1 0

Fabian Maurer : find.exe/tests: Add test for multiple files at once.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: 83933c596fa7de3d58f56ea91495752d9965af36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83933c596fa7de3d58f56ea9… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Apr 28 19:19:51 2020 +0200 find.exe/tests: Add test for multiple files at once. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/find/tests/find.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index b8345034b5..a15b5d2966 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -264,6 +264,56 @@ static void run_find_unicode_(const BYTE *input, int input_len, const BYTE *out_ run_find_stdin_(wstr_quoted_test, input, input_len, out_expected_mangled, out_expected_mangled_len, exitcode_expected, file, line); } +static void run_find_file_multi(void) +{ + char path_temp_file1[MAX_PATH]; + char path_temp_file2[MAX_PATH]; + char path_temp_file3[MAX_PATH]; + char path_temp_dir[MAX_PATH]; + HANDLE handle_file; + WCHAR commandline_new[MAX_PATH]; + char out_expected[500]; + const char* input = "ab\nbd"; + + GetTempPathA(ARRAY_SIZE(path_temp_dir), path_temp_dir); + GetTempFileNameA(path_temp_dir, "", 0, path_temp_file1); + GetTempFileNameA(path_temp_dir, "", 0, path_temp_file2); + GetTempFileNameA(path_temp_dir, "", 0, path_temp_file3); + handle_file = CreateFileA(path_temp_file1, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + write_to_handle(handle_file, (BYTE*)input, strlen(input)); + CloseHandle(handle_file); + handle_file = CreateFileA(path_temp_file2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + write_to_handle(handle_file, (BYTE*)input, strlen(input)); + CloseHandle(handle_file); + + wsprintfW(commandline_new, L"\"b\" C:\\doesnotexist1 %hs C:\\doesnotexist1 %hs C:\\doesnotexist1 %hs", path_temp_file1, path_temp_file2, path_temp_file3); + + /* Keep file open during the test */ + handle_file = CreateFileA(path_temp_file3, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + + CharUpperA(path_temp_file1); + CharUpperA(path_temp_file2); + CharUpperA(path_temp_file3); + wsprintfA(out_expected, + "File not found - C:\\DOESNOTEXIST1\r\n" + "\r\n---------- %s\r\n" + "ab\r\nbd\r\n" + "File not found - C:\\DOESNOTEXIST1\r\n" + "\r\n---------- %s\r\n" + "ab\r\nbd\r\n" + "File not found - C:\\DOESNOTEXIST1\r\n" + "File not found - %s\r\n", + path_temp_file1, path_temp_file2, path_temp_file3); + + todo_wine + run_find_stdin_(commandline_new, (BYTE*)"", 0, (BYTE*)out_expected, strlen(out_expected), 0, __FILE__, __LINE__); + + CloseHandle(handle_file); + DeleteFileA(path_temp_file1); + DeleteFileA(path_temp_file2); + DeleteFileA(path_temp_file3); +} + static void test_errors(void) { run_find_stdin_str("", "", "FIND: Parameter format not correct\r\n", 2); @@ -411,6 +461,7 @@ START_TEST(find) else { test_errors(); + run_find_file_multi(); } test_singleline_without_switches(); test_multiline();

1 0

Fabian Maurer : find.exe: Implement file searching.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: f3b88212ab9a89b46c466e647acf3f2d46386ce4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3b88212ab9a89b46c466e64… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Apr 28 19:19:52 2020 +0200 find.exe: Implement file searching. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/find/find.c | 67 +++++++++++++++++++++++++++++++++++++++------- programs/find/find.rc | 1 + programs/find/resources.h | 1 + programs/find/tests/find.c | 19 ------------- 4 files changed, 59 insertions(+), 29 deletions(-) diff --git a/programs/find/find.c b/programs/find/find.c index 34ca2801eb..2eeb1ce212 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -147,7 +147,9 @@ int __cdecl wmain(int argc, WCHAR *argv[]) WCHAR *tofind = NULL; int i; int exitcode; - HANDLE input; + int file_paths_len = 0; + int file_paths_max = 0; + WCHAR** file_paths = NULL; TRACE("running find:"); for (i = 0; i < argc; i++) @@ -156,8 +158,6 @@ int __cdecl wmain(int argc, WCHAR *argv[]) } TRACE("\n"); - input = GetStdHandle(STD_INPUT_HANDLE); - for (i = 1; i < argc; i++) { if (argv[i][0] == '/') @@ -165,14 +165,18 @@ int __cdecl wmain(int argc, WCHAR *argv[]) output_resource_message(IDS_INVALID_SWITCH); return 2; } - else if(tofind == NULL) + else if (tofind == NULL) { tofind = argv[i]; } else { - FIXME("Searching files not supported yet\n"); - return 1000; + if (file_paths_len >= file_paths_max) + { + file_paths_max = file_paths_max ? file_paths_max * 2 : 2; + file_paths = heap_realloc(file_paths, sizeof(WCHAR*) * file_paths_max); + } + file_paths[file_paths_len++] = argv[i]; } } @@ -183,13 +187,56 @@ int __cdecl wmain(int argc, WCHAR *argv[]) } exitcode = 1; - while ((line = read_line_from_handle(input)) != NULL) + + if (file_paths_len > 0) { - if (run_find_for_line(line, tofind)) - exitcode = 0; + for (i = 0; i < file_paths_len; i++) + { + HANDLE input; + WCHAR file_path_upper[MAX_PATH]; + + wcscpy(file_path_upper, file_paths[i]); + wcsupr(file_path_upper); + + input = CreateFileW(file_paths[i], GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + + if (input == INVALID_HANDLE_VALUE) + { + WCHAR buffer_message[64]; + WCHAR message[300]; + + LoadStringW(GetModuleHandleW(NULL), IDS_FILE_NOT_FOUND, buffer_message, ARRAY_SIZE(buffer_message)); + + wsprintfW(message, buffer_message, file_path_upper); + write_to_stdout(message); + continue; + } - heap_free(line); + write_to_stdout(L"\r\n---------- "); + write_to_stdout(file_path_upper); + write_to_stdout(L"\r\n"); + while ((line = read_line_from_handle(input)) != NULL) + { + if (run_find_for_line(line, tofind)) + exitcode = 0; + + heap_free(line); + } + CloseHandle(input); + } + } + else + { + HANDLE input = GetStdHandle(STD_INPUT_HANDLE); + while ((line = read_line_from_handle(input)) != NULL) + { + if (run_find_for_line(line, tofind)) + exitcode = 0; + + heap_free(line); + } } + heap_free(file_paths); return exitcode; } diff --git a/programs/find/find.rc b/programs/find/find.rc index 8c358c8677..b7376b6d11 100644 --- a/programs/find/find.rc +++ b/programs/find/find.rc @@ -22,4 +22,5 @@ STRINGTABLE { IDS_INVALID_PARAMETER "FIND: Parameter format not correct\r\n" IDS_INVALID_SWITCH "FIND: Invalid switch\r\n" + IDS_FILE_NOT_FOUND "File not found - %s\r\n" } diff --git a/programs/find/resources.h b/programs/find/resources.h index 2ebe197b7d..bdcc2802b5 100644 --- a/programs/find/resources.h +++ b/programs/find/resources.h @@ -23,5 +23,6 @@ #define IDS_INVALID_PARAMETER 1000 #define IDS_INVALID_SWITCH 1001 +#define IDS_FILE_NOT_FOUND 1002 #endif /* __WINE_FIND_RESOURCES_H */ diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index a15b5d2966..d50dcdd36a 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -305,7 +305,6 @@ static void run_find_file_multi(void) "File not found - %s\r\n", path_temp_file1, path_temp_file2, path_temp_file3); - todo_wine run_find_stdin_(commandline_new, (BYTE*)"", 0, (BYTE*)out_expected, strlen(out_expected), 0, __FILE__, __LINE__); CloseHandle(handle_file); @@ -322,7 +321,6 @@ static void test_errors(void) todo_wine /* Quotes are not properly passed into wine yet */ run_find_stdin_str("\"test", "", "FIND: Parameter format not correct\r\n", 2); run_find_stdin_str("\"test\" /XYZ", "", "FIND: Invalid switch\r\n", 2); - todo_wine run_find_stdin_str("\"test\" C:\\doesnotexist.dat", "", "File not found - C:\\DOESNOTEXIST.DAT\r\n", 1); } @@ -398,19 +396,12 @@ static void test_unicode_support_stdin(void) static void test_file_search(void) { - todo_wine run_find_file_str("\"\"", "test", "", 1); - todo_wine run_find_file_str("\"test\"", "", "", 1); - todo_wine run_find_file_str("\"test\"", "test", "test\r\n", 0); - todo_wine run_find_file_str("\"test\"", "test2", "test2\r\n", 0); - todo_wine run_find_file_str("\"test\"", "test\r2", "test\r2\r\n", 0); - todo_wine run_find_file_str("\"test2\"", "test", "", 1); - todo_wine run_find_file_str("\"test\"", "test\nother\ntest2\ntest3", "test\r\ntest2\r\ntest3\r\n", 0); } @@ -419,31 +410,21 @@ static void test_unicode_support_file(void) /* Test unicode support on files */ /* Test UTF-8 BOM */ - todo_wine run_find_file_unicode(str_en_utf8_nobom, str_en_utf8_nobom, 0); - todo_wine run_find_file_unicode(str_en_utf8_bom, str_en_utf8_bom, 0); /* Test russian characters */ - todo_wine run_find_file_unicode(str_rus_utf8_bom, str_rus_utf8_bom, 0); - todo_wine run_find_file_unicode(str_rus_utf8_nobom, str_rus_utf8_nobom, 0); /* Test japanese characters */ - todo_wine run_find_file_unicode(str_jap_utf8_nobom, str_jap_utf8_nobom, 0); - todo_wine run_find_file_unicode(str_jap_utf8_bom, str_jap_utf8_bom, 0); - todo_wine run_find_file_unicode(str_jap_shiftjis, str_jap_shiftjis, 0); /* Test unsupported encodings */ - todo_wine run_find_file_unicode(str_jap_utf16le_nobom, str_empty, 1); - todo_wine run_find_file_unicode(str_jap_utf16be_bom, str_empty, 1); - todo_wine run_find_file_unicode(str_jap_utf16be_nobom, str_empty, 1); /* Test utf16le */

1 0

Mas Ahmad Muhammad : comdlg32: Enlarge list area in CHOOSE_FONT window.
by Alexandre Julliard 29 Apr '20

29 Apr '20

Module: wine Branch: master Commit: cf8a6eb2769d2c4ba5bb837d29db89f6b88706ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf8a6eb2769d2c4ba5bb837d… Author: Mas Ahmad Muhammad <m.charly81(a)gmail.com> Date: Mon Apr 27 17:51:21 2020 +0700 comdlg32: Enlarge list area in CHOOSE_FONT window. Signed-off-by: Mas Ahmad Muhammad <m.charly81(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/comdlg32.rc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index a1689f4abe..a5d09faa56 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -245,34 +245,34 @@ FONT 8, "MS Shell Dlg" } -CHOOSE_FONT DIALOG 13, 54, 274, 147 +CHOOSE_FONT DIALOG 13, 54, 274, 169 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Font" FONT 8, "MS Shell Dlg" { LTEXT "&Font:",stc1 ,6,3,90,9 - COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + COMBOBOX cmb1, 6,13,94,76, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE LTEXT "Font St&yle:",stc2 ,108,3,60,9 - COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + COMBOBOX cmb2,108,13,64,76, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE LTEXT "&Size:",stc3,179,3,32,9 - COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + COMBOBOX cmb3,179,13,32,76, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "OK",IDOK,218,6,50,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancel",IDCANCEL,218,23,50,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Apply", psh3,218,40,50,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Help" , pshHelp,218,57,50,14,WS_GROUP | WS_TABSTOP - GROUPBOX "Effects",grp1,6,72,84,36,WS_GROUP - CHECKBOX "Stri&keout", chx1, 10,82,78,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Underline", chx2, 10,94,78,10, BS_AUTOCHECKBOX - LTEXT "&Color:", stc4 ,6,114,80,9 - COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + GROUPBOX "Effects",grp1,6,92,84,36,WS_GROUP + CHECKBOX "Stri&keout", chx1, 10,102,78,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Underline", chx2, 10,114,78,10, BS_AUTOCHECKBOX + LTEXT "&Color:", stc4 ,6,134,80,9 + COMBOBOX cmb4,6,144,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Sample",grp2,98,72,120,36,WS_GROUP - CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | + GROUPBOX "Sample",grp2,98,92,120,36,WS_GROUP + CTEXT "",stc5,103,101,109,24,SS_NOPREFIX | NOT WS_VISIBLE + LTEXT "Scr&ipt:",stc7 ,98,134,40,9 + COMBOBOX cmb5,98,144,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP }

1 0