- wine-devel - winehq.org

[PATCH 0/4] Return SMBIOS info from GetSystemFirmwareTable on Linux
by Alex Henrie 28 May '18

28 May '18

This patch set addresses bug 11908, bug 44305, and others. It reconstructs the SMBIOS table from the SMBIOS values that the kernel exposes to userspace. Because some BIOSes have more than one of each type of SMBIOS struct, and not every BIOS has every type of struct, I have chosen to declare each struct separately. This will allow for a more sophisticated implementation in the future. It will also allow implementations for other platforms (e.g. Mac OS) to implement one or two of the structs without having to implement them all at once. Testing on Windows revealed that the id parameter to GetSystemFirmwareTable is ignored if the provider parameter is RSMB. For more information, see the SMBIOS specification: https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_3.2.0.… Alex Henrie (4): kernel32: Return BIOS info from GetSystemFirmwareTable on Linux kernel32: Return system info from GetSystemFirmwareTable on Linux kernel32: Return board info from GetSystemFirmwareTable on Linux kernel32: Return chassis info from GetSystemFirmwareTable on Linux dlls/kernel32/process.c | 294 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 293 insertions(+), 1 deletion(-) -- 2.17.0

1 4

Wine staging 3.9 release
by Alistair Leslie-Hughes 27 May '18

27 May '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.9 (895 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Fixes * Fixed regression in framerates with DX10/11 games. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: Hacknet, Bendy and Ink Machine. * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.com Best Regards Alistair.

4 3

[PATCH 3/3] winmm: Reset the tick counter after handling messages. (rebased)
by Akihiro Sagawa 27 May '18

27 May '18

Otherwise, events might be triggered immediately after a resuming. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 4 ++-- dlls/winmm/winmm.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)

2 1

[PATCH 2/3] winmm: Return a continuous stream position in MIDI stream. (rebased)
by Akihiro Sagawa 27 May '18

27 May '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 8 ++++---- dlls/winmm/winmm.c | 37 +++++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 8 deletions(-)

1 0

[PATCH 1/3] [v2] winmm: Synchronize player status and API calls.
by Akihiro Sagawa 27 May '18

27 May '18

Andrew, thanks for reviewing. In v2, use an anoymous event object to avoid a race. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/winmm.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-)

1 0

Wine staging patches submission
by Alistair Leslie-Hughes 27 May '18

27 May '18

Hi, Since any patches submitted for being included in wine-staging will be fixing a bug in wine. It has been decided that we'll use bugzilla for submission. This way anyone can follow the follow the status of patch, discussion of what/why things changed and when it's finally upstream. We are trying to avoid the situation of "What was that patch trying to fix", or "I see what it's doing but what application can I use to verify". Once the bug it created and the patch(s) attached, email myself or Zebediah asking for staging consideration. Please don't just CC me on a bug and assume we know what you want. Regards Alistair.

7 18

[PATCH 1/6] dwrite: Test IDWriteTextFormat with nonexistent font
by Lucian Poston 26 May '18

26 May '18

Signed-off-by: Lucian Poston <lucianposton(a)pm.me> --- dlls/dwrite/tests/layout.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c2dd273c6c..ac36aff5b5 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -32,6 +32,7 @@ #define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; +static const WCHAR nonExistentFontW[] = {'B','l','a','h','!',0}; static const WCHAR enusW[] = {'e','n','-','u','s',0}; struct testanalysissink @@ -3294,6 +3295,51 @@ todo_wine ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount); IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + + /* nonexistent font */ + hr = IDWriteFactory_CreateTextFormat(factory, nonExistentFontW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 500.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(count == 4, "got %u\n", count); + for (i = 0, width = 0.0; i < count; i++) + width += clusters[i].width; + + memset(&metrics, 0xcc, sizeof(metrics)); + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(metrics.left == 0.0, "got %.2f\n", metrics.left); +todo_wine + ok(metrics.top == 0.0, "got %.2f\n", metrics.top); +todo_wine + ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width); +todo_wine + ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n", + metrics.widthIncludingTrailingWhitespace, width); +todo_wine + ok(metrics.height > 0.0, "got %.2f\n", metrics.height); +todo_wine + ok(metrics.layoutWidth == 500.0, "got %.2f\n", metrics.layoutWidth); +todo_wine + ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight); +todo_wine + ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth); +todo_wine + ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); } -- 2.16.1

2 13

Re: Wine staging patches submission
by Kai Krakow 26 May '18

26 May '18

Resent to wine-devel. 2018-05-26 11:33 GMT+02:00 Kai Krakow <kai(a)kaishome.de>: > Hello! > > First words: Thanks to you and many other people here for a really > fantastic job of bringing thinks forward in wine-vanilla. I think (and > can confirm personally) that Wine made huge steps forward in the past > months, and I attribute that mostly to the efforts that have gone into > reviving the staging project and getting patches into mainline. For > me, a lot of games have seen vast improvements without using the > staging patchsets. I only cherry-pick a few patches from staging (like > nvcuda/nvapi) to get things work. I don't use the patchset workflow > but instead rely on the all-patches-rebased branch from wine-staging > to do that, rebasing my own cherry-picks. And I've seen lots of > improvements here, too, for wine-staging: Rebase conflicts have gone > down a lot. And especially this is a huge time saver... Time for > putting efforts into other parts of development. > > So great thanks to all people involved, even when some decisions may > cause some rumblings here and there, I can imagine the bigger plan of > this with a great result. > > But I think it makes sense to not blindly accept everything and add > _valuable_ discussion. > > Personally, I liked the old wine staging patchset site a lot: It was > straight forward to use and had an easy to follow review workflow. So > I also fear if and how the move to bugzilla could work out in the end. > But looking at bugzilla, that place seems to do its job well. What's > missing tho is linking patchset status (in the winehq site) to > bugzilla entries. I hope that will be added. > > > 2018-05-26 1:23 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > >> Since any patches submitted for being included in wine-staging will be >> fixing a bug in wine. It has been decided that we'll use bugzilla for >> submission. This way anyone can follow the follow the status of patch, >> discussion of what/why things changed and when it's finally upstream. > > I think this is somewhat a great move. I was always completely missed > descriptions of the purpose of patches. Almost all git commit > descriptions are simple one-liners, without describing the underlying > purpose or motivation of the patch. In the long run it could make > following interesting patches (and even finding them) much more easy. > > >> We are trying to avoid the situation of "What was that patch trying to >> fix", or >> >> "I see what it's doing but what application can I use to verify". > > Great that improvements are planned here. > > >> Once the bug it created and the patch(s) attached, email myself or >> Zebediah > > I'd prefer something that resembles the original wine-staging patch > review system a little more. > > >> asking for staging consideration. Please don't just CC me on a bug and >> assume >> we know what you want. > > This is very important. > > > Thanks and regards, > Kai

2 2

[PATCH 1/2] d3d12: Print message about Vulkan configuration problem to winediag channel.
by Józef Kucia 25 May '18

25 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/d3d12_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index c1dc8c835263..71eb1f97a73e 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -35,6 +35,7 @@ #include <vkd3d.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d12); +WINE_DECLARE_DEBUG_CHANNEL(winediag); HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) { @@ -117,7 +118,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe if (!(vk_funcs = get_vk_funcs())) { - ERR("Failed to get Wine Vulkan driver.\n"); + ERR_(winediag)("Failed to load Wine Vulkan driver.\n"); return E_FAIL; } -- 2.16.1

2 3

[PATCH] include: Add ID2D1DeviceContext definition.
by Nikolay Sivov 25 May '18

