March 2021 - Wine-commits - list.winehq.org

Rémi Bernon : windows.gaming.input: Fake IEventHandler_RawGameController support.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: e2189f588fed47caa51cb24452deeba145169b05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2189f588fed47caa51cb244… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 22 11:17:35 2021 +0100 windows.gaming.input: Fake IEventHandler_RawGameController support. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/main.c | 12 ++++++++---- dlls/windows.gaming.input/tests/input.c | 15 +++++++++------ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index 56c5ad20ab0..c71374e34a3 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -558,28 +558,32 @@ static HRESULT STDMETHODCALLTYPE raw_game_controller_statics_add_RawGameControll IRawGameControllerStatics *iface, IEventHandler_RawGameController *value, EventRegistrationToken* token) { FIXME("iface %p, value %p, token %p stub!\n", iface, value, token); - return E_NOTIMPL; + if (!value) return E_INVALIDARG; + token->value = 0; + return S_OK; } static HRESULT STDMETHODCALLTYPE raw_game_controller_statics_remove_RawGameControllerAdded( IRawGameControllerStatics *iface, EventRegistrationToken token) { FIXME("iface %p, token %#I64x stub!\n", iface, token.value); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE raw_game_controller_statics_add_RawGameControllerRemoved( IRawGameControllerStatics *iface, IEventHandler_RawGameController *value, EventRegistrationToken* token) { FIXME("iface %p, value %p, token %p stub!\n", iface, value, token); - return E_NOTIMPL; + if (!value) return E_INVALIDARG; + token->value = 0; + return S_OK; } static HRESULT STDMETHODCALLTYPE raw_game_controller_statics_remove_RawGameControllerRemoved( IRawGameControllerStatics *iface, EventRegistrationToken token) { FIXME("iface %p, token %#I64x stub!\n", iface, token.value); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE raw_game_controller_statics_get_RawGameControllers( diff --git a/dlls/windows.gaming.input/tests/input.c b/dlls/windows.gaming.input/tests/input.c index a359f225728..62822b30c28 100644 --- a/dlls/windows.gaming.input/tests/input.c +++ b/dlls/windows.gaming.input/tests/input.c @@ -359,19 +359,22 @@ static void test_RawGameController(void) token.value = 0xdeadbeef; hr = IRawGameControllerStatics_add_RawGameControllerAdded(controller_statics, &controller_event_handler.IEventHandler_RawGameController_iface, &token); - todo_wine ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#x\n", hr); - todo_wine ok(token.value != 0xdeadbeef, "IRawGameControllerStatics_add_RawGameControllerAdded returned token %#I64x\n", token.value); + ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#x\n", hr); + ok(token.value != 0xdeadbeef, "IRawGameControllerStatics_add_RawGameControllerAdded returned token %#I64x\n", token.value); hr = IRawGameControllerStatics_remove_RawGameControllerAdded(controller_statics, token); - todo_wine ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#x\n", hr); + ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#x\n", hr); token.value = 0xdeadbeef; IRawGameControllerStatics_add_RawGameControllerRemoved(controller_statics, &controller_event_handler.IEventHandler_RawGameController_iface, &token); - todo_wine ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerRemoved failed, hr %#x\n", hr); - todo_wine ok(token.value != 0xdeadbeef, "IRawGameControllerStatics_add_RawGameControllerRemoved returned token %#I64x\n", token.value); + ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerRemoved failed, hr %#x\n", hr); + ok(token.value != 0xdeadbeef, "IRawGameControllerStatics_add_RawGameControllerRemoved returned token %#I64x\n", token.value); hr = IRawGameControllerStatics_remove_RawGameControllerRemoved(controller_statics, token); - todo_wine ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#x\n", hr); + ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#x\n", hr); + + hr = IRawGameControllerStatics_add_RawGameControllerAdded(controller_statics, NULL, &token); + ok(hr == E_INVALIDARG, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#x\n", hr); IRawGameControllerStatics_Release(controller_statics);

1 0

Nikolay Sivov : gdiplus/metafile: Implement DrawEllipse() recording.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: 4e55ec2b9eaac4d70202bb752690ca00d45fae37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e55ec2b9eaac4d70202bb75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 18 15:18:00 2021 +0300 gdiplus/metafile: Implement DrawEllipse() recording. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 10 ++++++++ dlls/gdiplus/metafile.c | 34 +++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 58 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 103 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 4bca5b13be9..0b6dfb69b07 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -110,6 +110,7 @@ extern GpStatus METAFILE_DrawDriverString(GpMetafile *metafile, GDIPCONST UINT16 extern GpStatus METAFILE_FillRegion(GpMetafile* metafile, GpBrush* brush, GpRegion* region) DECLSPEC_HIDDEN; extern void METAFILE_Free(GpMetafile *metafile) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_DrawEllipse(GpMetafile *metafile, GpPen *pen, GpRectF *rect) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7b4794e3620..b2d0e6bf59b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2906,6 +2906,7 @@ GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics *graphics, GpPen *pen, REAL x, { GpPath *path; GpStatus status; + GpRectF rect; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height); @@ -2915,6 +2916,15 @@ GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics *graphics, GpPen *pen, REAL x, if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + rect.X = x; + rect.Y = y; + rect.Width = width; + rect.Height = height; + return METAFILE_DrawEllipse((GpMetafile *)graphics->image, pen, &rect); + } + status = GdipCreatePath(FillModeAlternate, &path); if (status != Ok) return status; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 5ff6b113c3d..3e7853ecd50 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -4774,6 +4774,40 @@ GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) return Ok; } +GpStatus METAFILE_DrawEllipse(GpMetafile *metafile, GpPen *pen, GpRectF *rect) +{ + EmfPlusDrawEllipse *record; + GpStatus stat; + DWORD pen_id; + + if (metafile->metafile_type == MetafileTypeEmf) + { + FIXME("stub!\n"); + return NotImplemented; + } + + stat = METAFILE_AddPenObject(metafile, pen, &pen_id); + if (stat != Ok) return stat; + + stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusDrawEllipse), (void **)&record); + if (stat != Ok) return stat; + record->Header.Type = EmfPlusRecordTypeDrawEllipse; + record->Header.Flags = pen_id; + if (is_integer_rect(rect)) + { + record->Header.Flags |= 0x4000; + record->RectData.rect.X = (SHORT)rect->X; + record->RectData.rect.Y = (SHORT)rect->Y; + record->RectData.rect.Width = (SHORT)rect->Width; + record->RectData.rect.Height = (SHORT)rect->Height; + } + else + memcpy(&record->RectData.rectF, rect, sizeof(*rect)); + + METAFILE_WriteRecords(metafile); + return Ok; +} + GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) { EmfPlusFillPath *fill_path_record; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 60659bf3119..fede802b675 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3536,6 +3536,63 @@ static void test_printer_dc(void) GdipDisposeImage((GpImage *)metafile); } +static const emfplus_record draw_ellipse_records[] = +{ + { EMR_HEADER }, + { EmfPlusRecordTypeHeader }, + { EmfPlusRecordTypeObject, ObjectTypePen << 8 }, + { EmfPlusRecordTypeDrawEllipse, 0x4000 }, + { EMR_SAVEDC, 0, 1 }, + { EMR_SETICMMODE, 0, 1 }, + { EMR_BITBLT, 0, 1 }, + { EMR_RESTOREDC, 0, 1 }, + { EmfPlusRecordTypeEndOfFile }, + { EMR_EOF }, + { 0 } +}; + +static void test_drawellipse(void) +{ + static const GpRectF frame = { 0.0f, 0.0f, 100.0f, 100.0f }; + + GpMetafile *metafile; + GpGraphics *graphics; + HENHMETAFILE hemf; + GpStatus stat; + GpPen *pen; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage *)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, stat); + + stat = GdipDrawEllipse(graphics, pen, 1.0f, 1.0f, 16.0f, 32.0f); + expect(Ok, stat); + + stat = GdipDeletePen(pen); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "draw_ellipse.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, draw_ellipse_records, "draw ellipse"); + DeleteEnhMetaFile(hemf); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3590,6 +3647,7 @@ START_TEST(metafile) test_fillregion(); test_lineargradient(); test_printer_dc(); + test_drawellipse(); GdiplusShutdown(gdiplusToken); }

