September 2017 - Wine-commits

Hans Leidekker : webservices/tests: Add tests for asynchronous WsReceiveMessage.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 71121270ae3a5cf47f78ded0f0d23c630151da10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71121270ae3a5cf47f78ded0f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:15 2017 +0200 webservices/tests: Add tests for asynchronous WsReceiveMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/channel.c | 236 ++++++++++++++++++++++++++++++++------- 1 file changed, 193 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71121270ae3a5cf47f78d…

1 0

Hans Leidekker : webservices: Support more text types in is_empty_text_node.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 04ae90993a95515f38a827acf786ccca040eeab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ae90993a95515f38a827acf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:16 2017 +0200 webservices: Support more text types in is_empty_text_node. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 953af4c..c2dbdb0 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -5911,6 +5911,18 @@ static BOOL is_empty_text_node( const struct node *node ) const WS_XML_BASE64_TEXT *base64 = (const WS_XML_BASE64_TEXT *)text->text; return !base64->length; } + case WS_XML_TEXT_TYPE_BOOL: + case WS_XML_TEXT_TYPE_INT32: + case WS_XML_TEXT_TYPE_INT64: + case WS_XML_TEXT_TYPE_UINT64: + case WS_XML_TEXT_TYPE_FLOAT: + case WS_XML_TEXT_TYPE_DOUBLE: + case WS_XML_TEXT_TYPE_DECIMAL: + case WS_XML_TEXT_TYPE_GUID: + case WS_XML_TEXT_TYPE_UNIQUE_ID: + case WS_XML_TEXT_TYPE_DATETIME: + return FALSE; + default: ERR( "unhandled text type %u\n", text->text->textType ); return FALSE;

1 0

Hans Leidekker : webservices: Implement WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING in the reader.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: ca13227ebc7deb00c39f74f4b133fae4d5db3540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca13227ebc7deb00c39f74f4b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:17 2017 +0200 webservices: Implement WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 128 +++++++++++++++++----------------- dlls/webservices/tests/reader.c | 148 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 214 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca13227ebc7deb00c39f7…

1 0