25 May '18

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/d2d1_1.idl | 284 ++++++++++++++++++++++++++++++++++++++++++++ include/dcommon.idl | 20 ++++ 2 files changed, 304 insertions(+) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 4b6224afe3..4d30f6fd34 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -27,7 +27,18 @@ interface ID2D1Properties; interface IPrintDocumentPackageTarget; interface ID2D1PrintControl; interface IWICImagingFactory; +interface IWICColorContext; interface ID2D1ColorContext; +interface ID2D1Effect; +interface ID2D1GradientStopCollection1; +interface ID2D1ImageBrush; +interface ID2D1BitmapBrush1; +interface ID2D1CommandList; + +cpp_quote("#ifndef __dwrite_h__") +/* already defined in dwrite.h but needed for WIDL */ +typedef struct DWRITE_GLYPH_RUN_DESCRIPTION DWRITE_GLYPH_RUN_DESCRIPTION; +cpp_quote("#endif /* __dwrite_h__ */") typedef enum D2D1_DEVICE_CONTEXT_OPTIONS { @@ -96,7 +107,63 @@ typedef enum D2D1_MAP_OPTIONS D2D1_MAP_OPTIONS_FORCE_DWORD = 0xffffffff, } D2D1_MAP_OPTIONS; +typedef enum D2D1_BUFFER_PRECISION +{ + D2D1_BUFFER_PRECISION_UNKNOWN = 0, + D2D1_BUFFER_PRECISION_8BPC_UNORM = 1, + D2D1_BUFFER_PRECISION_8BPC_UNORM_SRGB = 2, + D2D1_BUFFER_PRECISION_16BPC_UNORM = 3, + D2D1_BUFFER_PRECISION_16BPC_FLOAT = 4, + D2D1_BUFFER_PRECISION_32BPC_FLOAT = 5, + D2D1_BUFFER_PRECISION_FORCE_DWORD = 0xffffffff, +} D2D1_BUFFER_PRECISION; + +typedef enum D2D1_COLOR_INTERPOLATION_MODE +{ + D2D1_COLOR_INTERPOLATION_MODE_STRAIGHT = 0, + D2D1_COLOR_INTERPOLATION_MODE_PREMULTIPLIED = 1, + D2D1_COLOR_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_COLOR_INTERPOLATION_MODE; + +typedef enum D2D1_INTERPOLATION_MODE +{ + D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR = D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR, + D2D1_INTERPOLATION_MODE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR, + D2D1_INTERPOLATION_MODE_CUBIC = D2D1_INTERPOLATION_MODE_DEFINITION_CUBIC, + D2D1_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_MULTI_SAMPLE_LINEAR, + D2D1_INTERPOLATION_MODE_ANISOTROPIC = D2D1_INTERPOLATION_MODE_DEFINITION_ANISOTROPIC, + D2D1_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = D2D1_INTERPOLATION_MODE_DEFINITION_HIGH_QUALITY_CUBIC, + D2D1_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_INTERPOLATION_MODE; + +typedef enum D2D1_COMPOSITE_MODE +{ + D2D1_COMPOSITE_MODE_SOURCE_OVER = 0, + D2D1_COMPOSITE_MODE_DESTINATION_OVER = 1, + D2D1_COMPOSITE_MODE_SOURCE_IN = 2, + D2D1_COMPOSITE_MODE_DESTINATION_IN = 3, + D2D1_COMPOSITE_MODE_SOURCE_OUT = 4, + D2D1_COMPOSITE_MODE_DESTINATION_OUT = 5, + D2D1_COMPOSITE_MODE_SOURCE_ATOP = 6, + D2D1_COMPOSITE_MODE_DESTINATION_ATOP = 7, + D2D1_COMPOSITE_MODE_XOR = 8, + D2D1_COMPOSITE_MODE_PLUS = 9, + D2D1_COMPOSITE_MODE_SOURCE_COPY = 10, + D2D1_COMPOSITE_MODE_BOUNDED_SOURCE_COPY = 11, + D2D1_COMPOSITE_MODE_MASK_INVERT = 12, + D2D1_COMPOSITE_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_COMPOSITE_MODE; + +typedef enum D2D1_LAYER_OPTIONS1 +{ + D2D1_LAYER_OPTIONS1_NONE = 0, + D2D1_LAYER_OPTIONS1_INITIALIZE_FROM_BACKGROUND = 1, + D2D1_LAYER_OPTIONS1_IGNORE_ALPHA = 2, + D2D1_LAYER_OPTIONS1_FORCE_DWORD = 0xffffffff, +} D2D1_LAYER_OPTIONS1; + typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING; +typedef D2D_MATRIX_4X4_F D2D1_MATRIX_4X4_F; typedef struct D2D1_STROKE_STYLE_PROPERTIES1 { @@ -134,6 +201,54 @@ typedef struct D2D1_MAPPED_RECT BYTE *bits; } D2D1_MAPPED_RECT; +typedef struct D2D1_BITMAP_PROPERTIES1 +{ + D2D1_PIXEL_FORMAT pixelFormat; + float dpiX; + float dpiY; + D2D1_BITMAP_OPTIONS bitmapOptions; + ID2D1ColorContext *colorContext; +} D2D1_BITMAP_PROPERTIES1; + +typedef struct D2D1_IMAGE_BRUSH_PROPERTIES +{ + D2D1_RECT_F sourceRectangle; + D2D1_EXTEND_MODE extendModeX; + D2D1_EXTEND_MODE extendModeY; + D2D1_INTERPOLATION_MODE interpolationMode; +} D2D1_IMAGE_BRUSH_PROPERTIES; + +typedef struct D2D1_BITMAP_BRUSH_PROPERTIES1 +{ + D2D1_EXTEND_MODE extendModeX; + D2D1_EXTEND_MODE extendModeY; + D2D1_INTERPOLATION_MODE interpolationMode; +} D2D1_BITMAP_BRUSH_PROPERTIES1; + +typedef struct D2D1_RENDERING_CONTROLS +{ + D2D1_BUFFER_PRECISION bufferPrecision; + D2D1_SIZE_U tileSize; +} D2D1_RENDERING_CONTROLS; + +typedef struct D2D1_LAYER_PARAMETERS1 +{ + D2D1_RECT_F contentBounds; + ID2D1Geometry *geometricMask; + D2D1_ANTIALIAS_MODE maskAntialiasMode; + D2D1_MATRIX_3X2_F maskTransform; + float opacity; + ID2D1Brush *opacityBrush; + D2D1_LAYER_OPTIONS1 layerOptions; +} D2D1_LAYER_PARAMETERS1; + +typedef struct D2D1_EFFECT_INPUT_DESCRIPTION +{ + ID2D1Effect *effect; + UINT32 inputIndex; + D2D1_RECT_F inputRectangle; +} D2D1_EFFECT_INPUT_DESCRIPTION; + typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); [ @@ -183,6 +298,175 @@ interface ID2D1Device : ID2D1Resource ); } +[ + object, + uuid(e8f7fe7a-191c-466d-ad95-975678bda998), + local, +] +interface ID2D1DeviceContext : ID2D1RenderTarget +{ + HRESULT CreateBitmap( + [in] D2D1_SIZE_U size, + [in] const void *src_data, + [in] UINT32 pitch, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateBitmapFromWicBitmap( + [in] IWICBitmapSource *bitmap_source, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateColorContext( + [in] D2D1_COLOR_SPACE space, + [in] const BYTE *profile, + [in] UINT32 profile_size, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateColorContextFromFilename( + [in] const WCHAR *filename, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateColorContextFromWicColorContext( + [in] IWICColorContext *wic_color_context, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateBitmapFromDxgiSurface( + [in] IDXGISurface *surface, + [in] const D2D1_BITMAP_PROPERTIES1 *desc, + [out] ID2D1Bitmap1 **bitmap + ); + HRESULT CreateEffect( + [in] REFCLSID effect_id, + [out] ID2D1Effect **effect + ); + HRESULT CreateGradientStopCollection( + [in] const D2D1_GRADIENT_STOP *stops, + [in] UINT32 stop_count, + [in] D2D1_COLOR_SPACE preinterpolation_space, + [in] D2D1_COLOR_SPACE postinterpolation_space, + [in] D2D1_BUFFER_PRECISION buffer_precision, + [in] D2D1_EXTEND_MODE extend_mode, + [in] D2D1_COLOR_INTERPOLATION_MODE color_interpolation_mode, + [out] ID2D1GradientStopCollection1 **gradient + ); + HRESULT CreateImageBrush( + [in] ID2D1Image *image, + [in] const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, + [in] const D2D1_BRUSH_PROPERTIES *brush_desc, + [out] ID2D1ImageBrush **brush + ); + HRESULT CreateBitmapBrush( + [in] ID2D1Bitmap *bitmap, + [in] const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, + [in] const D2D1_BRUSH_PROPERTIES *brush_desc, + [out] ID2D1BitmapBrush1 **bitmap_brush + ); + HRESULT CreateCommandList( + [out] ID2D1CommandList **command_list + ); + BOOL IsDxgiFormatSupported( + [in] DXGI_FORMAT format + ); + BOOL IsBufferPrecisionSupported( + [in] D2D1_BUFFER_PRECISION buffer_precision + ); + void GetImageLocalBounds( + [in] ID2D1Image *image, + [out] D2D1_RECT_F *local_bounds + ); + HRESULT GetImageWorldBounds( + [in] ID2D1Image *image, + [out] D2D1_RECT_F *world_bounds + ); + HRESULT GetGlyphRunWorldBounds( + [in] D2D1_POINT_2F baseline_origin, + [in] const DWRITE_GLYPH_RUN *glyph_run, + [in] DWRITE_MEASURING_MODE measuring_mode, + [out] D2D1_RECT_F *bounds + ); + void GetDevice( + [out] ID2D1Device **device + ); + void SetTarget( + [in] ID2D1Image *target + ); + void GetTarget( + [out] ID2D1Image **target + ); + void SetRenderingControls( + [in] const D2D1_RENDERING_CONTROLS *rendering_controls + ); + void GetRenderingControls( + [out] D2D1_RENDERING_CONTROLS *rendering_controls + ); + void SetPrimitiveBlend( + [in] D2D1_PRIMITIVE_BLEND primitive_blend + ); + D2D1_PRIMITIVE_BLEND GetPrimitiveBlend(); + void SetUnitMode( + [in] D2D1_UNIT_MODE unit_mode + ); + D2D1_UNIT_MODE GetUnitMode(); + void DrawGlyphRun( + [in] D2D1_POINT_2F baseline_origin, + [in] const DWRITE_GLYPH_RUN *glyph_run, + [in] const DWRITE_GLYPH_RUN_DESCRIPTION *glyph_run_desc, + [in] ID2D1Brush *brush, + [in] DWRITE_MEASURING_MODE measuring_mode + ); + void DrawImage( + [in] ID2D1Image *image, + [in] const D2D1_POINT_2F *target_offset, + [in] const D2D1_RECT_F *image_rect, + [in] D2D1_INTERPOLATION_MODE interpolation_mode, + [in] D2D1_COMPOSITE_MODE composite_mode + ); + void DrawGdiMetafile( + [in] ID2D1GdiMetafile *metafile, + [in] const D2D1_POINT_2F *target_offset + ); + void DrawBitmap( + [in] ID2D1Bitmap *bitmap, + [in] const D2D1_RECT_F *dst_rect, + [in] float opacity, + [in] D2D1_INTERPOLATION_MODE interpolation_mode, + [in] const D2D1_RECT_F *src_rect, + [in] const D2D1_MATRIX_4X4_F *perspective_transform + ); + void PushLayer( + [in] const D2D1_LAYER_PARAMETERS1 *layer_parameters, + [in] ID2D1Layer *layer + ); + HRESULT InvalidateEffectInputRectangle( + [in] ID2D1Effect *effect, + [in] UINT32 input, + [in] const D2D1_RECT_F *input_rect + ); + HRESULT GetEffectInvalidRectangleCount( + [in] ID2D1Effect *effect, + [out] UINT32 *rect_count + ); + HRESULT GetEffectInvalidRectangles( + [in] ID2D1Effect *effect, + [out] D2D1_RECT_F *rectangles, + [in] UINT32 rect_count + ); + HRESULT GetEffectRequiredInputRectangles( + [in] ID2D1Effect *effect, + [in] const D2D1_RECT_F *image_rect, + [in] const D2D1_EFFECT_INPUT_DESCRIPTION *desc, + [out] D2D1_RECT_F *input_rect, + [in] UINT32 input_count + ); + void FillOpacityMask( + [in] ID2D1Bitmap *mask, + [in] ID2D1Brush *brush, + [in] const D2D1_RECT_F *dst_rect, + [in] const D2D1_RECT_F *src_rect + ); +} + [ object, uuid(bb12d362-daee-4b9a-aa1d-14ba401cfa1f), diff --git a/include/dcommon.idl b/include/dcommon.idl index db5055d202..e651a75d0e 100644 --- a/include/dcommon.idl +++ b/include/dcommon.idl @@ -61,3 +61,23 @@ typedef struct D2D_SIZE_U UINT32 width; UINT32 height; } D2D_SIZE_U, D2D1_SIZE_U; + +typedef struct D2D_MATRIX_4X4_F +{ + float _11; + float _12; + float _13; + float _14; + float _21; + float _22; + float _23; + float _24; + float _31; + float _32; + float _33; + float _34; + float _41; + float _42; + float _43; + float _44; +} D2D_MATRIX_4X4_F; -- 2.17.0

1 0

[PATCH] include: Add wmem functions to wchar.h
by Alex Henrie 25 May '18

25 May '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=43300 include/msvcrt/wchar.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index a6797246af..0fd0c26695 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -476,6 +476,12 @@ size_t __cdecl wcrtomb(char*,wchar_t,mbstate_t*); size_t __cdecl wcsrtombs(char*,const wchar_t**,size_t,mbstate_t*); int __cdecl wctob(wint_t); +wchar_t* __cdecl wmemchr(const wchar_t*,wchar_t,size_t); +int __cdecl wmemcmp(const wchar_t*,const wchar_t*,size_t); +wchar_t* __cdecl wmemcpy(wchar_t*,const wchar_t*,size_t); +wchar_t* __cdecl wmemmove(wchar_t*,const wchar_t*,size_t); +wchar_t* __cdecl wmemset(wchar_t*,wchar_t,size_t); + #ifdef __cplusplus } #endif -- 2.17.0

2 2

What happened to dev.wine-staging.com?
by Olivier F. R. Dierick 25 May '18

25 May '18

What happened to https://dev.wine-staging.com/? I had a patchset proposal there that was reviewed and commented upon. Now the address redirects to https://bugs.winehq.org/ Is the wine-staging patchset proposal/review system definitively abandoned? -- Olivier F. R. Dierick o.dierick(a)piezo-forte.be

3 2

[PATCH] jscript: Added String.trim implementation.
by Jacek Caban 25 May '18

25 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/string.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 2 ++ dlls/mshtml/tests/es5.js | 17 +++++++++++++++++ 3 files changed, 56 insertions(+)

2 1

[PATCH 2/7] shell32: Set return value correctly in DoPaste.
by Alistair Leslie-Hughes 25 May '18

25 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlview_cmenu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 905dde9..42770c7 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1149,7 +1149,8 @@ static BOOL DoPaste(ContextMenu *This) /* do the copy/move */ if (psfhlpdst && psfhlpsrc) { - ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl); + if (SUCCEEDED(ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl))) + bSuccess = TRUE; /* FIXME handle move ISFHelper_DeleteItems(psfhlpsrc, lpcida->cidl, apidl); */ -- 1.9.1

2 1

[PATCH 1/7] shell32: Fix copying of files when using a context menu.
by Alistair Leslie-Hughes 25 May '18

25 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlview_cmenu.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index fc761e1..905dde9 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1124,6 +1124,13 @@ static BOOL DoPaste(ContextMenu *This) apidl = _ILCopyCidaToaPidl(&pidl, lpcida); + /* + * Incase source is a file, we need to remove the last component + * to obtain a IShellFolder of the parent. + */ + if (_ILIsValue(pidl)) + ILRemoveLastID(pidl); + /* bind to the source shellfolder */ SHGetDesktopFolder(&psfDesktop); if(psfDesktop) -- 1.9.1

2 1

[PATCH 4/4] ole32: Use queried interface destination context for marshaling RemQueryInterface result.
by Jacek Caban 25 May '18

25 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/stubmanager.c | 12 +++++++++--- dlls/ole32/tests/marshal.c | 3 --- 2 files changed, 9 insertions(+), 6 deletions(-)

2 1

[PATCH 3/4] ole32: Introduce new ipid_to_ifstub helper and use it in ipid_get_dispatch_params.
by Jacek Caban 25 May '18

25 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/stubmanager.c | 49 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 26 deletions(-)

2 1

[PATCH 2/4 v2] ole32/tests: Add IRpcChannelBuffer and IRpcStubBuffer tests.
by Jacek Caban 25 May '18

25 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed tests failures on win64. dlls/ole32/tests/marshal.c | 358 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 358 insertions(+)

2 1

[PATCH 1/4] ole32/tests: Pass host_object_data struct as an argument to start_host_object2.
by Jacek Caban 25 May '18

25 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/tests/marshal.c | 52 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-)

2 1

[PATCH v2 1/5] msi/tests: Test deferral of MsiPublishAssemblies and MsiUnpublishAssemblies.
by Zebediah Figura 25 May '18

25 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: fix GCC warnings dlls/msi/tests/action.c | 14 ++++++++++++ dlls/msi/tests/custom.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 71 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 1600fe3..bd1e2c0 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1733,12 +1733,25 @@ static const char pa_install_exec_seq_dat[] = "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" "MsiPublishAssemblies\t\t3000\n" + "pa_immediate\tNOT REMOVE AND NOT ALLUSERS\t3001\n" + "pa_deferred\tNOT REMOVE AND NOT ALLUSERS\t3002\n" "MsiUnpublishAssemblies\t\t4000\n" + "ua_immediate\tREMOVE AND NOT ALLUSERS\t4001\n" + "ua_deferred\tREMOVE AND NOT ALLUSERS\t4002\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char pa_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "pa_immediate\t1\tcustom.dll\tpa_absent\n" + "pa_deferred\t1025\tcustom.dll\tpa_present\n" + "ua_immediate\t1\tcustom.dll\tpa_present\n" + "ua_deferred\t1025\tcustom.dll\tpa_absent\n"; + static const char rep_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -2191,6 +2204,7 @@ static const msi_table pa_tables[] = ADD_TABLE(pa_msi_assembly), ADD_TABLE(pa_msi_assembly_name), ADD_TABLE(pa_install_exec_seq), + ADD_TABLE(pa_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 0bf62d9..ee067db 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1379,3 +1379,58 @@ todo_wine { } return ERROR_SUCCESS; } + +static void check_reg_str(MSIHANDLE hinst, HKEY key, const char *name, const char *expect) +{ + char value[300]; + DWORD sz; + LONG res; + + sz = sizeof(value); + res = RegQueryValueExA(key, name, NULL, NULL, (BYTE *)value, &sz); + if (expect) + { + ok(hinst, !res, "failed to get value \"%s\": %d\n", name, res); + ok(hinst, !strcmp(value, expect), "\"%s\": expected \"%s\", got \"%s\"\n", + name, expect, value); + } + else + ok(hinst, res == ERROR_FILE_NOT_FOUND, "\"%s\": expected missing, got %u\n", + name, res); +} + +static const char path_dotnet[] = "Software\\Microsoft\\Installer\\Assemblies\\Global"; +static const char name_dotnet[] = "Wine.Dotnet.Assembly,processorArchitecture=\"MSIL\"," + "publicKeyToken=\"abcdef0123456789\",version=\"1.0.0.0\",culture=\"neutral\""; + +UINT WINAPI pa_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &key); + ok(hinst, !res, "got %d\n", res); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + check_reg_str(hinst, key, name_dotnet, "rcHQPHq?CA@Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]"); +} + RegCloseKey(key); + + return ERROR_SUCCESS; +} + +UINT WINAPI pa_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &key); + ok(hinst, !res || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); + if (!res) + { +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + check_reg_str(hinst, key, name_dotnet, NULL); +} + RegCloseKey(key); + } + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 4b46dc3..e5caa76 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -13,6 +13,8 @@ @ stdcall mov_absent(long) @ stdcall odbc_present(long) @ stdcall odbc_absent(long) +@ stdcall pa_present(long) +@ stdcall pa_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long) -- 2.7.4