1 0

Nikolay Sivov : gdiplus/metafile: Implement FillEllipse() recording.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: 81b7555da8bfa48ec494bfb57827fc8e8ab3a1aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=81b7555da8bfa48ec494bfb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 18 15:18:01 2021 +0300 gdiplus/metafile: Implement FillEllipse() recording. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 11 ++++++++ dlls/gdiplus/metafile.c | 46 +++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 58 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 116 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 0b6dfb69b07..9b608035909 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -111,6 +111,7 @@ extern GpStatus METAFILE_FillRegion(GpMetafile* metafile, GpBrush* brush, GpRegion* region) DECLSPEC_HIDDEN; extern void METAFILE_Free(GpMetafile *metafile) DECLSPEC_HIDDEN; extern GpStatus METAFILE_DrawEllipse(GpMetafile *metafile, GpPen *pen, GpRectF *rect) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_FillEllipse(GpMetafile *metafile, GpBrush *brush, GpRectF *rect) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b2d0e6bf59b..97dfc4a75f2 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4258,6 +4258,17 @@ GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics *graphics, GpBrush *brush, REAL x if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + GpRectF rect; + + rect.X = x; + rect.Y = y; + rect.Width = width; + rect.Height = height; + return METAFILE_FillEllipse((GpMetafile *)graphics->image, brush, &rect); + } + stat = GdipCreatePath(FillModeAlternate, &path); if (stat == Ok) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 3e7853ecd50..c285dc58f40 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -4850,6 +4850,52 @@ GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) return Ok; } +GpStatus METAFILE_FillEllipse(GpMetafile *metafile, GpBrush *brush, GpRectF *rect) +{ + EmfPlusFillEllipse *record; + DWORD brush_id = -1; + BOOL inline_color; + GpStatus stat; + + if (metafile->metafile_type == MetafileTypeEmf) + { + FIXME("stub!\n"); + return NotImplemented; + } + + inline_color = brush->bt == BrushTypeSolidColor; + if (!inline_color) + { + stat = METAFILE_AddBrushObject(metafile, brush, &brush_id); + if (stat != Ok) return stat; + } + + stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusFillEllipse), (void **)&record); + if (stat != Ok) return stat; + record->Header.Type = EmfPlusRecordTypeFillEllipse; + if (inline_color) + { + record->Header.Flags = 0x8000; + record->BrushId = ((GpSolidFill *)brush)->color; + } + else + record->BrushId = brush_id; + + if (is_integer_rect(rect)) + { + record->Header.Flags |= 0x4000; + record->RectData.rect.X = (SHORT)rect->X; + record->RectData.rect.Y = (SHORT)rect->Y; + record->RectData.rect.Width = (SHORT)rect->Width; + record->RectData.rect.Height = (SHORT)rect->Height; + } + else + memcpy(&record->RectData.rectF, rect, sizeof(*rect)); + + METAFILE_WriteRecords(metafile); + return Ok; +} + static GpStatus METAFILE_AddFontObject(GpMetafile *metafile, GDIPCONST GpFont *font, DWORD *id) { EmfPlusObject *object_record; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index fede802b675..410e9a6ab8c 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3593,6 +3593,63 @@ static void test_drawellipse(void) expect(Ok, stat); } +static const emfplus_record fill_ellipse_records[] = +{ + { EMR_HEADER }, + { EmfPlusRecordTypeHeader }, + { EmfPlusRecordTypeFillEllipse, 0xc000 }, + { EMR_SAVEDC, 0, 1 }, + { EMR_SETICMMODE, 0, 1 }, + { EMR_BITBLT, 0, 1 }, + { EMR_RESTOREDC, 0, 1 }, + { EmfPlusRecordTypeEndOfFile }, + { EMR_EOF }, + { 0 } +}; + +static void test_fillellipse(void) +{ + static const GpRectF frame = { 0.0f, 0.0f, 100.0f, 100.0f }; + + GpMetafile *metafile; + GpGraphics *graphics; + GpSolidFill *brush; + HENHMETAFILE hemf; + GpStatus stat; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreateSolidFill(0xffaabbcc, &brush); + expect(Ok, stat); + + stat = GdipFillEllipse(graphics, (GpBrush *)brush, 0.0f, 0.0f, 10.0f, 20.0f); + expect(Ok, stat); + + stat = GdipDeleteBrush((GpBrush*)brush); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "fill_ellipse.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, fill_ellipse_records, "fill ellipse"); + + DeleteEnhMetaFile(hemf); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3648,6 +3705,7 @@ START_TEST(metafile) test_lineargradient(); test_printer_dc(); test_drawellipse(); + test_fillellipse(); GdiplusShutdown(gdiplusToken); }

1 0

Zebediah Figura : opencl: Do not return an NTSTATUS from DllMain.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: afa9f6eaed009971ded62aebdd8dea5edb68e759 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afa9f6eaed009971ded62aeb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 20 15:59:22 2021 -0500 opencl: Do not return an NTSTATUS from DllMain. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/pe_wrappers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opencl/pe_wrappers.c b/dlls/opencl/pe_wrappers.c index 35c78181580..77c49064c7b 100644 --- a/dlls/opencl/pe_wrappers.c +++ b/dlls/opencl/pe_wrappers.c @@ -132,7 +132,7 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) if (reason == DLL_PROCESS_ATTACH) { DisableThreadLibraryCalls( instance ); - return __wine_init_unix_lib( instance, reason, NULL, &opencl_funcs ); + return !__wine_init_unix_lib( instance, reason, NULL, &opencl_funcs ); } return TRUE; }