Nikolay Sivov : dwrite: Added custom IDWriteFontFallback stub.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: c3252c37743eb813d2cc928fd3f57d00ebdfa28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3252c37743eb813d2cc928fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 21 14:41:25 2017 +0300 dwrite: Added custom IDWriteFontFallback stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 64 +++++++++++++++++++++++++++++++++++++++++++--- dlls/dwrite/tests/layout.c | 57 ++++++++++++++++++++++++++--------------- 2 files changed, 98 insertions(+), 23 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 23c2c0e..db488a0 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -209,6 +209,7 @@ static const struct fallback_mapping fontfallback_neutral_data[] = { struct dwrite_fontfallback { IDWriteFontFallback IDWriteFontFallback_iface; + LONG ref; IDWriteFactory5 *factory; IDWriteFontCollection1 *systemcollection; const struct fallback_mapping *mappings; @@ -2178,6 +2179,50 @@ void release_system_fontfallback(IDWriteFontFallback *iface) heap_free(fallback); } +static ULONG WINAPI customfontfallback_AddRef(IDWriteFontFallback *iface) +{ + struct dwrite_fontfallback *fallback = impl_from_IDWriteFontFallback(iface); + ULONG ref = InterlockedIncrement(&fallback->ref); + TRACE("(%p)->(%d)\n", fallback, ref); + return ref; +} + +static ULONG WINAPI customfontfallback_Release(IDWriteFontFallback *iface) +{ + struct dwrite_fontfallback *fallback = impl_from_IDWriteFontFallback(iface); + ULONG ref = InterlockedDecrement(&fallback->ref); + + TRACE("(%p)->(%d)\n", fallback, ref); + + if (!ref) { + IDWriteFactory5_Release(fallback->factory); + heap_free(fallback); + } + + return ref; +} + +static HRESULT WINAPI customfontfallback_MapCharacters(IDWriteFontFallback *iface, IDWriteTextAnalysisSource *source, + UINT32 position, UINT32 length, IDWriteFontCollection *basecollection, const WCHAR *basefamily, + DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, UINT32 *mapped_length, + IDWriteFont **ret_font, FLOAT *scale) +{ + struct dwrite_fontfallback *fallback = impl_from_IDWriteFontFallback(iface); + + FIXME("(%p)->(%p %u %u %p, %s, %u, %u, %u, %p, %p, %p)\n", fallback, source, position, length, + basecollection, debugstr_w(basefamily), weight, style, stretch, mapped_length, ret_font, scale); + + return E_NOTIMPL; +} + +static const IDWriteFontFallbackVtbl customfontfallbackvtbl = +{ + fontfallback_QueryInterface, + customfontfallback_AddRef, + customfontfallback_Release, + customfontfallback_MapCharacters, +}; + static HRESULT WINAPI fontfallbackbuilder_QueryInterface(IDWriteFontFallbackBuilder *iface, REFIID riid, void **obj) { struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); @@ -2239,13 +2284,26 @@ static HRESULT WINAPI fontfallbackbuilder_AddMappings(IDWriteFontFallbackBuilder } static HRESULT WINAPI fontfallbackbuilder_CreateFontFallback(IDWriteFontFallbackBuilder *iface, - IDWriteFontFallback **fallback) + IDWriteFontFallback **ret) { struct dwrite_fontfallback_builder *fallbackbuilder = impl_from_IDWriteFontFallbackBuilder(iface); + struct dwrite_fontfallback *fallback; - FIXME("(%p)->(%p): stub\n", fallbackbuilder, fallback); + FIXME("(%p)->(%p): stub\n", fallbackbuilder, ret); - return E_NOTIMPL; + *ret = NULL; + + fallback = heap_alloc(sizeof(*fallback)); + if (!fallback) + return E_OUTOFMEMORY; + + fallback->IDWriteFontFallback_iface.lpVtbl = &customfontfallbackvtbl; + fallback->ref = 1; + fallback->factory = fallbackbuilder->factory; + IDWriteFactory5_AddRef(fallback->factory); + + *ret = &fallback->IDWriteFontFallback_iface; + return S_OK; } static const IDWriteFontFallbackBuilderVtbl fontfallbackbuildervtbl = diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index d606b8e..ba3e852 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4655,8 +4655,8 @@ static void test_FontFallbackBuilder(void) { static const WCHAR localeW[] = {'l','o','c','a','l','e',0}; static const WCHAR strW[] = {'A',0}; + IDWriteFontFallback *fallback, *fallback2; IDWriteFontFallbackBuilder *builder; - IDWriteFontFallback *fallback; DWRITE_UNICODE_RANGE range; IDWriteFactory2 *factory2; IDWriteFactory *factory; @@ -4684,10 +4684,27 @@ static void test_FontFallbackBuilder(void) } fallback = NULL; + EXPECT_REF(factory2, 2); + EXPECT_REF(builder, 1); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(factory2, 3); + EXPECT_REF(fallback, 1); + EXPECT_REF(builder, 1); + + IDWriteFontFallback_AddRef(fallback); + EXPECT_REF(builder, 1); + EXPECT_REF(fallback, 2); + EXPECT_REF(factory2, 3); + IDWriteFontFallback_Release(fallback); + /* New instance is created every time, even if mappings have not changed. */ + hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback2); + ok(hr == S_OK, "Failed to create fallback object, hr %#x.\n", hr); + ok(fallback != fallback2, "Unexpected fallback instance.\n"); + IDWriteFontFallback_Release(fallback2); + +todo_wine { hr = IDWriteFontFallbackBuilder_AddMapping(builder, NULL, 0, NULL, 0, NULL, NULL, NULL, 0.0f); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -4724,17 +4741,14 @@ todo_wine { hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, NULL, NULL, NULL, 4.0f); ok(hr == S_OK, "got 0x%08x\n", hr); } - if (fallback) - IDWriteFontFallback_Release(fallback); + IDWriteFontFallback_Release(fallback); if (0) /* crashes on native */ hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, NULL); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { /* fallback font missing from system collection */ g_source = strW; mappedlength = 0; @@ -4742,13 +4756,14 @@ if (hr == S_OK) { font = (void*)0xdeadbeef; hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); +todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 1.0f, "got %f\n", scale); ok(font == NULL, "got %p\n", font); - - IDWriteFontFallback_Release(fallback); } + IDWriteFontFallback_Release(fallback); + /* remap with custom collection */ range.first = range.last = 'A'; hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, &fallbackcollection, NULL, NULL, 5.0f); @@ -4756,24 +4771,25 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { g_source = strW; mappedlength = 0; scale = 0.0f; font = NULL; hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); +todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 5.0f, "got %f\n", scale); ok(font != NULL, "got %p\n", font); - IDWriteFont_Release(font); +} + if (font) + IDWriteFont_Release(font); IDWriteFontFallback_Release(fallback); -} + range.first = 'B'; range.last = 'A'; hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, &fallbackcollection, NULL, NULL, 6.0f); @@ -4781,24 +4797,25 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { g_source = strW; mappedlength = 0; scale = 0.0f; font = NULL; hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); +todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 5.0f, "got %f\n", scale); ok(font != NULL, "got %p\n", font); - IDWriteFont_Release(font); +} + if (font) + IDWriteFont_Release(font); IDWriteFontFallback_Release(fallback); -} + /* explicit locale */ range.first = 'A'; range.last = 'B'; @@ -4807,24 +4824,24 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { g_source = strW; mappedlength = 0; scale = 0.0f; font = NULL; hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); +todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 5.0f, "got %f\n", scale); ok(font != NULL, "got %p\n", font); - IDWriteFont_Release(font); +} + if (font) + IDWriteFont_Release(font); IDWriteFontFallback_Release(fallback); -} IDWriteFontFallbackBuilder_Release(builder); ref = IDWriteFactory2_Release(factory2);