3 14

[PATCH] ntoskrnl: Add SeSinglePrivilegeCheck stub.
by Alex Henrie 25 May '18

25 May '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=11908#c31 dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 99f5f928c2..55027c5022 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3525,3 +3525,12 @@ NTSTATUS WINAPI FsRtlRegisterFileSystemFilterCallbacks( DRIVER_OBJECT *object, P FIXME("stub: %p %p\n", object, callbacks); return STATUS_NOT_IMPLEMENTED; } + +/********************************************************************* + * SeSinglePrivilegeCheck (NTOSKRNL.@) + */ +BOOLEAN WINAPI SeSinglePrivilegeCheck(LUID privilege, KPROCESSOR_MODE mode) +{ + FIXME("stub: %08x%08x %u\n", privilege.HighPart, privilege.LowPart, mode); + return TRUE; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 137f518929..4129542cdc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1259,7 +1259,7 @@ @ stub SeSetAccessStateGenericMapping @ stub SeSetSecurityDescriptorInfo @ stub SeSetSecurityDescriptorInfoEx -@ stub SeSinglePrivilegeCheck +@ stdcall SeSinglePrivilegeCheck(int64 long) @ stub SeSystemDefaultDacl @ stub SeTokenImpersonationLevel @ stub SeTokenIsAdmin -- 2.17.0

1 0

[PATCH 7/7] shell32: Recognize cut/copy/paste string verbs in item menu context menu.
by Alistair Leslie-Hughes 25 May '18

25 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlview_cmenu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 9fdddee..be6de49 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -887,6 +887,12 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( DoDelete(This); else if (strcmp(lpcmi->lpVerb,"properties")==0) DoOpenProperties(This, lpcmi->hwnd); + else if (strcmp(lpcmi->lpVerb,"cut")==0) + DoCopyOrCut(This, lpcmi->hwnd, TRUE); + else if (strcmp(lpcmi->lpVerb,"copy")==0) + DoCopyOrCut(This, lpcmi->hwnd, FALSE); + else if (strcmp(lpcmi->lpVerb,"paste")==0) + DoPaste(This); else { FIXME("Unhandled string verb %s\n",debugstr_a(lpcmi->lpVerb)); return E_FAIL; -- 1.9.1

1 0

[PATCH 6/7] shell32: Remove source files when using cut in the context menu.
by Alistair Leslie-Hughes 25 May '18

25 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlview_cmenu.c | 77 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index f84ce31..9fdddee 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -300,6 +300,64 @@ static void DoDelete(ContextMenu *This) } /************************************************************************** + * SetDropEffect + * + * Set the drop effect in a IDataObject object + */ +static void SetDropEffect(IDataObject *dataobject, DWORD value) +{ + FORMATETC formatetc; + STGMEDIUM medium; + DWORD *effect; + + InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECTW), TYMED_HGLOBAL); + + medium.tymed = TYMED_HGLOBAL; + medium.pUnkForRelease = NULL; + medium.u.hGlobal = GlobalAlloc(GHND|GMEM_SHARE, sizeof(DWORD)); + if (!medium.u.hGlobal) return; + + effect = GlobalLock(medium.u.hGlobal); + if (!effect) + { + ReleaseStgMedium(&medium); + return; + } + *effect = value; + GlobalUnlock(effect); + + IDataObject_SetData(dataobject, &formatetc, &medium, FALSE); + ReleaseStgMedium(&medium); +} + +/************************************************************************** + * GetDropEffect + * + * Get the drop effect from a IDataObject object + */ +static void GetDropEffect(IDataObject *dataobject, DWORD *value) +{ + FORMATETC formatetc; + STGMEDIUM medium; + DWORD *effect; + + *value = DROPEFFECT_NONE; + + InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECTW), TYMED_HGLOBAL); + + if (SUCCEEDED(IDataObject_GetData(dataobject, &formatetc, &medium))) + { + effect = GlobalLock(medium.u.hGlobal); + if (effect) + { + *value = *effect; + GlobalUnlock(effect); + } + ReleaseStgMedium(&medium); + } +} + +/************************************************************************** * DoCopyOrCut * * copies the currently selected items into the clipboard @@ -312,6 +370,7 @@ static void DoCopyOrCut(ContextMenu *This, HWND hwnd, BOOL cut) if (SUCCEEDED(IShellFolder_GetUIObjectOf(This->parent, hwnd, This->cidl, (LPCITEMIDLIST*)This->apidl, &IID_IDataObject, 0, (void**)&dataobject))) { + SetDropEffect(dataobject, cut ? DROPEFFECT_MOVE : DROPEFFECT_COPY); OleSetClipboard(dataobject); IDataObject_Release(dataobject); } @@ -1199,11 +1258,19 @@ static BOOL DoPaste(ContextMenu *This) /* do the copy/move */ if (psfhlpdst && psfhlpsrc) { - if (SUCCEEDED(ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl))) - bSuccess = TRUE; - /* FIXME handle move - ISFHelper_DeleteItems(psfhlpsrc, lpcida->cidl, apidl); - */ + DWORD dropEffect; + GetDropEffect(pda, &dropEffect); + + if (SUCCEEDED(ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl))) + { + if (dropEffect == DROPEFFECT_MOVE) + { + if (SUCCEEDED(ISFHelper_DeleteItems(psfhlpsrc, lpcida->cidl, (LPCITEMIDLIST*)apidl, FALSE))) + bSuccess = TRUE; + } + else + bSuccess = TRUE; + } } if(psfhlpdst) ISFHelper_Release(psfhlpdst); if(psfhlpsrc) ISFHelper_Release(psfhlpsrc); -- 1.9.1

1 0

[PATCH 5/7] shell32: Add parameter to ISFHelper::DeleteItems to allow deleting files without confirmation.
by Alistair Leslie-Hughes 25 May '18

25 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/recyclebin.c | 6 +++--- dlls/shell32/shellfolder.h | 4 ++-- dlls/shell32/shfldr_fs.c | 3 ++- dlls/shell32/shfldr_unixfs.c | 7 ++++--- dlls/shell32/shlview.c | 2 +- dlls/shell32/shlview_cmenu.c | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 0d80e63..66c5cc2 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -182,7 +182,7 @@ static void DoErase(RecycleBinMenu *This) ISFHelper *helper; IShellFolder2_QueryInterface(This->folder,&IID_ISFHelper,(void**)&helper); if(helper) - ISFHelper_DeleteItems(helper,This->cidl,(LPCITEMIDLIST*)This->apidl); + ISFHelper_DeleteItems(helper, This->cidl, (LPCITEMIDLIST *)This->apidl, TRUE); } static void DoRestore(RecycleBinMenu *This) @@ -815,10 +815,10 @@ static HRESULT erase_items(HWND parent,const LPCITEMIDLIST * apidl, UINT cidl, B } static HRESULT WINAPI RecycleBin_DeleteItems(ISFHelper * iface, UINT cidl, - LPCITEMIDLIST * apidl) + LPCITEMIDLIST * apidl, BOOL confirm) { TRACE("(%p,%u,%p)\n",iface,cidl,apidl); - return erase_items(GetActiveWindow(),apidl,cidl,TRUE); + return erase_items(GetActiveWindow(), apidl, cidl, confirm); } static HRESULT WINAPI RecycleBin_CopyItems(ISFHelper * iface, diff --git a/dlls/shell32/shellfolder.h b/dlls/shell32/shellfolder.h index 942e0e7..b8083a2 100644 --- a/dlls/shell32/shellfolder.h +++ b/dlls/shell32/shellfolder.h @@ -48,7 +48,7 @@ DECLARE_INTERFACE_(ISFHelper,IUnknown) /*** ISFHelper methods ***/ STDMETHOD(GetUniqueName)(THIS_ LPWSTR lpName, UINT uLen) PURE; STDMETHOD(AddFolder)(THIS_ HWND hwnd, LPCWSTR lpName, LPITEMIDLIST * ppidlOut) PURE; - STDMETHOD(DeleteItems)(THIS_ UINT cidl, LPCITEMIDLIST * apidl) PURE; + STDMETHOD(DeleteItems)(THIS_ UINT cidl, LPCITEMIDLIST *apidl, BOOL confirm) PURE; STDMETHOD(CopyItems)(THIS_ IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl) PURE; }; #undef INTERFACE @@ -61,7 +61,7 @@ DECLARE_INTERFACE_(ISFHelper,IUnknown) /*** ISFHelper methods ***/ #define ISFHelper_GetUniqueName(p,a,b) (p)->lpVtbl->GetUniqueName(p,a,b) #define ISFHelper_AddFolder(p,a,b,c) (p)->lpVtbl->AddFolder(p,a,b,c) -#define ISFHelper_DeleteItems(p,a,b) (p)->lpVtbl->DeleteItems(p,a,b) +#define ISFHelper_DeleteItems(p,a,b,c) (p)->lpVtbl->DeleteItems(p,a,b,c) #define ISFHelper_CopyItems(p,a,b,c) (p)->lpVtbl->CopyItems(p,a,b,c) #endif diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 66150f4..32178be 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1225,7 +1225,7 @@ static WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, const LPCITEMIDLIS * deletes items in folder */ static HRESULT WINAPI -ISFHelper_fnDeleteItems (ISFHelper * iface, UINT cidl, LPCITEMIDLIST * apidl) +ISFHelper_fnDeleteItems (ISFHelper *iface, UINT cidl, LPCITEMIDLIST *apidl, BOOL confirm) { IGenericSFImpl *This = impl_from_ISFHelper(iface); UINT i; @@ -1250,6 +1250,7 @@ ISFHelper_fnDeleteItems (ISFHelper * iface, UINT cidl, LPCITEMIDLIST * apidl) op.wFunc = FO_DELETE; op.pFrom = wszPathsList; op.fFlags = FOF_ALLOWUNDO; + if (!confirm) op.fFlags |= FOF_NOCONFIRMATION; if (SHFileOperationW(&op)) { WARN("SHFileOperation failed\n"); diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 732a103..a2ca852 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1942,7 +1942,7 @@ static HRESULT WINAPI SFHelper_AddFolder(ISFHelper* iface, HWND hwnd, LPCWSTR pw * be converted, S_FALSE is returned. In such situation DeleteItems will try to delete * the files using syscalls */ -static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, const LPCITEMIDLIST *apidl) +static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, const LPCITEMIDLIST *apidl, BOOL confirm) { char szAbsolute[FILENAME_MAX], *pszRelative; LPWSTR wszPathsList, wszListPos; @@ -1984,6 +1984,7 @@ static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, const LP op.wFunc = FO_DELETE; op.pFrom = wszPathsList; op.fFlags = FOF_ALLOWUNDO; + if (!confirm) op.fFlags |= FOF_NOCONFIRMATION; if (SHFileOperationW(&op)) { WARN("SHFileOperationW failed\n"); @@ -2022,7 +2023,7 @@ static HRESULT UNIXFS_delete_with_syscalls(UnixFolder *This, UINT cidl, const LP return S_OK; } -static HRESULT WINAPI SFHelper_DeleteItems(ISFHelper* iface, UINT cidl, LPCITEMIDLIST* apidl) +static HRESULT WINAPI SFHelper_DeleteItems(ISFHelper *iface, UINT cidl, LPCITEMIDLIST *apidl, BOOL confirm) { UnixFolder *This = impl_from_ISFHelper(iface); char szAbsolute[FILENAME_MAX], *pszRelative; @@ -2033,7 +2034,7 @@ static HRESULT WINAPI SFHelper_DeleteItems(ISFHelper* iface, UINT cidl, LPCITEMI TRACE("(%p)->(%d %p)\n", This, cidl, apidl); - hr = UNIXFS_delete_with_shfileop(This, cidl, apidl); + hr = UNIXFS_delete_with_shfileop(This, cidl, apidl, confirm); if (hr == S_FALSE) hr = UNIXFS_delete_with_syscalls(This, cidl, apidl); diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index c0c027f..9f23bfe 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1577,7 +1577,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn } /* perform the item deletion */ - ISFHelper_DeleteItems(psfhlp, i, (LPCITEMIDLIST*)pItems); + ISFHelper_DeleteItems(psfhlp, i, (LPCITEMIDLIST *)pItems, TRUE); ISFHelper_Release(psfhlp); /* free pidl array memory */ diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index c9b2ebf..f84ce31 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -294,7 +294,7 @@ static void DoDelete(ContextMenu *This) IShellFolder_QueryInterface(This->parent, &IID_ISFHelper, (void**)&helper); if (helper) { - ISFHelper_DeleteItems(helper, This->cidl, (LPCITEMIDLIST*)This->apidl); + ISFHelper_DeleteItems(helper, This->cidl, (LPCITEMIDLIST *)This->apidl, TRUE); ISFHelper_Release(helper); } } -- 1.9.1