1 0

Zebediah Figura : opencl: Expose extensions that don't use new commands.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: 540e627acdfc084683dc5f56faa6e4fad1472458 URL: https://source.winehq.org/git/wine.git/?a=commit;h=540e627acdfc084683dc5f56… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 20 15:59:23 2021 -0500 opencl: Expose extensions that don't use new commands. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/make_opencl | 61 +++++++++++++++++++ dlls/opencl/opencl_private.h | 3 + dlls/opencl/pe_thunks.c | 47 +++++++++++++++ dlls/opencl/pe_wrappers.c | 136 ++++++++++++++++++++++++++++++------------- dlls/opencl/unix_private.h | 11 +++- 5 files changed, 218 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=540e627acdfc084683dc…

1 0

Zebediah Figura : opencl: Update to OpenCL 1.1.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: 8dd66ebecc36f592649dff7f80c8540cabbcacea URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dd66ebecc36f592649dff7f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 20 15:59:24 2021 -0500 opencl: Update to OpenCL 1.1. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/make_opencl | 9 ++++++++- dlls/opencl/opencl.spec | 8 ++++++++ dlls/opencl/opencl_types.h | 28 ++++++++++++++++++++++++++ dlls/opencl/pe_thunks.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ dlls/opencl/unix_private.h | 8 ++++++++ dlls/opencl/unix_thunks.c | 38 +++++++++++++++++++++++++++++++++++ dlls/opencl/unix_wrappers.c | 16 +++++++++++++++ dlls/opencl/unixlib.h | 8 ++++++++ 8 files changed, 162 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8dd66ebecc36f592649d…