1 0

Hugh Bellamy : gdiplus: Add GdipCreateLineBrushFromRectWithAngle tests.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: b8f56c0b8641706c003fc84106243fb759283939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f56c0b8641706c003fc8410… Author: Hugh Bellamy <hughbellars(a)gmail.com> Date: Wed Sep 20 17:42:31 2017 +0100 gdiplus: Add GdipCreateLineBrushFromRectWithAngle tests. Signed-off-by: Hugh Bellamy <hughbellars(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 5 +++- dlls/gdiplus/tests/brush.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index d5cd94a..26e3419 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -481,9 +481,12 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect TRACE("(%p, %x, %x, %.2f, %d, %d, %p)\n", rect, startcolor, endcolor, angle, isAngleScalable, wrap, line); - if (!rect || !rect->Width || !rect->Height) + if (!rect || !line || wrap == WrapModeClamp) return InvalidParameter; + if (!rect->Width || !rect->Height) + return OutOfMemory; + angle = fmodf(angle, 360); if (angle < 0) angle += 360; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 45b2710..9be500d 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -72,6 +72,68 @@ static void test_createHatchBrush(void) expect(InvalidParameter, status); } +static void test_createLineBrushFromRectWithAngle(void) +{ + GpStatus status; + GpLineGradient *brush; + GpRectF rect1 = { 1, 3, 1, 2 }; + GpRectF rect2 = { 1, 3, -1, -2 }; + GpRectF rect3 = { 1, 3, 0, 1 }; + GpRectF rect4 = { 1, 3, 1, 0 }; + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 0, TRUE, WrapModeTile, &brush); + expect(Ok, status); + GdipDeleteBrush((GpBrush *) brush); + + status = GdipCreateLineBrushFromRectWithAngle(&rect2, 10, 11, 135, TRUE, (WrapMode)(WrapModeTile - 1), &brush); + expect(Ok, status); + GdipDeleteBrush((GpBrush *) brush); + + status = GdipCreateLineBrushFromRectWithAngle(&rect2, 10, 11, -225, FALSE, (WrapMode)(WrapModeTile - 1), &brush); + expect(Ok, status); + GdipDeleteBrush((GpBrush *) brush); + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 405, TRUE, (WrapMode)(WrapModeClamp + 1), &brush); + expect(Ok, status); + GdipDeleteBrush((GpBrush *) brush); + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 45, FALSE, (WrapMode)(WrapModeClamp + 1), &brush); + expect(Ok, status); + GdipDeleteBrush((GpBrush *) brush); + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 90, TRUE, WrapModeTileFlipX, &brush); + expect(Ok, status); + + status = GdipCreateLineBrushFromRectWithAngle(NULL, 10, 11, 90, TRUE, WrapModeTile, &brush); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect3, 10, 11, 90, TRUE, WrapModeTileFlipXY, &brush); + expect(OutOfMemory, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect4, 10, 11, 90, TRUE, WrapModeTileFlipXY, &brush); + expect(OutOfMemory, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect3, 10, 11, 90, TRUE, WrapModeTileFlipXY, NULL); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect4, 10, 11, 90, TRUE, WrapModeTileFlipXY, NULL); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect3, 10, 11, 90, TRUE, WrapModeClamp, &brush); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect4, 10, 11, 90, TRUE, WrapModeClamp, &brush); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 90, TRUE, WrapModeClamp, &brush); + expect(InvalidParameter, status); + + status = GdipCreateLineBrushFromRectWithAngle(&rect1, 10, 11, 90, TRUE, WrapModeTile, NULL); + expect(InvalidParameter, status); + + GdipDeleteBrush((GpBrush *) brush); +} + static void test_type(void) { GpStatus status; @@ -1612,6 +1674,7 @@ START_TEST(brush) test_constructor_destructor(); test_createHatchBrush(); + test_createLineBrushFromRectWithAngle(); test_type(); test_gradientblendcount(); test_getblend();

1 0

Alexandre Julliard : kernel32/tests: Add some more tests for write watches.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 2b0725f95a2c77074743fdeb74f45f28c01128db URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0725f95a2c77074743fdeb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 21 19:50:09 2017 +0200 kernel32/tests: Add some more tests for write watches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 206 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 169 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b0725f95a2c77074743f…

1 0

Józef Kucia : xinput1_4: Avoid DLL forwarding.
by Alexandre Julliard 20 Sep '17

20 Sep '17

Module: wine Branch: master Commit: 315a3b4a2fe5be4dcabbe570af75084df8b6ae35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=315a3b4a2fe5be4dcabbe570a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 20 19:12:06 2017 +0200 xinput1_4: Avoid DLL forwarding. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_4/Makefile.in | 4 ++++ dlls/xinput1_4/xinput1_4.spec | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in index f881d19..92bcb4b 100644 --- a/dlls/xinput1_4/Makefile.in +++ b/dlls/xinput1_4/Makefile.in @@ -1,3 +1,7 @@ MODULE = xinput1_4.dll +PARENTSRC = ../xinput1_3 + +C_SRCS = \ + xinput_main.c RC_SRCS = version.rc diff --git a/dlls/xinput1_4/xinput1_4.spec b/dlls/xinput1_4/xinput1_4.spec index 4b88c71..8c3f4c0 100644 --- a/dlls/xinput1_4/xinput1_4.spec +++ b/dlls/xinput1_4/xinput1_4.spec @@ -1,9 +1,9 @@ 1 stdcall -private DllMain(long long ptr) -2 stdcall XInputGetState(long ptr) xinput1_3.XInputGetState -3 stdcall XInputSetState(long ptr) xinput1_3.XInputSetState -4 stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities -5 stdcall XInputEnable(long) xinput1_3.XInputEnable -7 stdcall XInputGetBatteryInformation(long long ptr) xinput1_3.XInputGetBatteryInformation -8 stdcall XInputGetKeystroke(long long ptr) xinput1_3.XInputGetKeystroke +2 stdcall XInputGetState(long ptr) +3 stdcall XInputSetState(long ptr) +4 stdcall XInputGetCapabilities(long long ptr) +5 stdcall XInputEnable(long) +7 stdcall XInputGetBatteryInformation(long long ptr) +8 stdcall XInputGetKeystroke(long long ptr) 10 stub XInputGetAudioDeviceIds(long ptr ptr ptr ptr) -100 stdcall XInputGetStateEx(long ptr) xinput1_3.XInputGetStateEx +100 stdcall XInputGetStateEx(long ptr)

1 0

Michael Müller : xinput9_1_0: Avoid DLL forwarding.
by Alexandre Julliard 20 Sep '17

20 Sep '17

Module: wine Branch: master Commit: 0991e015316e382f787b1f5c93b483c3faf04b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0991e015316e382f787b1f5c9… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Sep 20 19:12:07 2017 +0200 xinput9_1_0: Avoid DLL forwarding. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput9_1_0/Makefile.in | 4 ++++ dlls/xinput9_1_0/xinput9_1_0.spec | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in index 0c4b7e7..900efb3 100644 --- a/dlls/xinput9_1_0/Makefile.in +++ b/dlls/xinput9_1_0/Makefile.in @@ -1,3 +1,7 @@ MODULE = xinput9_1_0.dll +PARENTSRC = ../xinput1_3 + +C_SRCS = \ + xinput_main.c RC_SRCS = version.rc diff --git a/dlls/xinput9_1_0/xinput9_1_0.spec b/dlls/xinput9_1_0/xinput9_1_0.spec index 5d95b3e..8833ffb 100644 --- a/dlls/xinput9_1_0/xinput9_1_0.spec +++ b/dlls/xinput9_1_0/xinput9_1_0.spec @@ -1,4 +1,4 @@ -@ stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities -@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids -@ stdcall XInputSetState(long ptr) xinput1_3.XInputSetState -@ stdcall XInputGetState(long ptr) xinput1_3.XInputGetState +@ stdcall XInputGetCapabilities(long long ptr) +@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) +@ stdcall XInputSetState(long ptr) +@ stdcall XInputGetState(long ptr)