1 0

[PATCH 4/7] shell32: Add support for setting/getting PREFERREDDROPEFFECT in IDataObject.
by Alistair Leslie-Hughes 25 May '18

25 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/clipboard.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/dataobject.c | 24 +++++++++++++++++++++--- dlls/shell32/shell32_main.h | 2 ++ 3 files changed, 63 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/clipboard.c b/dlls/shell32/clipboard.c index 82df534..9c6f284 100644 --- a/dlls/shell32/clipboard.c +++ b/dlls/shell32/clipboard.c @@ -38,6 +38,8 @@ #include <stdarg.h> #include <string.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -214,3 +216,41 @@ HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) return hGlobal; } + +HGLOBAL RenderPREFERREDDROPEFFECT (DWORD value) +{ + DWORD *pEffect; + HGLOBAL hGlobal; + + TRACE("(%d)\n", value); + + hGlobal = GlobalAlloc(GHND|GMEM_SHARE, sizeof(DWORD)); + if(!hGlobal) return hGlobal; + + pEffect = GlobalLock(hGlobal); + if (pEffect) + { + *pEffect = value; + GlobalUnlock(hGlobal); + } + + return hGlobal; +} + +HRESULT GetPREFERREDDROPEFFECT (STGMEDIUM *pmedium, DWORD *value) +{ + DWORD *pEffect; + BOOL result = E_OUTOFMEMORY; + + TRACE("(%p, %p)\n", pmedium, value); + + pEffect = GlobalLock(pmedium->u.hGlobal); + if (pEffect) + { + *value = *pEffect; + result = S_OK; + GlobalUnlock(pmedium->u.hGlobal); + } + + return result; +} diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index ab72055..85278be 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -196,7 +196,7 @@ LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[]) */ /* number of supported formats */ -#define MAX_FORMATS 4 +#define MAX_FORMATS 5 typedef struct { @@ -208,12 +208,13 @@ typedef struct LPITEMIDLIST pidl; LPITEMIDLIST * apidl; UINT cidl; + DWORD dropEffect; FORMATETC pFormatEtc[MAX_FORMATS]; UINT cfShellIDList; UINT cfFileNameA; UINT cfFileNameW; - + UINT cfDropEffect; } IDataObjectImpl; static inline IDataObjectImpl *impl_from_IDataObject(IDataObject *iface) @@ -313,6 +314,10 @@ static HRESULT WINAPI IDataObject_fnGetData(IDataObject *iface, LPFORMATETC pfor if (This->cidl < 1) return(E_UNEXPECTED); pmedium->u.hGlobal = RenderFILENAMEW(This->pidl, This->apidl, This->cidl); } + else if (pformatetcIn->cfFormat == This->cfDropEffect) + { + pmedium->u.hGlobal = RenderPREFERREDDROPEFFECT(This->dropEffect); + } else { FIXME("-- expected clipformat not implemented\n"); @@ -367,7 +372,17 @@ static HRESULT WINAPI IDataObject_fnGetCanonicalFormatEtc(IDataObject *iface, LP static HRESULT WINAPI IDataObject_fnSetData(IDataObject *iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium, BOOL fRelease) { IDataObjectImpl *This = impl_from_IDataObject(iface); - FIXME("(%p)->()\n", This); + + FIXME("(%p)->(%p, %p, %u): semi-stub\n", This, pformatetc, pmedium, fRelease); + + if (pformatetc->cfFormat == This->cfDropEffect) + { + if (pmedium->tymed == TYMED_HGLOBAL) + return GetPREFERREDDROPEFFECT(pmedium, &This->dropEffect); + else + return DV_E_TYMED; + } + return E_NOTIMPL; } @@ -440,14 +455,17 @@ IDataObject* IDataObject_Constructor(HWND hwndOwner, dto->pidl = ILClone(pMyPidl); dto->apidl = _ILCopyaPidl(apidl, cidl); dto->cidl = cidl; + dto->dropEffect = 0; dto->cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW); dto->cfFileNameA = RegisterClipboardFormatA(CFSTR_FILENAMEA); dto->cfFileNameW = RegisterClipboardFormatW(CFSTR_FILENAMEW); + dto->cfDropEffect = RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECTW); InitFormatEtc(dto->pFormatEtc[0], dto->cfShellIDList, TYMED_HGLOBAL); InitFormatEtc(dto->pFormatEtc[1], CF_HDROP, TYMED_HGLOBAL); InitFormatEtc(dto->pFormatEtc[2], dto->cfFileNameA, TYMED_HGLOBAL); InitFormatEtc(dto->pFormatEtc[3], dto->cfFileNameW, TYMED_HGLOBAL); + InitFormatEtc(dto->pFormatEtc[4], dto->cfDropEffect, TYMED_HGLOBAL); } TRACE("(%p)->(apidl=%p cidl=%u)\n",dto, apidl, cidl); diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index d1b0e01..fa2a549 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -141,6 +141,8 @@ HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) DECL HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN; HGLOBAL RenderFILENAMEA (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN; HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN; +HGLOBAL RenderPREFERREDDROPEFFECT (DWORD value) DECLSPEC_HIDDEN; +HRESULT GetPREFERREDDROPEFFECT (STGMEDIUM *pmedium, DWORD *value) DECLSPEC_HIDDEN; /* Change Notification */ void InitChangeNotifications(void) DECLSPEC_HIDDEN; -- 1.9.1

1 0

[PATCH 3/7] shell32: Implement insert/paste for item context menus.
by Alistair Leslie-Hughes 25 May '18