1 0

Zebediah Figura : opencl: Update to OpenCL 1.2.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: a292001da28d9741b98dd7e1b0fc10ed831d88c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a292001da28d9741b98dd7e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 20 15:59:25 2021 -0500 opencl: Update to OpenCL 1.2. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/make_opencl | 11 ++++- dlls/opencl/opencl.spec | 15 +++++++ dlls/opencl/opencl_types.h | 105 ++++++++++++++++++++++++++++++++++++++++++++ dlls/opencl/pe_thunks.c | 84 +++++++++++++++++++++++++++++++++++ dlls/opencl/pe_wrappers.c | 7 +++ dlls/opencl/unix_private.h | 11 +++++ dlls/opencl/unix_thunks.c | 74 +++++++++++++++++++++++++++++++ dlls/opencl/unix_wrappers.c | 20 +++++++++ dlls/opencl/unixlib.h | 14 ++++++ 9 files changed, 340 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a292001da28d9741b98d…

1 0

Gijs Vermeulen : wtsapi32: Avoid calling GetUserNameW() twice in WTSQuerySessionInformationW(WTSUserName).
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: 6a822d4708ee229a1982bca8d8b01fc5abf74e2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a822d4708ee229a1982bca8… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Mar 21 22:50:45 2021 +0100 wtsapi32: Avoid calling GetUserNameW() twice in WTSQuerySessionInformationW(WTSUserName). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/wtsapi32.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index ef3e0d10a0f..ae7a6c195f8 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -20,6 +20,7 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "lmcons.h" #include "wtsapi32.h" #include "wine/debug.h" #include "wine/heap.h" @@ -330,41 +331,32 @@ BOOL WINAPI WTSQuerySessionInformationA(HANDLE server, DWORD session_id, WTS_INF /************************************************************ * WTSQuerySessionInformationW (WTSAPI32.@) */ -BOOL WINAPI WTSQuerySessionInformationW( - HANDLE hServer, - DWORD SessionId, - WTS_INFO_CLASS WTSInfoClass, - LPWSTR* Buffer, - DWORD* BytesReturned) +BOOL WINAPI WTSQuerySessionInformationW(HANDLE server, DWORD session_id, WTS_INFO_CLASS class, WCHAR **buffer, DWORD *count) { - /* FIXME: Forward request to winsta.dll::WinStationQueryInformationW */ - FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, - Buffer, BytesReturned); + TRACE("%p 0x%08x %d %p %p\n", server, session_id, class, buffer, count); - if (!Buffer || !BytesReturned) + if (!buffer || !count) { SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; } - if (WTSInfoClass == WTSUserName) + if (class == WTSUserName) { + DWORD size = UNLEN + 1; WCHAR *username; - DWORD count = 0; - - GetUserNameW(NULL, &count); - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FALSE; - if (!(username = heap_alloc(count * sizeof(WCHAR)))) return FALSE; - GetUserNameW(username, &count); - *Buffer = username; - *BytesReturned = count * sizeof(WCHAR); + + if (!(username = heap_alloc(size * sizeof(WCHAR)))) return FALSE; + GetUserNameW(username, &size); + *buffer = username; + *count = size * sizeof(WCHAR); return TRUE; } - else - { - *Buffer = NULL; - *BytesReturned = 0; - } + + FIXME("Unimplemented class %d\n", class); + + *buffer = NULL; + *count = 0; return FALSE; }