1 0

Dmitry Timoshkov : ole32: Add a trace to IDataObject::GetData.
by Alexandre Julliard 20 Sep '17

20 Sep '17

Module: wine Branch: master Commit: 7ce77b464c6620f60bda6332cbb87be608d04264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ce77b464c6620f60bda6332c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 20 13:45:37 2017 +0100 ole32: Add a trace to IDataObject::GetData. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index ecae89d..a95d0fb 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1245,6 +1245,8 @@ static HRESULT WINAPI DataCache_GetData( DataCache *This = impl_from_IDataObject(iface); DataCacheEntry *cache_entry; + TRACE("(%p, %s, %p)\n", iface, debugstr_formatetc(pformatetcIn), pmedium); + memset(pmedium, 0, sizeof(*pmedium)); cache_entry = DataCache_GetEntryForFormatEtc(This, pformatetcIn);

1 0

Dmitry Timoshkov : ole32: Trace clsid in IStorage::SetClass.
by Alexandre Julliard 20 Sep '17

20 Sep '17

Module: wine Branch: master Commit: ae7571a5bbe4d9cd8aa409d357ef7aefd0172ab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae7571a5bbe4d9cd8aa409d35… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 20 13:45:38 2017 +0100 ole32: Trace clsid in IStorage::SetClass. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/storage32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 2bc9d3d..2da7a99 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2085,7 +2085,7 @@ static HRESULT WINAPI StorageBaseImpl_SetClass( HRESULT hRes; DirEntry currentEntry; - TRACE("(%p, %p)\n", iface, clsid); + TRACE("(%p, %s)\n", iface, wine_dbgstr_guid(clsid)); if (This->reverted) return STG_E_REVERTED;

1 0