25 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shell32.rc | 1 + dlls/shell32/shlview_cmenu.c | 64 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 084b052..f885b7c 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -99,6 +99,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "C&ut", FCIDM_SHVIEW_CUT MENUITEM "&Copy", FCIDM_SHVIEW_COPY + MENUITEM "&Paste", FCIDM_SHVIEW_INSERT MENUITEM SEPARATOR MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK MENUITEM "&Delete", FCIDM_SHVIEW_DELETE diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 42770c7..c9b2ebf 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -64,6 +64,8 @@ typedef struct BOOL desktop; } ContextMenu; +static BOOL DoPaste(ContextMenu *This); + static inline ContextMenu *impl_from_IContextMenu3(IContextMenu3 *iface) { return CONTAINING_RECORD(iface, ContextMenu, IContextMenu3_iface); @@ -142,6 +144,30 @@ static ULONG WINAPI ContextMenu_Release(IContextMenu3 *iface) return ref; } +static BOOL CheckClipboard(void) +{ + IDataObject *pda; + BOOL ret = FALSE; + + if (SUCCEEDED(OleGetClipboard(&pda))) + { + STGMEDIUM medium; + FORMATETC formatetc; + + /* Set the FORMATETC structure*/ + InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLISTW), TYMED_HGLOBAL); + + /* Get the pidls from IDataObject */ + if (SUCCEEDED(IDataObject_GetData(pda, &formatetc, &medium))) + { + ReleaseStgMedium(&medium); + ret = TRUE; + } + IDataObject_Release(pda); + } + return ret; +} + static HRESULT WINAPI ItemMenu_QueryContextMenu( IContextMenu3 *iface, HMENU hmenu, @@ -152,6 +178,7 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( { ContextMenu *This = impl_from_IContextMenu3(iface); INT uIDMax; + DWORD attr = SFGAO_CANRENAME; TRACE("(%p)->(%p %d 0x%x 0x%x 0x%x )\n", This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); @@ -188,6 +215,9 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION); + if (This->apidl && This->cidl == 1) + IShellFolder_GetAttributesOf(This->parent, 1, (LPCITEMIDLIST*)This->apidl, &attr); + if(uFlags & ~CMF_CANRENAME) RemoveMenu(hmenu, FCIDM_SHVIEW_RENAME, MF_BYCOMMAND); else @@ -198,16 +228,14 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( if (!This->apidl || This->cidl > 1) enable |= MFS_DISABLED; else - { - DWORD attr = SFGAO_CANRENAME; - - IShellFolder_GetAttributesOf(This->parent, 1, (LPCITEMIDLIST*)This->apidl, &attr); enable |= (attr & SFGAO_CANRENAME) ? MFS_ENABLED : MFS_DISABLED; - } EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME, enable); } + if ((attr & (SFGAO_FILESYSTEM|SFGAO_FOLDER)) != (SFGAO_FILESYSTEM|SFGAO_FOLDER) || !CheckClipboard()) + RemoveMenu(hmenu, FCIDM_SHVIEW_INSERT + idCmdFirst, MF_BYCOMMAND); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, uIDMax-idCmdFirst); } return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); @@ -780,6 +808,10 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( TRACE("Verb FCIDM_SHVIEW_CUT\n"); DoCopyOrCut(This, lpcmi->hwnd, TRUE); break; + case FCIDM_SHVIEW_INSERT: + TRACE("Verb FCIDM_SHVIEW_INSERT\n"); + DoPaste(This); + break; case FCIDM_SHVIEW_PROPERTIES: TRACE("Verb FCIDM_SHVIEW_PROPERTIES\n"); DoOpenProperties(This, lpcmi->hwnd); @@ -811,6 +843,7 @@ static HRESULT WINAPI ItemMenu_GetCommandString(IContextMenu3 *iface, UINT_PTR c static const WCHAR exploreW[] = {'e','x','p','l','o','r','e',0}; static const WCHAR cutW[] = {'c','u','t',0}; static const WCHAR copyW[] = {'c','o','p','y',0}; + static const WCHAR pasteW[] = {'p','a','s','t','e',0}; static const WCHAR linkW[] = {'l','i','n','k',0}; static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; static const WCHAR propertiesW[] = {'p','r','o','p','e','r','t','i','e','s',0}; @@ -844,6 +877,9 @@ static HRESULT WINAPI ItemMenu_GetCommandString(IContextMenu3 *iface, UINT_PTR c case FCIDM_SHVIEW_COPY: cmdW = copyW; break; + case FCIDM_SHVIEW_INSERT: + cmdW = pasteW; + break; case FCIDM_SHVIEW_CREATELINK: cmdW = linkW; break; @@ -1142,8 +1178,22 @@ static BOOL DoPaste(ContextMenu *This) if (psfFrom) { /* get source and destination shellfolder */ - ISFHelper *psfhlpdst, *psfhlpsrc; - IShellFolder_QueryInterface(This->parent, &IID_ISFHelper, (void**)&psfhlpdst); + ISFHelper *psfhlpdst = NULL, *psfhlpsrc = NULL; + + /* when using an item context menu we first need to bind to the selected folder */ + if (This->apidl) + { + IShellFolder *folder; + + if (SUCCEEDED(IShellFolder_BindToObject(This->parent, This->apidl[0], NULL, &IID_IShellFolder, (LPVOID*)&folder))) + { + IShellFolder_QueryInterface(folder, &IID_ISFHelper, (void**)&psfhlpdst); + IShellFolder_Release(folder); + } + } + else + IShellFolder_QueryInterface(This->parent, &IID_ISFHelper, (void**)&psfhlpdst); + IShellFolder_QueryInterface(psfFrom, &IID_ISFHelper, (void**)&psfhlpsrc); /* do the copy/move */ -- 1.9.1

1 0

[PATCH] include: Make ARRAY_SIZE() available in wine/test.h
by Michael Stefaniuc 25 May '18

25 May '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Let the controversy begin! dlls/advapi32/tests/cred.c | 2 -- dlls/advapi32/tests/eventlog.c | 2 -- dlls/advapi32/tests/registry.c | 1 - dlls/advapi32/tests/security.c | 2 -- dlls/comctl32/tests/button.c | 1 - dlls/comdlg32/tests/filedlg.c | 2 -- dlls/d2d1/tests/d2d1.c | 4 ---- dlls/d3d10core/tests/device.c | 4 ---- dlls/d3d11/tests/d3d11.c | 4 ---- dlls/d3d8/tests/device.c | 2 -- dlls/d3d9/tests/d3d9ex.c | 2 -- dlls/d3d9/tests/device.c | 2 -- dlls/d3d9/tests/stateblock.c | 2 -- dlls/d3d9/tests/visual.c | 2 -- dlls/d3dx9_36/tests/effect.c | 2 -- dlls/d3dx9_36/tests/math.c | 2 -- dlls/d3dx9_36/tests/mesh.c | 2 -- dlls/ddraw/tests/ddraw1.c | 4 ---- dlls/ddraw/tests/ddraw2.c | 4 ---- dlls/ddraw/tests/ddraw4.c | 4 ---- dlls/ddraw/tests/ddraw7.c | 4 ---- dlls/dmcompos/tests/dmcompos.c | 2 -- dlls/dmime/tests/dmime.c | 2 -- dlls/dmloader/tests/loader.c | 2 -- dlls/dmstyle/tests/dmstyle.c | 2 -- dlls/dwrite/tests/analyzer.c | 2 -- dlls/dwrite/tests/font.c | 2 -- dlls/dwrite/tests/layout.c | 2 -- dlls/dxgi/tests/device.c | 4 ---- dlls/shell32/tests/shellpath.c | 4 ---- dlls/shell32/tests/shlfolder.c | 2 -- dlls/user32/tests/cursoricon.c | 2 -- dlls/usp10/tests/usp10.c | 4 ---- dlls/xmllite/tests/reader.c | 2 -- include/wine/test.h | 2 ++ 35 files changed, 2 insertions(+), 86 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 90454c7ab8..01e2a5efa3 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -27,8 +27,6 @@ #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - static BOOL (WINAPI *pCredDeleteA)(LPCSTR,DWORD,DWORD); static BOOL (WINAPI *pCredEnumerateA)(LPCSTR,DWORD,DWORD *,PCREDENTIALA **); static VOID (WINAPI *pCredFree)(PVOID); diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 3f4c00914f..d613c95315 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -32,8 +32,6 @@ #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - static BOOL (WINAPI *pCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); static BOOL (WINAPI *pGetEventLogInformation)(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 17b83cb057..9d248685ca 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -32,7 +32,6 @@ #include "winerror.h" #include "aclapi.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) #define IS_HKCR(hk) ((UINT_PTR)hk > 0 && ((UINT_PTR)hk & 3) == 2) static HKEY hkey_main; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 35fd032a84..925e6fa806 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -36,8 +36,6 @@ #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - #ifndef PROCESS_QUERY_LIMITED_INFORMATION #define PROCESS_QUERY_LIMITED_INFORMATION 0x1000 #endif diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 05fa303918..db8d2b0156 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -28,7 +28,6 @@ #include "msg.h" #define IS_WNDPROC_HANDLE(x) (((ULONG_PTR)(x) >> 16) == (~0u >> 16)) -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index fd78a64e13..aedb18a192 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1026,8 +1026,6 @@ static UINT_PTR WINAPI test_extension_wndproc(HWND dlg, UINT msg, WPARAM wParam, return FALSE; } -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - static void test_extension_helper(OPENFILENAMEA* ofn, const char *filter, const char *expected_filename) { diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 8299ceb7d4..26c81e660e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -26,10 +26,6 @@ #include "dwrite.h" #include "wincodec.h" -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - struct resource_readback { ID3D10Resource *resource; diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 50521bda44..819285ee22 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -26,10 +26,6 @@ #include "wine/heap.h" #include "wine/test.h" -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - #define BITS_NNAN 0xffc00000 #define BITS_NAN 0x7fc00000 #define BITS_NINF 0xff800000 diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 09301c7e0e..f6f4fe3a55 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28,10 +28,6 @@ #include "wine/heap.h" #include "wine/test.h" -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - #define BITS_NNAN 0xffc00000 #define BITS_NAN 0x7fc00000 #define BITS_NINF 0xff800000 diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 5fa0d59e60..6bae783644 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -28,8 +28,6 @@ #include <d3d8.h> #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - struct vec3 { float x, y, z; diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index d210b8baed..63b7c5a46d 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -26,8 +26,6 @@ #include <initguid.h> #include <d3d9.h> -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - static HMODULE d3d9_handle = 0; static DEVMODEW registry_mode; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0eba7662bf..bd1890f45c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -27,8 +27,6 @@ #include <d3d9.h> #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - struct vec3 { float x, y, z; diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index aec698a58e..0983cf7b4f 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -21,8 +21,6 @@ #include <d3d9.h> #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - static DWORD texture_stages; /* ============================ State Testing Framework ========================== */ diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d0c77953f4..835c8377e4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -34,8 +34,6 @@ #include <d3d9.h> #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - struct vec2 { float x, y; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index a75b67c7f6..4f26b63a13 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -41,8 +41,6 @@ static float get_nan(void) #define NAN get_nan() #endif -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(*arr)) - /* helper functions */ static BOOL compare_float(FLOAT f, FLOAT g, UINT ulps) { diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index b687e5d6dd..e433b1f50e 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -23,8 +23,6 @@ #include "d3dx9.h" #include <math.h> -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 6ebd5b8215..3fcd65ffbb 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -42,8 +42,6 @@ static inline float __port_nan(void) #define admitted_error 0.0001f -#define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array)) - #define compare_vertex_sizes(type, exp) \ got=D3DXGetFVFVertexSize(type); \ ok(got==exp, "Expected: %d, Got: %d\n", exp, got); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index fb0858f253..c767d3a38d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -29,10 +29,6 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - struct vec2 { float x, y; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index c2b438cf2a..794f90b940 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -31,10 +31,6 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - struct vec2 { float x, y; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 9c4c5a3e5b..172d99d167 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -31,10 +31,6 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - struct vec2 { float x, y; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index fb14409079..35a45c0345 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -32,10 +32,6 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - struct vec2 { float x, y; diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index 27cea9e336..3419eca3b3 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -26,8 +26,6 @@ #include <dmusici.h> #include <dmusicf.h> -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static BOOL missing_dmcompos(void) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 7108b0906b..62d8422162 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -27,8 +27,6 @@ #include <audioclient.h> #include <guiddef.h> -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - static BOOL missing_dmime(void) { IDirectMusicSegment8 *dms; diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 46e46d4baf..13b575e120 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -24,8 +24,6 @@ #include <dmusicf.h> #include "wine/test.h" -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static unsigned char mp3file[] = "\xFF\xFB\x92\x04"; /* MP3 header */ static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* header: 4 ("WAVE") + (8 + 16) (format segment) + (8 + 256) (data segment) = 0x124 */ diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index ed12315a19..9d247812ca 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -26,8 +26,6 @@ #include <dmusici.h> #include <dmusicf.h> -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static BOOL missing_dmstyle(void) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 93ee152c23..77369a7ef9 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -31,8 +31,6 @@ #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - static IDWriteFactory *factory; static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 44a81a199e..f21aecdd5d 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -33,8 +33,6 @@ #include "wine/heap.h" #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - #define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') #define MS_VDMX_TAG DWRITE_MAKE_OPENTYPE_TAG('V','D','M','X') #define MS_GASP_TAG DWRITE_MAKE_OPENTYPE_TAG('g','a','s','p') diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c2dd273c6c..652f6b78ac 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -29,8 +29,6 @@ #include "wine/test.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; static const WCHAR enusW[] = {'e','n','-','u','s',0}; diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index b18ee5904f..d9ffa50f78 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -23,10 +23,6 @@ #include "d3d11.h" #include "wine/test.h" -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - enum frame_latency { DEFAULT_FRAME_LATENCY = 3, diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index f6674313f8..613c4eb15d 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -43,10 +43,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(x) ( sizeof(x) / sizeof((x)[0]) ) -#endif - /* from pidl.h, not included here: */ #ifndef PT_CPL /* Guess, Win7 uses this for CSIDL_CONTROLS */ #define PT_CPL 0x01 /* no path */ diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 4ce9a4efba..6460fd9381 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -44,8 +44,6 @@ DEFINE_GUID(IID_IParentAndItem, 0xB3A4B685, 0xB685, 0x4805, 0x99,0xD9, 0x5D,0xEA,0xD2,0x87,0x32,0x36); DEFINE_GUID(CLSID_ShellDocObjView, 0xe7e4bc40, 0xe76a, 0x11ce, 0xa9,0xbb, 0x00,0xaa,0x00,0x4a,0xe8,0x37); -#define ARRAY_SIZE(x) ( sizeof(x) / sizeof((x)[0]) ) - static IMalloc *ppM; static HRESULT (WINAPI *pSHCreateItemFromIDList)(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 5099c08d70..95a6878e9a 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1053,8 +1053,6 @@ static const DWORD biSize_tests[] = { 0xffffffff }; -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) { BITMAP bm; diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index f548b5792c..aa26997112 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -31,10 +31,6 @@ #include <windows.h> #include <usp10.h> -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - typedef struct _itemTest { char todo_flag[6]; int iCharPos; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 975724ab18..41adad1598 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -32,8 +32,6 @@ #include "wine/test.h" #include "wine/heap.h" -#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) - DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); static WCHAR *a2w(const char *str) diff --git a/include/wine/test.h b/include/wine/test.h index e3e4bcf77b..476b4d9847 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -130,6 +130,8 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRI #define todo_wine_if(is_todo) todo_if((is_todo) && !strcmp(winetest_platform, "wine")) +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + #ifdef NONAMELESSUNION # define U(x) (x).u # define U1(x) (x).u1 -- 2.14.3

2 5

[PATCH] configure: Make it possible to disable winetest.
by Francois Gouget 24 May '18

24 May '18

This avoids needlessly copying all the test binaries if they are not going to be used. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- configure.ac | 1 + tools/makedep.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 312c235bb1d..20c23dbfe3b 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,7 @@ dnl **** Command-line arguments **** AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 support])) AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)])) AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests])) +AC_ARG_ENABLE(winetest, AS_HELP_STRING([--disable-winetest],[do not build winetest])) AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules])) AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]), diff --git a/tools/makedep.c b/tools/makedep.c index 207c41e8578..46062b871a2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -137,6 +137,7 @@ static struct strarray libs; static struct strarray enable_tests; static struct strarray cmdline_vars; static struct strarray disabled_dirs; +static int enable_winetest = 1; static const char *root_src_dir; static const char *tools_dir; static const char *tools_ext; @@ -3283,7 +3284,7 @@ static void output_test_module( struct makefile *make ) output_filename( tools_path( make, "winegcc" )); output( "\n" ); - if (!make->disabled) + if (enable_winetest && !make->disabled) output( "all: %s/%s\n", top_obj_dir_path( make, "programs/winetest" ), testres ); output( "%s/%s: %s%s\n", top_obj_dir_path( make, "programs/winetest" ), testres, obj_dir_path( make, stripped ), dll_ext ); @@ -4231,6 +4232,7 @@ int main( int argc, char *argv[] ) if (argc == 1) { disabled_dirs = get_expanded_make_var_array( top_makefile, "DISABLED_SUBDIRS" ); + enable_winetest = !strarray_exists( &disabled_dirs, "programs/winetest" ); top_makefile->subdirs = get_expanded_make_var_array( top_makefile, "SUBDIRS" ); top_makefile->submakes = xmalloc( top_makefile->subdirs.count * sizeof(*top_makefile->submakes) ); -- 2.17.0

1 0

[PATCH] ws2_32: Divide values returned by SO_RCVBUF and SO_SNDBUF getsockopt options by two.
by Alistair Leslie-Hughes 24 May '18

24 May '18

From: Sebastian Lackner <sebastian(a)fds-team.de> man 7 socket ... SO_SNDBUF/SO_RCVBUF Sets or gets the maximum socket send buffer in bytes. The kernel doubles this value (to allow space for bookkeeping overhead) ... Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ws2_32/socket.c | 8 ++++++++ dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 914df17..3954964 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3813,6 +3813,14 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, SetLastError(wsaErrno()); ret = SOCKET_ERROR; } + #ifdef __linux__ + else if (optname == SO_RCVBUF || optname == SO_SNDBUF) + { + /* For SO_RCVBUF / SO_SNDBUF, the Linux kernel always sets twice the value. + * Divide by two to ensure applications do not get confused by the result. */ + *(int *)optval /= 2; + } + #endif release_sock_fd( s, fd ); return ret; case WS_SO_ACCEPTCONN: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6dd1491..76506ca 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1458,7 +1458,7 @@ static void test_set_getsockopt(void) value = 0xdeadbeef; err = getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&value, &size); ok( !err, "getsockopt(SO_SNDBUF) failed error: %u\n", WSAGetLastError() ); - todo_wine ok( value == 4096, "expected 4096, got %u\n", value ); + ok( value == 4096, "expected 4096, got %u\n", value ); /* SO_RCVBUF */ value = 4096; @@ -1468,7 +1468,7 @@ static void test_set_getsockopt(void) value = 0xdeadbeef; err = getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&value, &size); ok( !err, "getsockopt(SO_RCVBUF) failed error: %u\n", WSAGetLastError() ); - todo_wine ok( value == 4096, "expected 4096, got %u\n", value ); + ok( value == 4096, "expected 4096, got %u\n", value ); /* SO_LINGER */ for( i = 0; i < sizeof(linger_testvals)/sizeof(LINGER);i++) { -- 1.9.1

3 2

[PATCH 1/4] configure: Check for libvkd3d.
by Józef Kucia 24 May '18

24 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/configure.ac b/configure.ac index 312c235bb1df..e088643aad0a 100644 --- a/configure.ac +++ b/configure.ac @@ -81,6 +81,7 @@ AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) +AC_ARG_WITH(vkd3d, AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)])) AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi]) @@ -1855,6 +1856,26 @@ fi WINE_NOTICE_WITH(vulkan,[test "x$ac_cv_lib_soname_vulkan" = "x"], [libvulkan ${notice_platform}development files not found, Vulkan won't be supported.]) +dnl **** Check for vkd3d **** +if test "x$with_vkd3d" != "xno" +then + WINE_PACKAGE_FLAGS(VKD3D,[libvkd3d],,,,) + + if test "x$VKD3D_LIBS" = "x" + then + VKD3D_CFLAGS="" + VKD3D_LIBS="" + else + WINE_CHECK_SONAME(vkd3d,vkd3d_create_device,,,[$VKD3D_LIBS]) + fi +fi + +if test "x$ac_cv_lib_soname_vkd3d" = "x" +then + WINE_NOTICE([vkd3d ${notice_platform}development files not found, Direct3D 12 won't be supported.]) + enable_d3d12=${enable_d3d12:-no} +fi + dnl **** Check for gcc specific options **** AC_SUBST(EXTRACFLAGS,"") -- 2.16.1