1 0

Gijs Vermeulen : wtsapi32/tests: Test returned username for WTSQuerySessionInformation(WTSUserName).
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: e07c658fafc39432694f96a762a4a2f6cef20bf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e07c658fafc39432694f96a7… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Mar 21 22:50:46 2021 +0100 wtsapi32/tests: Test returned username for WTSQuerySessionInformation(WTSUserName). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/tests/Makefile.in | 2 +- dlls/wtsapi32/tests/wtsapi.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wtsapi32/tests/Makefile.in b/dlls/wtsapi32/tests/Makefile.in index a398a8085cd..be0fa8d6772 100644 --- a/dlls/wtsapi32/tests/Makefile.in +++ b/dlls/wtsapi32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wtsapi32.dll -IMPORTS = wtsapi32 +IMPORTS = wtsapi32 advapi32 C_SRCS = \ wtsapi.c diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index c9312cd97c5..7cff02de526 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -21,6 +21,7 @@ #include <windef.h> #include <winbase.h> #include <winternl.h> +#include <lmcons.h> #include <wtsapi32.h> #include "wine/test.h" @@ -92,10 +93,10 @@ static void test_WTSEnumerateProcessesW(void) static void test_WTSQuerySessionInformation(void) { + WCHAR *buf1, usernameW[UNLEN + 1]; + char *buf2, username[UNLEN + 1]; + DWORD count, tempsize; BOOL ret; - WCHAR *buf1; - char *buf2; - DWORD count; SetLastError(0xdeadbeef); count = 0; @@ -122,6 +123,11 @@ static void test_WTSQuerySessionInformation(void) ok(ret, "got %u\n", GetLastError()); ok(buf1 != NULL, "buf not set\n"); ok(count == (lstrlenW(buf1) + 1) * sizeof(WCHAR), "expected %u, got %u\n", (lstrlenW(buf1) + 1) * sizeof(WCHAR), count); + tempsize = UNLEN + 1; + GetUserNameW(usernameW, &tempsize); + /* Windows Vista, 7 and 8 return uppercase username, while the rest return lowercase. */ + ok(!wcsicmp(buf1, usernameW), "expected %s, got %s\n", wine_dbgstr_w(usernameW), wine_dbgstr_w(buf1)); + ok(count == tempsize * sizeof(WCHAR), "expected %u, got %u\n", tempsize * sizeof(WCHAR), count); WTSFreeMemory(buf1); SetLastError(0xdeadbeef); @@ -149,6 +155,11 @@ static void test_WTSQuerySessionInformation(void) ok(ret, "got %u\n", GetLastError()); ok(buf2 != NULL, "buf not set\n"); ok(count == lstrlenA(buf2) + 1, "expected %u, got %u\n", lstrlenA(buf2) + 1, count); + tempsize = UNLEN + 1; + GetUserNameA(username, &tempsize); + /* Windows Vista, 7 and 8 return uppercase username, while the rest return lowercase. */ + ok(!stricmp(buf2, username), "expected %s, got %s\n", username, buf2); + ok(count == tempsize, "expected %u, got %u\n", tempsize, count); WTSFreeMemory(buf2); }