2 6

[PATCH vkd3d 1/7] Update AUTHORS.
by Józef Kucia 24 May '18

24 May '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 3d0c470046bd..1991bdf8081d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,3 @@ Henri Verbeet Józef Kucia +Sven Hesse -- 2.16.1

2 13

[PATCH 4/6] winmm: Synchronize player status and API calls.
by Akihiro Sagawa 24 May '18

24 May '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/winmm.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)

2 1

[PATCH 3/6] winmm: Add playing status to MIDI stream structure and use it.
by Akihiro Sagawa 24 May '18

24 May '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/winmm.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)

2 1

[PATCH 2/6] winmm: Protect MIDI stream info with critical section.
by Akihiro Sagawa 24 May '18

24 May '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/winmm.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)

2 1

[PATCH 1/6] winmm/tests: Add tests regarding MIDI stream player clocks and positions.
by Akihiro Sagawa 24 May '18

24 May '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+)

2 1

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 24 May '18

24 May '18

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/po/fi.po b/po/fi.po index 4bc100e7fc..60bc6510fe 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3684,18 +3684,19 @@ msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" msgstr "" +"Attribuutti 'writable' ei voi olla 'true' tämän objektin ominaisuuksissa" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "Ei-konfiguroitavaa ominaisuutta '|' ei voi määritellä uudestaan" #: jscript.rc:71 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "Kirjoitussuojattua ominaisuutta '|' ei voi muokata" #: jscript.rc:72 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "Ominaisuudella ei voi olla sekä hakufunktiota että arvoa" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" @@ -8502,10 +8503,8 @@ msgid "&Browse..." msgstr "&Selaa..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Tiedostotyyppi" +msgstr "Tiedostotyyppi:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8516,16 +8515,12 @@ msgid "Size:" msgstr "Koko:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Luotu" +msgstr "Luotu:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Ominaisuudet:" +msgstr "Ominaisuudet:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8536,28 +8531,20 @@ msgid "&Archive" msgstr "&Arkisto" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Avaa:" +msgstr "Avaa ohjelmalla:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "&Vaihda kuvaketta..." +msgstr "&Vaihda..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Muokattu" +msgstr "Muokattu:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Viimeisin muutos:" +msgstr "Käytetty:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" -- 2.17.0

1 0

[PATCH] testbot/build: Better detect when a native rebuild is needed.
by Francois Gouget 24 May '18

24 May '18

The builds need more than just winebuild and wrc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 19f220b64..ce27baab1 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -122,7 +122,7 @@ sub ApplyPatch($$$) { $NeedBuildNative = $NeedMakeMakefiles = $NeedConfigure = 1; } - elsif ($Line =~ m=^diff.*tools/(?:winebuild|wrc)=) + elsif ($Line =~ m=^diff.*tools/(?:makedep\.c|make_xftmpl\.c|sfnt2fon|winebuild|winegcc|widl|wmc|wrc)=) { $NeedBuildNative = 1; } -- 2.17.0

1 0

[PATCH] testbot: Sort the modules and test units alphabetically when creating jobs.
by Francois Gouget 24 May '18

24 May '18

This makes it easier to find the results for a specific module or test unit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Patches.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 26127e93a..b15668732 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -241,7 +241,7 @@ sub Submit($$$) my $Disposition = "Submitted job "; my $First = 1; - foreach my $Module (keys %Modules) + foreach my $Module (sort keys %Modules) { my $Jobs = CreateJobs(); @@ -287,7 +287,7 @@ sub Submit($$$) return $ErrMessage; } - foreach my $Unit (keys %{$Modules{$Module}}) + foreach my $Unit (sort keys %{$Modules{$Module}}) { # Add 32 and 64-bit tasks foreach my $Bits ("32", "64") -- 2.17.0

1 0

[PATCH] testbot: Remove support for archiving jobs.
by Francois Gouget 24 May '18

24 May '18

We don't use it and there does not seem to be any forseable need for it anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Note: This patch requires updating the database. testbot/bin/Janitor.pl | 26 +-------- testbot/ddl/update34.sql | 4 ++ testbot/ddl/winetestbot.sql | 2 - testbot/doc/winetestbot-schema.dia | 85 +++++++++++------------------- testbot/lib/WineTestBot/Config.pm | 5 +- testbot/lib/WineTestBot/Jobs.pm | 9 ---- testbot/web/index.pl | 20 +------ 7 files changed, 39 insertions(+), 112 deletions(-) create mode 100644 testbot/ddl/update34.sql diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 7c4168ca8..f7a6e33b6 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -2,7 +2,7 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # # This script performs janitorial tasks. It removes incomplete patch series, -# archives old jobs and purges older jobs and patches. +# purges older jobs and patches, etc. # # Copyright 2009 Ge van Geldorp # Copyright 2017 Francois Gouget @@ -172,30 +172,6 @@ if ($JobPurgeDays != 0) } } -# Archive old Jobs, that is remove all their associated files -if ($JobArchiveDays != 0) -{ - my $ArchiveBefore = time() - $JobArchiveDays * 86400; - my $Jobs = CreateJobs(); - $Jobs->FilterNotArchived(); - foreach my $Job (@{$Jobs->GetItems()}) - { - if (defined($Job->Ended) && $Job->Ended < $ArchiveBefore) - { - Trace "Archiving job ", $Job->Id, "\n"; - next if ($DryRun); - - foreach my $Step (@{$Job->Steps->GetItems()}) - { - unlink $Step->GetDir() . "/" . $Step->FileName; - } - - $Job->Archived(1); - $Job->Save(); - } - } -} - # Purge the deleted VMs if they are not referenced anymore my $VMs = CreateVMs(); $VMs->AddFilter("Role", ["deleted"]); diff --git a/testbot/ddl/update34.sql b/testbot/ddl/update34.sql new file mode 100644 index 000000000..28dc4e92e --- /dev/null +++ b/testbot/ddl/update34.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Jobs + DROP Archived; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 32eab4e3e..9ec428c04 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -110,7 +110,6 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE Jobs ( Id INT(5) NOT NULL AUTO_INCREMENT, - Archived ENUM('Y', 'N') NOT NULL, BranchName VARCHAR(20) NOT NULL, UserName VARCHAR(40) NOT NULL, Priority INT(1) NOT NULL, @@ -123,7 +122,6 @@ CREATE TABLE Jobs FOREIGN KEY (UserName) REFERENCES Users(Name), FOREIGN KEY (PatchId) REFERENCES Patches(Id), PRIMARY KEY (Id), - INDEX JobsArchived (Archived) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 2c720f2d2..0dbc7f985 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -846,16 +846,16 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O7"> <dia:attribute name="obj_pos"> - <dia:point val="-16.8208,-13.2667"/> + <dia:point val="-16.8208,-13.3167"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-16.8208,-13.2667;-7.8208,-10.2667"/> + <dia:rectangle val="-16.8208,-13.3167;-7.8208,-10.3167"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="-16.8208,-13.2667"/> + <dia:point val="-16.8208,-13.3167"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="9"/> @@ -1239,22 +1239,22 @@ </dia:object> <dia:object type="Database - Table" version="0" id="O9"> <dia:attribute name="obj_pos"> - <dia:point val="-4.57083,-14.8667"/> + <dia:point val="-4.57083,-14.9167"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-4.57083,-14.8667;4.81417,-5.4667"/> + <dia:rectangle val="-4.57083,-14.9167;4.81417,-6.3167"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="-4.57083,-14.8667"/> + <dia:point val="-4.57083,-14.9167"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="9.3850000000000016"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="9.3999999999999986"/> + <dia:real val="8.5999999999999996"/> </dia:attribute> <dia:attribute name="name"> <dia:string>#Jobs#</dia:string> @@ -1298,29 +1298,6 @@ <dia:string>##</dia:string> </dia:attribute> </dia:composite> - <dia:composite type="table_attribute"> - <dia:attribute name="name"> - <dia:string>#Archived#</dia:string> - </dia:attribute> - <dia:attribute name="type"> - <dia:string>#BOOL#</dia:string> - </dia:attribute> - <dia:attribute name="comment"> - <dia:string>##</dia:string> - </dia:attribute> - <dia:attribute name="primary_key"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="nullable"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="unique"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="default_value"> - <dia:string>##</dia:string> - </dia:attribute> - </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> <dia:string>#BranchName#</dia:string> @@ -2004,7 +1981,7 @@ <dia:point val="25.4792,-14.8834"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="25.4792,-14.8834;36.0192,-4.6834"/> + <dia:rectangle val="25.4792,-14.8834;36.0192,-5.4834"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2016,7 +1993,7 @@ <dia:real val="10.539999999999999"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="10.199999999999999"/> + <dia:real val="9.3999999999999986"/> </dia:attribute> <dia:attribute name="name"> <dia:string>#Tasks#</dia:string> @@ -2304,7 +2281,7 @@ <dia:point val="25.6708,-2.02919"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="25.6708,-2.02919;36.2108,8.97081"/> + <dia:rectangle val="25.6708,-2.02919;36.5958,10.5708"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2313,10 +2290,10 @@ <dia:point val="25.6708,-2.02919"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="10.539999999999999"/> + <dia:real val="10.925000000000001"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="11"/> + <dia:real val="12.600000000000001"/> </dia:attribute> <dia:attribute name="name"> <dia:string>#VMs#</dia:string> @@ -2693,19 +2670,19 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O14"> <dia:attribute name="obj_pos"> - <dia:point val="-7.82083,-11.5667"/> + <dia:point val="-7.8208,-11.6167"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-7.87083,-12.2167;-4.52083,-11.5167"/> + <dia:rectangle val="-7.8708,-12.2667;-4.52083,-11.5667"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="-7.82083,-11.5667"/> - <dia:point val="-5.92083,-11.5667"/> - <dia:point val="-5.92083,-11.5667"/> - <dia:point val="-4.57083,-11.5667"/> + <dia:point val="-7.8208,-11.6167"/> + <dia:point val="-5.92083,-11.6167"/> + <dia:point val="-5.92083,-11.6167"/> + <dia:point val="-4.57083,-11.6167"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="0"/> @@ -2753,17 +2730,17 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O15"> <dia:attribute name="obj_pos"> - <dia:point val="4.81417,-13.1667"/> + <dia:point val="4.81417,-13.2167"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="4.76417,-13.8334;8.29583,-13.1167"/> + <dia:rectangle val="4.76417,-13.8667;8.29583,-13.1334"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="4.81417,-13.1667"/> - <dia:point val="6.4625,-13.1667"/> + <dia:point val="4.81417,-13.2167"/> + <dia:point val="6.4625,-13.2167"/> <dia:point val="6.4625,-13.1834"/> <dia:point val="8.24583,-13.1834"/> </dia:attribute> @@ -2885,7 +2862,7 @@ <dia:point val="36.0192,-9.98336"/> <dia:point val="37.6193,-9.98336"/> <dia:point val="37.6193,-0.32919"/> - <dia:point val="36.2108,-0.32919"/> + <dia:point val="36.5958,-0.32919"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="0"/> @@ -2936,7 +2913,7 @@ <dia:point val="0.1125,-17.85"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="0.0625,-17.9;1.48167,-14.8167"/> + <dia:rectangle val="0.0625,-17.9;1.48167,-14.8667"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> @@ -2944,8 +2921,8 @@ <dia:attribute name="orth_points"> <dia:point val="0.1125,-17.85"/> <dia:point val="0.1125,-15.3584"/> - <dia:point val="0.121667,-15.3584"/> - <dia:point val="0.121667,-14.8667"/> + <dia:point val="0.12167,-15.3584"/> + <dia:point val="0.12167,-14.9167"/> </dia:attribute> <dia:attribute name="orth_orient"> <dia:enum val="1"/> @@ -2993,17 +2970,17 @@ </dia:object> <dia:object type="Database - Reference" version="0" id="O19"> <dia:attribute name="obj_pos"> - <dia:point val="-4.57083,-5.96669"/> + <dia:point val="-4.57083,-6.8167"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-18.2807,-6.61669;-4.52083,-0.80002"/> + <dia:rectangle val="-18.2807,-7.4667;-4.52083,-0.80002"/> </dia:attribute> <dia:attribute name="meta"> <dia:composite type="dict"/> </dia:attribute> <dia:attribute name="orth_points"> - <dia:point val="-4.57083,-5.96669"/> - <dia:point val="-18.2307,-5.96669"/> + <dia:point val="-4.57083,-6.8167"/> + <dia:point val="-18.2307,-6.8167"/> <dia:point val="-18.2307,-0.85002"/> <dia:point val="-16.4708,-0.85002"/> </dia:attribute> @@ -3047,7 +3024,7 @@ <dia:real val="0.59999999999999998"/> </dia:attribute> <dia:connections> - <dia:connection handle="0" to="O9" connection="30"/> + <dia:connection handle="0" to="O9" connection="28"/> <dia:connection handle="1" to="O8" connection="12"/> </dia:connections> </dia:object> diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 4f4c8d82a..b7d633db6 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -35,7 +35,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $MaxUnitSize $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel - $TunnelDefaults $PrettyHostNames $JobPurgeDays $JobArchiveDays + $TunnelDefaults $PrettyHostNames $JobPurgeDays $WebHostName $RegistrationQ $RegistrationARE $MuninAPIKey); require Exporter; @@ -49,7 +49,7 @@ require Exporter; $TagPrefix $MaxUnitSize $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel - $TunnelDefaults $PrettyHostNames $JobPurgeDays $JobArchiveDays + $TunnelDefaults $PrettyHostNames $JobPurgeDays $WebHostName $RegistrationQ $RegistrationARE $MuninAPIKey); @EXPORT_OK = qw($DbDataSource $DbUsername $DbPassword); @@ -116,7 +116,6 @@ $LDAPRealNameAttribute = undef; $LDAPEMailAttribute = undef; $JobPurgeDays = 7; -$JobArchiveDays = 0; if (!$::BuildEnv) { diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 1dbee9b37..6be271ba3 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -74,7 +74,6 @@ sub InitializeNew($$) { my ($self, $Collection) = @_; - $self->Archived(!1); $self->Branch(CreateBranches()->GetDefaultBranch()); $self->Status("queued"); $self->Submitted(time()); @@ -421,7 +420,6 @@ sub CreateItem($) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Id", "Job id", 1, 1, "S", 5), - CreateBasicPropertyDescriptor("Archived", "Job is archived", !1, 1, "B", 1), CreateItemrefPropertyDescriptor("Branch", "Branch", !1, 1, \&CreateBranches, ["BranchName"]), CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Priority", "Priority", !1, 1, "N", 1), @@ -451,11 +449,4 @@ sub CreateJobs(;$) $ScopeObject); } -sub FilterNotArchived($) -{ - my ($self) = @_; - - $self->AddFilter("Archived", [!1]); -} - 1; diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 3e5a48106..37b41eae8 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -56,8 +56,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - if ($PropertyName eq "Archived" || - $PropertyName eq "Patch" || + if ($PropertyName eq "Patch" || ($PropertyName eq "Branch" && ! CreateBranches()->MultipleBranchesPresent)) { @@ -278,26 +277,9 @@ sub GenerateBody($) print "<h2><a name='jobs'></a>Jobs</h2>\n"; my $Jobs = CreateJobs(); - $Jobs->FilterNotArchived(); my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self); $JobsCollectionBlock->GenerateList(); - if ($JobArchiveDays != 0) - { - my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName('Id'); - my $MaxIdLength = $PropertyDescriptor->GetMaxLength(); - print <<EOF -<br> -<form action='/JobDetails.pl' method='post' enctype='multipart/form-data'> -<div class='ItemProperty'> -<label>Archived job id</label><div class='ItemValue'><input type='text' name='Key' maxlength='$MaxIdLength' size='$MaxIdLength'/></div> -  -<input type='submit' name='Action' value='Show details'/> -</div> -</form> -EOF - } - print "<h2><a name='vms'></a>VMs</h2>\n"; my $VMsCollectionBlock = new VMStatusBlock(CreateVMs(), $self); $VMsCollectionBlock->GenerateList(); -- 2.17.0

1 0

[PATCH 1/2] gdiplus: Pass the correct GUID to encode_image_wic for GIF images
by Alistair Leslie-Hughes 24 May '18

24 May '18

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/gdiplus/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9841857..5affe03 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4567,7 +4567,7 @@ static GpStatus encode_image_jpeg(GpImage *image, IStream* stream, static GpStatus encode_image_gif(GpImage *image, IStream* stream, GDIPCONST EncoderParameters* params) { - return encode_image_wic(image, stream, &CLSID_WICGifEncoder, params); + return encode_image_wic(image, stream, &GUID_ContainerFormatGif, params); } /***************************************************************************** -- 1.9.1

2 1

[PATCH 2/2] gdiplus: Display the GUID of the image type in GdipSaveImageToStream
by Alistair Leslie-Hughes 24 May '18

24 May '18

Based of patch by Dmitry Timoshkov Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/gdiplus/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 5affe03..e9b0b08 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4580,7 +4580,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, encode_image_func encode_image; int i; - TRACE("%p %p %p %p\n", image, stream, clsid, params); + TRACE("%p, %p, %s, %p\n", image, stream, wine_dbgstr_guid(clsid), params); if(!image || !stream) return InvalidParameter; -- 1.9.1

2 1

[PATCH 1/5] msi/tests: Test deferral of MoveFiles.
by Zebediah Figura 24 May '18

24 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/action.c | 26 +++++++++++++++++++++++++- dlls/msi/tests/custom.c | 16 ++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 943c939..1600fe3 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -526,6 +526,29 @@ static const char mov_move_file_dat[] = "wildcardnodest\taugustus\tbudd*\t\tSourceDir\tMSITESTDIR\t1\n" "singlenodest\taugustus\tb?r\t\tSourceDir\tMSITESTDIR\t1\n"; +static const char mov_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostInitialize\t\t100\n" + "FileCost\t\t200\n" + "ResolveSource\t\t300\n" + "CostFinalize\t\t400\n" + "InstallValidate\t\t500\n" + "InstallInitialize\t\t600\n" + "MoveFiles\t\t700\n" + "mov_immediate\t\t701\n" + "mov_deferred\t\t702\n" + "InstallFiles\t\t800\n" + "InstallFinalize\t\t900\n"; + +static const char mov_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "mov_immediate\t1\tcustom.dll\tmov_absent\n" + "mov_deferred\t1025\tcustom.dll\tmov_present\n"; + static const char df_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" "s72\tS72\tl255\n" @@ -1843,7 +1866,8 @@ static const msi_table mov_tables[] = ADD_TABLE(rof_feature), ADD_TABLE(ci2_feature_comp), ADD_TABLE(ci2_file), - ADD_TABLE(install_exec_seq), + ADD_TABLE(mov_install_exec_seq), + ADD_TABLE(mov_custom_action), ADD_TABLE(rof_media), ADD_TABLE(property), ADD_TABLE(mov_move_file), diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 0f34eb0..0bf62d9 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1363,3 +1363,19 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { } return ERROR_SUCCESS; } + +UINT WINAPI mov_present(MSIHANDLE hinst) +{ + ok(hinst, pf_exists("msitest\\canada"), "file absent\n"); + ok(hinst, pf_exists("msitest\\dominica"), "file absent\n"); + return ERROR_SUCCESS; +} + +UINT WINAPI mov_absent(MSIHANDLE hinst) +{ +todo_wine { + ok(hinst, !pf_exists("msitest\\canada"), "file present\n"); + ok(hinst, !pf_exists("msitest\\dominica"), "file present\n"); +} + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 52feffa..4b46dc3 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -9,6 +9,8 @@ @ stdcall crs_absent(long) @ stdcall file_present(long) @ stdcall file_absent(long) +@ stdcall mov_present(long) +@ stdcall mov_absent(long) @ stdcall odbc_present(long) @ stdcall odbc_absent(long) @ stdcall rd_present(long) -- 2.7.4

3 20

[PATCH] include: Update with latest DirectWrite API additions.
by Nikolay Sivov 24 May '18

24 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/dwrite_3.idl | 376 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 360 insertions(+), 16 deletions(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index af4ffc8797..de14b910ee 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -19,10 +19,12 @@ import "dwrite_2.idl"; interface IDWriteFontFaceReference; +interface IDWriteFontFaceReference1; interface IDWriteFontFace3; interface IDWriteFontSet; interface IDWriteFontDownloadQueue; -interface IDWriteFontResource; +interface IDWriteFontFace5; +interface IDWriteFontList2; cpp_quote("#ifndef _WINGDI_") /* already defined in wingdi.h but needed for WIDL */ @@ -73,6 +75,47 @@ typedef struct DWRITE_FONT_PROPERTY WCHAR const *localeName; } DWRITE_FONT_PROPERTY; +typedef enum DWRITE_FONT_AXIS_TAG +{ + DWRITE_FONT_AXIS_TAG_WEIGHT = 0x74686777, /* 'wght' */ + DWRITE_FONT_AXIS_TAG_WIDTH = 0x68746477, /* 'wdth' */ + DWRITE_FONT_AXIS_TAG_SLANT = 0x746e6c73, /* 'slnt' */ + DWRITE_FONT_AXIS_TAG_OPTICAL_SIZE = 0x7a73706f, /* 'opsz' */ + DWRITE_FONT_AXIS_TAG_ITALIC = 0x6c617469, /* 'ital' */ +} DWRITE_FONT_AXIS_TAG; + +typedef struct DWRITE_FONT_AXIS_VALUE +{ + DWRITE_FONT_AXIS_TAG axisTag; + FLOAT value; +} DWRITE_FONT_AXIS_VALUE; + +typedef struct DWRITE_FONT_AXIS_RANGE +{ + DWRITE_FONT_AXIS_TAG axisTag; + FLOAT minValue; + FLOAT maxValue; +} DWRITE_FONT_AXIS_RANGE; + +typedef enum DWRITE_AUTOMATIC_FONT_AXES +{ + DWRITE_AUTOMATIC_FONT_AXES_NONE, + DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE, +} DWRITE_AUTOMATIC_FONT_AXES; + +typedef enum DWRITE_FONT_AXIS_ATTRIBUTES +{ + DWRITE_FONT_AXIS_ATTRIBUTES_NONE, + DWRITE_FONT_AXIS_ATTRIBUTES_VARIABLE, + DWRITE_FONT_AXIS_ATTRIBUTES_HIDDEN, +} DWRITE_FONT_AXIS_ATTRIBUTES; + +typedef enum DWRITE_FONT_FAMILY_MODEL +{ + DWRITE_FONT_FAMILY_MODEL_TYPOGRAPHIC, + DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE, +} DWRITE_FONT_FAMILY_MODEL; + [ local, object, @@ -145,6 +188,109 @@ interface IDWriteFontSet : IUnknown HRESULT GetMatchingFonts(DWRITE_FONT_PROPERTY const *props, UINT32 count, IDWriteFontSet **fontset); } +[ + local, + object, + uuid(1f803a76-6871-48e8-987f-b975551c50f2) +] +interface IDWriteFontResource : IUnknown +{ + HRESULT GetFontFile(IDWriteFontFile **fontfile); + UINT32 GetFontFaceIndex(); + UINT32 GetFontAxisCount(); + HRESULT GetDefaultFontAxisValues( + DWRITE_FONT_AXIS_VALUE const *values, + UINT32 num_values); + HRESULT GetFontAxisRanges( + DWRITE_FONT_AXIS_RANGE const *ranges, + UINT32 num_ranges); + DWRITE_FONT_AXIS_ATTRIBUTES GetFontAxisAttributes( + UINT32 axis); + HRESULT GetAxisNames( + UINT32 axis, + IDWriteLocalizedStrings **names); + UINT32 GetAxisValueNameCount( + UINT32 axis); + HRESULT GetAxisValueNames( + UINT32 axis, + UINT32 axis_value, + DWRITE_FONT_AXIS_RANGE *axis_range, + IDWriteLocalizedStrings **names); + BOOL HasVariations(); + HRESULT CreateFontFace( + DWRITE_FONT_SIMULATIONS simulations, + DWRITE_FONT_AXIS_VALUE const *axis_values, + UINT32 num_values, + IDWriteFontFace5 **fontface); + HRESULT CreateFontFaceReference( + DWRITE_FONT_SIMULATIONS simulations, + DWRITE_FONT_AXIS_VALUE const *axis_values, + UINT32 num_values, + IDWriteFontFaceReference1 **reference); +} + +[ + local, + object, + uuid(7e9fda85-6c92-4053-bc47-7ae3530db4d3) +] +interface IDWriteFontSet1 : IDWriteFontSet +{ + HRESULT GetMatchingFonts( + DWRITE_FONT_PROPERTY const *property, + DWRITE_FONT_AXIS_VALUE const *axis_values, + UINT32 num_values, + IDWriteFontSet1 **fontset); + HRESULT GetFirstFontResources(IDWriteFontSet1 **fontset); + HRESULT GetFilteredFonts__( + UINT32 const *indices, + UINT32 num_indices, + IDWriteFontSet1 **fontset); + HRESULT GetFilteredFonts_( + DWRITE_FONT_AXIS_RANGE const *axis_ranges, + UINT32 num_ranges, + BOOL select_any_range, + IDWriteFontSet1 **fontset); + HRESULT GetFilteredFonts( + DWRITE_FONT_PROPERTY const *props, + UINT32 num_properties, + BOOL select_any_property, + IDWriteFontSet1 **fontset); + HRESULT GetFilteredFontIndices_( + DWRITE_FONT_AXIS_RANGE const *ranges, + UINT32 num_ranges, + BOOL select_any_range, + UINT32 *indices, + UINT32 num_indices, + UINT32 *actual_num_indices); + HRESULT GetFilteredFontIndices( + DWRITE_FONT_PROPERTY const *props, + UINT32 num_properties, + BOOL select_any_range, + UINT32 *indices, + UINT32 num_indices, + UINT32 *actual_num_indices); + HRESULT GetFontAxisRanges_( + UINT32 font_index, + DWRITE_FONT_AXIS_RANGE *axis_ranges, + UINT32 num_ranges, + UINT32 *actual_num_ranges); + HRESULT GetFontAxisRanges( + DWRITE_FONT_AXIS_RANGE *axis_ranges, + UINT32 num_ranges, + UINT32 *actual_num_ranges); + HRESULT GetFontFaceReference( + UINT32 index, + IDWriteFontFaceReference1 **referece); + HRESULT CreateFontResource( + UINT32 index, + IDWriteFontResource **resource); + HRESULT CreateFontFace( + UINT32 index, + IDWriteFontFace5 **fontface); + DWRITE_LOCALITY GetFontLocality(UINT32 index); +} + [ local, object, @@ -171,6 +317,20 @@ interface IDWriteFontFamily1 : IDWriteFontFamily HRESULT GetFontFaceReference(UINT32 index, IDWriteFontFaceReference **reference); } +[ + local, + object, + uuid(3ed49e77-a398-4261-b9cf-c126c2131ef3) +] +interface IDWriteFontFamily2 : IDWriteFontFamily1 +{ + HRESULT GetMatchingFonts( + DWRITE_FONT_AXIS_VALUE const *axis_values, + UINT32 num_values, + IDWriteFontList2 **fontlist); + HRESULT GetFontSet(IDWriteFontSet1 **fontset); +} + [ local, object, @@ -182,6 +342,35 @@ interface IDWriteFontCollection1 : IDWriteFontCollection HRESULT GetFontFamily(UINT32 index, IDWriteFontFamily1 **family); } +[ + local, + object, + uuid(514039c6-4617-4064-bf8b-92ea83e506e0) +] +interface IDWriteFontCollection2 : IDWriteFontCollection1 +{ + HRESULT GetFontFamily( + UINT32 index, + IDWriteFontFamily2 **family); + HRESULT GetMatchingFonts( + const WCHAR *familyname, + DWRITE_FONT_AXIS_VALUE const *axis_values, + UINT32 num_values, + IDWriteFontList2 **fontlist); + DWRITE_FONT_FAMILY_MODEL GetFontFamilyModel(); + HRESULT GetFontSet(IDWriteFontSet1 **fontset); +} + +[ + local, + object, + uuid(a4d055a6-f9e3-4e25-93b7-9e309f3af8e9) +] +interface IDWriteFontCollection3 : IDWriteFontCollection2 +{ + HANDLE GetExiprationEvent(); +} + [ local, object, @@ -206,6 +395,20 @@ interface IDWriteFontFaceReference : IUnknown HRESULT EnqueueFileFragmentDownloadRequest(UINT64 offset, UINT64 size); } +[ + local, + object, + uuid(c081fe77-2fd1-41ac-a5a3-34983c4ba61a) +] +interface IDWriteFontFaceReference1 : IDWriteFontFaceReference +{ + HRESULT CreateFontFace(IDWriteFontFace5 **fontface); + UINT32 GetFontAxisValueCount(); + HRESULT GetFontAxisValues( + DWRITE_FONT_AXIS_VALUE *values, + UINT32 num_values); +} + [ local, object, @@ -218,6 +421,26 @@ interface IDWriteFontList1 : IDWriteFontList HRESULT GetFontFaceReference(UINT32 index, IDWriteFontFaceReference **reference); } +[ + local, + object, + uuid(c0763a34-77af-445a-b735-08c37b0a5bf5) +] +interface IDWriteFontList2 : IDWriteFontList1 +{ + HRESULT GetFontSet(IDWriteFontSet1 **fontset); +} + +[ + local, + object, + uuid(dc7ead19-e54c-43af-b2da-4e2b79ba3f7f) +] +interface IDWriteFontSet2 : IDWriteFontSet1 +{ + HANDLE GetExpirationEvent(); +} + [ local, object, @@ -295,6 +518,24 @@ interface IDWriteTextFormat2 : IDWriteTextFormat1 HRESULT GetLineSpacing(DWRITE_LINE_SPACING *spacing); } +[ + local, + object, + uuid(6d3b5641-e550-430d-a85b-b7bf48a93427) +] +interface IDWriteTextFormat3 : IDWriteTextFormat2 +{ + HRESULT SetFontAxisValues( + DWRITE_FONT_AXIS_VALUE const *axis_values, + UINT32 num_values); + UINT32 GetFontAxisValueCount(); + HRESULT GetFontAxisValues( + DWRITE_FONT_AXIS_VALUE const *axis_values, + UINT32 num_values); + DWRITE_AUTOMATIC_FONT_AXES GetAutomaticFontAxes(); + HRESULT SetAutomaticFontAxes(DWRITE_AUTOMATIC_FONT_AXES axes); +} + [ local, object, @@ -308,6 +549,47 @@ interface IDWriteTextLayout3 : IDWriteTextLayout2 HRESULT GetLineMetrics(DWRITE_LINE_METRICS1 *metrics, UINT32 max_count, UINT32 *count); } +[ + local, + object, + uuid(05a9bf42-223f-4441-b5fb-8263685f55e9) +] +interface IDWriteTextLayout4 : IDWriteTextLayout3 +{ + HRESULT SetFontAxisValues( + DWRITE_FONT_AXIS_VALUE const *axis_values, + UINT32 num_values, + DWRITE_TEXT_RANGE range); + UINT32 GetFontAxisValueCount(UINT32 pos); + HRESULT GetFontAxisValues( + UINT32 pos, + DWRITE_FONT_AXIS_VALUE *values, + UINT32 num_values, + DWRITE_TEXT_RANGE *range); + DWRITE_AUTOMATIC_FONT_AXES GetAutomaticFontAxes(); + HRESULT SetAutomaticFontAxes(DWRITE_AUTOMATIC_FONT_AXES axes); +} + +[ + local, + object, + uuid(2397599d-dd0d-4681-bd6a-f4f31eaade77) +] +interface IDWriteFontFallback1 : IDWriteFontFallback +{ + HRESULT MapCharacters( + IDWriteTextAnalysisSource *source, + UINT32 pos, + UINT32 length, + IDWriteFontCollection *base_collection, + const WCHAR *familyname, + DWRITE_FONT_AXIS_VALUE const *axis_values, + UINT32 num_values, + UINT32 *mapped_length, + FLOAT *scale, + IDWriteFontFace5 **fontface); +} + [ local, object, @@ -353,6 +635,26 @@ interface IDWriteFontSetBuilder1 : IDWriteFontSetBuilder HRESULT AddFontFile(IDWriteFontFile *file); } +[ + local, + object, + uuid(ee5ba612-b131-463c-8f4f-3189b9401e45) +] +interface IDWriteFontSetBuilder2 : IDWriteFontSetBuilder1 +{ + HRESULT AddFont( + IDWriteFontFile *fontfile, + UINT32 face_index, + DWRITE_FONT_SIMULATIONS simulations, + DWRITE_FONT_AXIS_VALUE const *axis_values, + UINT32 num_values, + DWRITE_FONT_AXIS_RANGE const *axis_ranges, + UINT32 num_ranges, + DWRITE_FONT_PROPERTY const *props, + UINT32 num_properies); + HRESULT AddFontFile(const WCHAR *filepath); +} + [ local, object, @@ -458,21 +760,6 @@ interface IDWriteFontFace4 : IDWriteFontFace3 void ReleaseGlyphImageData(void *context); } -typedef enum DWRITE_FONT_AXIS_TAG -{ - DWRITE_FONT_AXIS_TAG_WEIGHT = 0x74686777, /* 'wght' */ - DWRITE_FONT_AXIS_TAG_WIDTH = 0x68746477, /* 'wdth' */ - DWRITE_FONT_AXIS_TAG_SLANT = 0x746e6c73, /* 'slnt' */ - DWRITE_FONT_AXIS_TAG_OPTICAL_SIZE = 0x7a73706f, /* 'opsz' */ - DWRITE_FONT_AXIS_TAG_ITALIC = 0x6c617469, /* 'ital' */ -} DWRITE_FONT_AXIS_TAG; - -typedef struct DWRITE_FONT_AXIS_VALUE -{ - DWRITE_FONT_AXIS_TAG axisTag; - FLOAT value; -} DWRITE_FONT_AXIS_VALUE; - [ local, object, @@ -635,3 +922,60 @@ interface IDWriteFactory5 : IDWriteFactory4 UINT32 data_size, IDWriteFontFileStream **stream); } + +[ + local, + object, + uuid(f3744d80-21f7-42eb-b35d-995bc72fc223) +] +interface IDWriteFactory6 : IDWriteFactory5 +{ + HRESULT CreateFontFaceReference( + IDWriteFontFile *file, + UINT32 face_index, + DWRITE_FONT_SIMULATIONS simulations, + DWRITE_FONT_AXIS_VALUE const *axis_values, + UINT32 num_axis, + IDWriteFontFaceReference1 **face_ref); + HRESULT CreateFontResource( + IDWriteFontFile *file, + UINT32 face_index, + IDWriteFontResource **resource); + HRESULT GetSystemFontSet( + BOOL include_downloadable, + IDWriteFontSet1 **fontset); + HRESULT GetSystemFontCollection( + BOOL include_downloadable, + DWRITE_FONT_FAMILY_MODEL family_model, + IDWriteFontCollection2 **collection); + HRESULT CreateFontCollectionFromFontSet( + IDWriteFontSet *fontset, + DWRITE_FONT_FAMILY_MODEL family_model, + IDWriteFontCollection2 **collection); + HRESULT CreateFontSetBuilder( + IDWriteFontSetBuilder2 **builder); + HRESULT CreateTextFormat( + const WCHAR *familyname, + IDWriteFontCollection *collection, + DWRITE_FONT_AXIS_VALUE const *axis_values, + UINT32 num_axis, + FLOAT fontsize, + const WCHAR *localename, + IDWriteTextFormat3 **format); +} + +[ + local, + object, + uuid(35d0e0b3-9076-4d2e-a016-a91b568a06b4) +] +interface IDWriteFactory7 : IDWriteFactory6 +{ + HRESULT GetSystemFontSet( + BOOL include_downloadable, + IDWriteFontSet2 **fontset); + HRESULT GetSystemFontCollection( + BOOL include_downloadable, + DWRITE_FONT_FAMILY_MODEL family_model, + IDWriteFontCollection3 **collection); +} -- 2.17.0