1 0

Louis Lenders : wtsapi32: Implement WTSQuerySessionInformation(WTSDomainName).
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: c6f133f6351b66b265748fc338385cd29a553a53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6f133f6351b66b265748fc3… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Mar 21 22:50:47 2021 +0100 wtsapi32: Implement WTSQuerySessionInformation(WTSDomainName). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47310 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/tests/wtsapi.c | 30 ++++++++++++++++++++++++++++-- dlls/wtsapi32/wtsapi32.c | 14 ++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 7cff02de526..8ce1dc8bf9c 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -93,8 +93,8 @@ static void test_WTSEnumerateProcessesW(void) static void test_WTSQuerySessionInformation(void) { - WCHAR *buf1, usernameW[UNLEN + 1]; - char *buf2, username[UNLEN + 1]; + WCHAR *buf1, usernameW[UNLEN + 1], computernameW[MAX_COMPUTERNAME_LENGTH + 1]; + char *buf2, username[UNLEN + 1], computername[MAX_COMPUTERNAME_LENGTH + 1]; DWORD count, tempsize; BOOL ret; @@ -130,6 +130,19 @@ static void test_WTSQuerySessionInformation(void) ok(count == tempsize * sizeof(WCHAR), "expected %u, got %u\n", tempsize * sizeof(WCHAR), count); WTSFreeMemory(buf1); + count = 0; + buf1 = NULL; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSDomainName, &buf1, &count); + ok(ret, "got %u\n", GetLastError()); + ok(buf1 != NULL, "buf not set\n"); + ok(count == (lstrlenW(buf1) + 1) * sizeof(WCHAR), "expected %u, got %u\n", (lstrlenW(buf1) + 1) * sizeof(WCHAR), count); + tempsize = MAX_COMPUTERNAME_LENGTH + 1; + GetComputerNameW(computernameW, &tempsize); + /* Windows Vista, 7 and 8 return uppercase computername, while the rest return lowercase. */ + ok(!wcsicmp(buf1, computernameW), "expected %s, got %s\n", wine_dbgstr_w(computernameW), wine_dbgstr_w(buf1)); + ok(count == (tempsize + 1) * sizeof(WCHAR), "expected %u, got %u\n", (tempsize + 1) * sizeof(WCHAR), count); + WTSFreeMemory(buf1); + SetLastError(0xdeadbeef); count = 0; ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); @@ -161,6 +174,19 @@ static void test_WTSQuerySessionInformation(void) ok(!stricmp(buf2, username), "expected %s, got %s\n", username, buf2); ok(count == tempsize, "expected %u, got %u\n", tempsize, count); WTSFreeMemory(buf2); + + count = 0; + buf2 = NULL; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSDomainName, &buf2, &count); + ok(ret, "got %u\n", GetLastError()); + ok(buf2 != NULL, "buf not set\n"); + ok(count == lstrlenA(buf2) + 1, "expected %u, got %u\n", lstrlenA(buf2) + 1, count); + tempsize = MAX_COMPUTERNAME_LENGTH + 1; + GetComputerNameA(computername, &tempsize); + /* Windows Vista, 7 and 8 return uppercase computername, while the rest return lowercase. */ + ok(!stricmp(buf2, computername), "expected %s, got %s\n", computername, buf2); + ok(count == tempsize + 1, "expected %u, got %u\n", tempsize + 1, count); + WTSFreeMemory(buf2); } static void test_WTSQueryUserToken(void) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index ae7a6c195f8..a5c9bf6519f 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -353,6 +353,20 @@ BOOL WINAPI WTSQuerySessionInformationW(HANDLE server, DWORD session_id, WTS_INF return TRUE; } + if (class == WTSDomainName) + { + DWORD size = MAX_COMPUTERNAME_LENGTH + 1; + WCHAR *computername; + + if (!(computername = heap_alloc(size * sizeof(WCHAR)))) return FALSE; + GetComputerNameW(computername, &size); + *buffer = computername; + /* GetComputerNameW() return size doesn't include terminator */ + size++; + *count = size * sizeof(WCHAR); + return TRUE; + } + FIXME("Unimplemented class %d\n", class); *buffer = NULL;

1 0