1 0

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa 24 May '18

24 May '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 71 ++++++++++++++++++++-------------------------------------------- 1 file changed, 22 insertions(+), 49 deletions(-)

1 0

[PATCH 4/4] ole32: Use queried interface destination context for marshaling RemQueryInterface result.
by Jacek Caban 24 May '18

24 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/stubmanager.c | 12 +++++++++--- dlls/ole32/tests/marshal.c | 3 --- 2 files changed, 9 insertions(+), 6 deletions(-)

2 1

[PATCH 2/4] ole32/tests: Add IRpcChannelBuffer and IRpcStubBuffer tests.
by Jacek Caban 24 May '18

24 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/tests/marshal.c | 358 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 358 insertions(+)

2 1

[PATCH 3/4] ole32: Introduce new ipid_to_ifstub helper and use it in ipid_get_dispatch_params.
by Jacek Caban 24 May '18

24 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/stubmanager.c | 49 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 26 deletions(-)

1 0

[PATCH 1/4] ole32/tests: Pass host_object_data struct as an argument to start_host_object2.
by Jacek Caban 24 May '18

24 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/tests/marshal.c | 52 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-)

1 0

[PATCH 3/3] kerberos: Add ISC_REQ_CONNECTION to the list of supported flags.
by Dmitry Timoshkov 24 May '18

24 May '18

Formatting messages are not supported anyway. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 60042e6f83..7d532e5e58 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1020,7 +1020,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, #ifdef SONAME_LIBGSSAPI_KRB5 static const ULONG supported = ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY | ISC_REQ_SEQUENCE_DETECT | ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH | ISC_REQ_USE_DCE_STYLE | - ISC_REQ_IDENTIFY; + ISC_REQ_IDENTIFY | ISC_REQ_CONNECTION; OM_uint32 ret, minor_status, ret_flags = 0, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); gss_cred_id_t cred_handle; gss_ctx_id_t ctxt_handle; -- 2.16.3

2 1

[PATCH] mstask: Keep the job file uuid across load/save operations.
by Dmitry Timoshkov 24 May '18

24 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 7a110b3dba..58be83ecb6 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -58,6 +58,7 @@ typedef struct LONG ref; ITaskDefinition *task; IExecAction *action; + UUID uuid; LPWSTR task_name; HRESULT status; WORD idle_minutes, deadline_minutes; @@ -1241,6 +1242,8 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) if (fixed->file_version != 0x0001) return SCHED_E_INVALID_TASK; + This->uuid = fixed->uuid; + TRACE("name_size_offset %04x\n", fixed->name_size_offset); TRACE("trigger_offset %04x\n", fixed->trigger_offset); TRACE("error_retry_count %u\n", fixed->error_retry_count); @@ -1583,7 +1586,6 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta ver = GetVersion(); fixed.product_version = MAKEWORD(ver >> 8, ver); fixed.file_version = 0x0001; - CoCreateGuid(&fixed.uuid); fixed.name_size_offset = sizeof(fixed) + sizeof(USHORT); /* FIXDLEN_DATA + Instance Count */ fixed.trigger_offset = sizeof(fixed) + sizeof(USHORT); /* FIXDLEN_DATA + Instance Count */ fixed.trigger_offset += sizeof(USHORT); /* Application Name */ @@ -1627,6 +1629,11 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta Sleep(100); } + if (GetLastError() == ERROR_ALREADY_EXISTS) + fixed.uuid = This->uuid; + else + CoCreateGuid(&fixed.uuid); + if (!WriteFile(hfile, &fixed, sizeof(fixed), &size, NULL)) { hr = HRESULT_FROM_WIN32(GetLastError()); @@ -1848,6 +1855,8 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->is_dirty = FALSE; This->instance_count = 0; + CoCreateGuid(&This->uuid); + /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000; -- 2.16.3

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel