January 2020 - Wine-commits

Nikolay Sivov : ole32: Fix comparison data for antimoniker.
by Alexandre Julliard 24 Jan '20

24 Jan '20

Module: wine Branch: master Commit: 31f5f9da801c7c04dfff67e832f9eea5d1051a38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31f5f9da801c7c04dfff67e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 24 12:21:30 2020 +0300 ole32: Fix comparison data for antimoniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/antimoniker.c | 15 +++++++-------- dlls/ole32/tests/moniker.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 9b02129021..ff2e287070 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -540,19 +540,18 @@ static ULONG WINAPI AntiMonikerROTDataImpl_Release(IROTData* iface) * AntiMonikerIROTData_GetComparisonData ******************************************************************************/ static HRESULT WINAPI -AntiMonikerROTDataImpl_GetComparisonData(IROTData* iface, BYTE* pbData, - ULONG cbMax, ULONG* pcbData) +AntiMonikerROTDataImpl_GetComparisonData(IROTData *iface, BYTE *data, ULONG data_len, ULONG *data_req) { - DWORD constant = 1; + AntiMonikerImpl *moniker = impl_from_IROTData(iface); - TRACE("(%p, %u, %p)\n", pbData, cbMax, pcbData); + TRACE("%p, %p, %u, %p.\n", iface, data, data_len, data_req); - *pcbData = sizeof(CLSID) + sizeof(DWORD); - if (cbMax < *pcbData) + *data_req = sizeof(CLSID) + sizeof(DWORD); + if (data_len < *data_req) return E_OUTOFMEMORY; - memcpy(pbData, &CLSID_AntiMoniker, sizeof(CLSID)); - memcpy(pbData+sizeof(CLSID), &constant, sizeof(DWORD)); + memcpy(data, &CLSID_AntiMoniker, sizeof(CLSID)); + memcpy(data + sizeof(CLSID), &moniker->count, sizeof(moniker->count)); return S_OK; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 65cd279b1a..5fff7041ef 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1412,11 +1412,27 @@ static const BYTE expected_anti_moniker_marshal_data[] = 0x01,0x00,0x00,0x00, }; +static const BYTE expected_anti_moniker_marshal_data2[] = +{ + 0x4d,0x45,0x4f,0x57,0x04,0x00,0x00,0x00, + 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x05,0x03,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x00,0x00,0x00,0x00,0x14,0x00,0x00,0x00, + 0x02,0x00,0x00,0x00, +}; + static const BYTE expected_anti_moniker_saved_data[] = { 0x01,0x00,0x00,0x00, }; +static const BYTE expected_anti_moniker_saved_data2[] = +{ + 0x02,0x00,0x00,0x00, +}; + static const BYTE expected_anti_moniker_comparison_data[] = { 0x05,0x03,0x00,0x00,0x00,0x00,0x00,0x00, @@ -1424,6 +1440,13 @@ static const BYTE expected_anti_moniker_comparison_data[] = 0x01,0x00,0x00,0x00, }; +static const BYTE expected_anti_moniker_comparison_data2[] = +{ + 0x05,0x03,0x00,0x00,0x00,0x00,0x00,0x00, + 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, + 0x02,0x00,0x00,0x00, +}; + static const BYTE expected_gc_moniker_marshal_data[] = { 0x4d,0x45,0x4f,0x57,0x04,0x00,0x00,0x00, @@ -2330,6 +2353,12 @@ todo_wine hr = IMoniker_Load(moniker, stream); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + test_moniker("anti moniker 2", moniker, + expected_anti_moniker_marshal_data2, sizeof(expected_anti_moniker_marshal_data2), + expected_anti_moniker_saved_data2, sizeof(expected_anti_moniker_saved_data2), + expected_anti_moniker_comparison_data2, sizeof(expected_anti_moniker_comparison_data2), + 20, L"\\..\\.."); + hr = IMoniker_IsEqual(moniker, moniker2); ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : ole32: Fix CommonPrefixWith() for antimoniker, when other is also antimoniker.
by Alexandre Julliard 24 Jan '20

24 Jan '20

Module: wine Branch: master Commit: cdf51b39228f5c2da0ab8663d72101cf66622a79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf51b39228f5c2da0ab8663… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 24 12:21:31 2020 +0300 ole32: Fix CommonPrefixWith() for antimoniker, when other is also antimoniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/antimoniker.c | 37 +++++++++++++++----------- dlls/ole32/tests/moniker.c | 66 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 86 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index ff2e287070..5bce4fc5da 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -400,25 +400,32 @@ AntiMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) /****************************************************************************** * AntiMoniker_CommonPrefixWith ******************************************************************************/ -static HRESULT WINAPI -AntiMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) +static HRESULT WINAPI AntiMonikerImpl_CommonPrefixWith(IMoniker *iface, IMoniker *other, IMoniker **prefix) { - DWORD mkSys; - - IMoniker_IsSystemMoniker(pmkOther,&mkSys); - - if(mkSys==MKSYS_ANTIMONIKER){ - - IMoniker_AddRef(iface); - - *ppmkPrefix=iface; + AntiMonikerImpl *moniker = impl_from_IMoniker(iface), *other_moniker; + HRESULT hr; - IMoniker_AddRef(iface); + TRACE("%p, %p, %p.\n", iface, other, prefix); - return MK_S_US; + other_moniker = unsafe_impl_from_IMoniker(other); + if (other_moniker) + { + if (moniker->count <= other_moniker->count) + { + *prefix = iface; + hr = moniker->count == other_moniker->count ? MK_S_US : MK_S_ME; + } + else + { + *prefix = other; + hr = MK_S_HIM; + } + + IMoniker_AddRef(*prefix); + return hr; } - else - return MonikerCommonPrefixWith(iface,pmkOther,ppmkPrefix); + + return MonikerCommonPrefixWith(iface, other, prefix); } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 5fff7041ef..8c533d1ff7 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2430,8 +2430,6 @@ todo_wine hr = IMoniker_IsEqual(moniker, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - IStream_Release(stream); - /* Reduce() */ hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); @@ -2453,6 +2451,70 @@ todo_wine todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + /* CommonPrefixWith() */ + stream_write_dword(stream, 0); + + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); + ok(hr == MK_S_ME, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + hr = IMoniker_CommonPrefixWith(moniker2, moniker, &moniker3); + ok(hr == MK_S_HIM, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + stream_write_dword(stream, 10); + + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + stream_write_dword(stream, 5); + + hr = IMoniker_Load(moniker2, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); + ok(hr == MK_S_HIM, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker2, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + hr = IMoniker_CommonPrefixWith(moniker2, moniker, &moniker3); + ok(hr == MK_S_ME, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker2, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + /* Now same length, 0 or 2 */ + stream_write_dword(stream, 0); + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + stream_write_dword(stream, 0); + hr = IMoniker_Load(moniker2, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + stream_write_dword(stream, 2); + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + stream_write_dword(stream, 2); + hr = IMoniker_Load(moniker2, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker, "Unexpected prefix moniker.\n"); + IMoniker_Release(moniker3); + + IStream_Release(stream); IBindCtx_Release(bindctx); IMoniker_Release(moniker); IMoniker_Release(moniker2);

1 0

Paul Gofman : d3d9/tests: Test more formats in srgbtexture_test().
by Alexandre Julliard 24 Jan '20

24 Jan '20

Module: wine Branch: master Commit: 37554c1cb0f48bce0ac802a217ac494424c24074 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37554c1cb0f48bce0ac802a2… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jan 22 19:01:43 2020 +0300 d3d9/tests: Test more formats in srgbtexture_test(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 395 +++++++++++++++++++++++++++-------------------- 1 file changed, 227 insertions(+), 168 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37554c1cb0f48bce0ac8…

1 0

Stefan Dösinger : ddraw/tests: Don't leak overlay if DWM cannot be disabled.
by Alexandre Julliard 24 Jan '20

24 Jan '20

Module: wine Branch: master Commit: ed33ddd4522e8acc4c113edf54e811461803b0ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed33ddd4522e8acc4c113edf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 23 10:45:39 2020 +0100 ddraw/tests: Don't leak overlay if DWM cannot be disabled. This fixes test_caps on my GeForce 650M Windows 10 machine. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 3 ++- dlls/ddraw/tests/ddraw2.c | 3 ++- dlls/ddraw/tests/ddraw4.c | 3 ++- dlls/ddraw/tests/ddraw7.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c10be66236..26dd8140e4 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9478,10 +9478,11 @@ static void test_overlay_rect(void) ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x); ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y); - IDirectDrawSurface_Release(overlay); done: if (primary) IDirectDrawSurface_Release(primary); + if (overlay) + IDirectDrawSurface_Release(overlay); IDirectDraw_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8d4d44863a..8e37243e6c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10180,10 +10180,11 @@ static void test_overlay_rect(void) ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x); ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y); - IDirectDrawSurface_Release(overlay); done: if (primary) IDirectDrawSurface_Release(primary); + if (overlay) + IDirectDrawSurface_Release(overlay); IDirectDraw2_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1a16e2d571..b6dbd63c88 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -12058,10 +12058,11 @@ static void test_overlay_rect(void) ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x); ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y); - IDirectDrawSurface4_Release(overlay); done: if (primary) IDirectDrawSurface4_Release(primary); + if (overlay) + IDirectDrawSurface4_Release(overlay); IDirectDraw4_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 20a1bc5f3a..be6aca2cec 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -12049,10 +12049,11 @@ static void test_overlay_rect(void) ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x); ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y); - IDirectDrawSurface7_Release(overlay); done: if (primary) IDirectDrawSurface7_Release(primary); + if (overlay) + IDirectDrawSurface7_Release(overlay); IDirectDraw7_Release(ddraw); DestroyWindow(window); }

1 0

Stefan Dösinger : ddraw/tests: The Windows XP r200 driver does not report DDSCAPS_OWNDC.
by Alexandre Julliard 24 Jan '20

24 Jan '20

Module: wine Branch: master Commit: ad279073c60f38d59e5429b3a1fa359093e6a0f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad279073c60f38d59e5429b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 23 10:45:40 2020 +0100 ddraw/tests: The Windows XP r200 driver does not report DDSCAPS_OWNDC. Creating a surface with this flag set behaves in the same way as it does on newer hardware that sets the flag - it succeeds for sysmem surfaces and fails with E_NOTIMPL for vidmem ones. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 1 - dlls/ddraw/tests/ddraw2.c | 1 - dlls/ddraw/tests/ddraw4.c | 1 - dlls/ddraw/tests/ddraw7.c | 1 - 4 files changed, 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 26dd8140e4..faec17742e 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13010,7 +13010,6 @@ static void test_caps(void) | DDSCAPS_FRONTBUFFER | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY - | DDSCAPS_OWNDC | DDSCAPS_LOCALVIDMEM | DDSCAPS_NONLOCALVIDMEM; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8e37243e6c..28e9767645 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13845,7 +13845,6 @@ static void test_caps(void) | DDSCAPS_FRONTBUFFER | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY - | DDSCAPS_OWNDC | DDSCAPS_LOCALVIDMEM | DDSCAPS_NONLOCALVIDMEM; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b6dbd63c88..b398346839 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16491,7 +16491,6 @@ static void test_caps(void) | DDSCAPS_FRONTBUFFER | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY - | DDSCAPS_OWNDC | DDSCAPS_LOCALVIDMEM | DDSCAPS_NONLOCALVIDMEM; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index be6aca2cec..986a1f3a12 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16463,7 +16463,6 @@ static void test_caps(void) | DDSCAPS_FRONTBUFFER | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY - | DDSCAPS_OWNDC | DDSCAPS_LOCALVIDMEM | DDSCAPS_NONLOCALVIDMEM;

1 0

Stefan Dösinger : ddraw/tests: WinXP drivers don't necessarily set dib.dsBm.bmBits.
by Alexandre Julliard 24 Jan '20

24 Jan '20

Module: wine Branch: master Commit: b6904bb618d11ac50e09037c09100c800fcddf94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6904bb618d11ac50e09037c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 23 10:45:41 2020 +0100 ddraw/tests: WinXP drivers don't necessarily set dib.dsBm.bmBits. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 14 +++++++++++--- dlls/ddraw/tests/ddraw2.c | 14 +++++++++++--- dlls/ddraw/tests/ddraw4.c | 14 +++++++++++--- dlls/ddraw/tests/ddraw7.c | 14 +++++++++++--- 4 files changed, 44 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index faec17742e..fc104273d0 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9805,7 +9805,7 @@ static void test_getdc(void) DDSURFACEDESC surface_desc, map_desc; DDSCAPS caps = {DDSCAPS_COMPLEX}; IDirectDraw *ddraw; - unsigned int i; + unsigned int i, screen_bpp; HWND window; HDC dc, dc2; HRESULT hr; @@ -9869,6 +9869,11 @@ static void test_getdc(void) hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw_GetDisplayMode(ddraw, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + screen_bpp = U1(surface_desc.ddpfPixelFormat).dwRGBBitCount; + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { memset(&surface_desc, 0, sizeof(surface_desc)); @@ -9927,8 +9932,11 @@ static void test_getdc(void) ok(dib.dsBm.bmBitsPixel == U1(test_data[i].format).dwRGBBitCount, "Got unexpected bit count %d for format %s.\n", dib.dsBm.bmBitsPixel, test_data[i].name); - ok(!!dib.dsBm.bmBits, "Got unexpected bits %p for format %s.\n", - dib.dsBm.bmBits, test_data[i].name); + /* Windows XP sets bmBits == NULL for formats that match the screen at least on my r200 GPU. I + * suspect this applies to all HW accelerated pre-WDDM drivers because they can handle gdi access + * to ddraw surfaces themselves instead of going through a sysmem DIB section. */ + ok(!!dib.dsBm.bmBits || broken(!pDwmIsCompositionEnabled && dib.dsBm.bmBitsPixel == screen_bpp), + "Got unexpected bits %p for format %s.\n", dib.dsBm.bmBits, test_data[i].name); ok(dib.dsBmih.biSize == sizeof(dib.dsBmih), "Got unexpected size %u for format %s.\n", dib.dsBmih.biSize, test_data[i].name); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 28e9767645..a14df435b2 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10507,7 +10507,7 @@ static void test_getdc(void) DDSURFACEDESC surface_desc, map_desc; DDSCAPS caps = {DDSCAPS_COMPLEX}; IDirectDraw2 *ddraw; - unsigned int i; + unsigned int i, screen_bpp; HWND window; HDC dc, dc2; HRESULT hr; @@ -10571,6 +10571,11 @@ static void test_getdc(void) hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw2_GetDisplayMode(ddraw, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + screen_bpp = U1(surface_desc.ddpfPixelFormat).dwRGBBitCount; + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { memset(&surface_desc, 0, sizeof(surface_desc)); @@ -10629,8 +10634,11 @@ static void test_getdc(void) ok(dib.dsBm.bmBitsPixel == U1(test_data[i].format).dwRGBBitCount, "Got unexpected bit count %d for format %s.\n", dib.dsBm.bmBitsPixel, test_data[i].name); - ok(!!dib.dsBm.bmBits, "Got unexpected bits %p for format %s.\n", - dib.dsBm.bmBits, test_data[i].name); + /* Windows XP sets bmBits == NULL for formats that match the screen at least on my r200 GPU. I + * suspect this applies to all HW accelerated pre-WDDM drivers because they can handle gdi access + * to ddraw surfaces themselves instead of going through a sysmem DIB section. */ + ok(!!dib.dsBm.bmBits || broken(!pDwmIsCompositionEnabled && dib.dsBm.bmBitsPixel == screen_bpp), + "Got unexpected bits %p for format %s.\n", dib.dsBm.bmBits, test_data[i].name); ok(dib.dsBmih.biSize == sizeof(dib.dsBmih), "Got unexpected size %u for format %s.\n", dib.dsBmih.biSize, test_data[i].name); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b398346839..b0b70cc262 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -12488,7 +12488,7 @@ static void test_getdc(void) IDirectDrawSurface4 *surface, *surface2, *tmp; DDSURFACEDESC2 surface_desc, map_desc; IDirectDraw4 *ddraw; - unsigned int i; + unsigned int i, screen_bpp; HWND window; HDC dc, dc2; HRESULT hr; @@ -12552,6 +12552,11 @@ static void test_getdc(void) hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw4_GetDisplayMode(ddraw, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + screen_bpp = U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount; + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { memset(&surface_desc, 0, sizeof(surface_desc)); @@ -12611,8 +12616,11 @@ static void test_getdc(void) ok(dib.dsBm.bmBitsPixel == U1(test_data[i].format).dwRGBBitCount, "Got unexpected bit count %d for format %s.\n", dib.dsBm.bmBitsPixel, test_data[i].name); - ok(!!dib.dsBm.bmBits, "Got unexpected bits %p for format %s.\n", - dib.dsBm.bmBits, test_data[i].name); + /* Windows XP sets bmBits == NULL for formats that match the screen at least on my r200 GPU. I + * suspect this applies to all HW accelerated pre-WDDM drivers because they can handle gdi access + * to ddraw surfaces themselves instead of going through a sysmem DIB section. */ + ok(!!dib.dsBm.bmBits || broken(!pDwmIsCompositionEnabled && dib.dsBm.bmBitsPixel == screen_bpp), + "Got unexpected bits %p for format %s.\n", dib.dsBm.bmBits, test_data[i].name); ok(dib.dsBmih.biSize == sizeof(dib.dsBmih), "Got unexpected size %u for format %s.\n", dib.dsBmih.biSize, test_data[i].name); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 986a1f3a12..b31f942c11 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -12476,7 +12476,7 @@ static void test_getdc(void) IDirectDrawSurface7 *surface, *surface2, *tmp; DDSURFACEDESC2 surface_desc, map_desc; IDirectDraw7 *ddraw; - unsigned int i; + unsigned int i, screen_bpp; HWND window; HDC dc, dc2; HRESULT hr; @@ -12540,6 +12540,11 @@ static void test_getdc(void) hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + screen_bpp = U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount; + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { memset(&surface_desc, 0, sizeof(surface_desc)); @@ -12599,8 +12604,11 @@ static void test_getdc(void) ok(dib.dsBm.bmBitsPixel == U1(test_data[i].format).dwRGBBitCount, "Got unexpected bit count %d for format %s.\n", dib.dsBm.bmBitsPixel, test_data[i].name); - ok(!!dib.dsBm.bmBits, "Got unexpected bits %p for format %s.\n", - dib.dsBm.bmBits, test_data[i].name); + /* Windows XP sets bmBits == NULL for formats that match the screen at least on my r200 GPU. I + * suspect this applies to all HW accelerated pre-WDDM drivers because they can handle gdi access + * to ddraw surfaces themselves instead of going through a sysmem DIB section. */ + ok(!!dib.dsBm.bmBits || broken(!pDwmIsCompositionEnabled && dib.dsBm.bmBitsPixel == screen_bpp), + "Got unexpected bits %p for format %s.\n", dib.dsBm.bmBits, test_data[i].name); ok(dib.dsBmih.biSize == sizeof(dib.dsBmih), "Got unexpected size %u for format %s.\n", dib.dsBmih.biSize, test_data[i].name);

1 0

Andrew Eikum : xinput: Implement XInputGetKeystroke.
by Alexandre Julliard 24 Jan '20

24 Jan '20

Module: wine Branch: master Commit: c1d51031ef2c8926777e45f596a49eae4a3ff328 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1d51031ef2c8926777e45f5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 23 14:28:56 2020 -0600 xinput: Implement XInputGetKeystroke. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/xinput_main.c | 216 ++++++++++++++++++++++++++++++++++++++-- dlls/xinput1_3/xinput_private.h | 1 + 2 files changed, 209 insertions(+), 8 deletions(-) diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 5485ae8d2d..63b7dd7f0b 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -202,19 +202,219 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE* state return xinput_get_state(index, state); } -DWORD WINAPI DECLSPEC_HOTPATCH XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) +static const int JS_STATE_OFF = 0; +static const int JS_STATE_LOW = 1; +static const int JS_STATE_HIGH = 2; + +static int joystick_state(const SHORT value) { - static int warn_once; + if (value > 20000) + return JS_STATE_HIGH; + if (value < -20000) + return JS_STATE_LOW; + return JS_STATE_OFF; +} - if (!warn_once++) - FIXME("(index %u, reserved %u, keystroke %p) Stub!\n", index, reserved, keystroke); +static WORD js_vk_offs(const int x, const int y) +{ + if (y == JS_STATE_OFF) + { + /*if (x == JS_STATE_OFF) shouldn't get here */ + if (x == JS_STATE_LOW) return 3; /* LEFT */ + /*if (x == JS_STATE_HIGH)*/ return 2; /* RIGHT */ + } + if (y == JS_STATE_HIGH) + { + if (x == JS_STATE_OFF) return 0; /* UP */ + if (x == JS_STATE_LOW) return 4; /* UPLEFT */ + /*if (x == JS_STATE_HIGH)*/ return 5; /* UPRIGHT */ + } + /*if (y == JS_STATE_LOW)*/ + { + if (x == JS_STATE_OFF) return 1; /* DOWN */ + if (x == JS_STATE_LOW) return 7; /* DOWNLEFT */ + /*if (x == JS_STATE_HIGH)*/ return 6; /* DOWNRIGHT */ + } +} - if (index >= XUSER_MAX_COUNT) - return ERROR_BAD_ARGUMENTS; - if (!controllers[index].platform_private) +static DWORD check_joystick_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke, + const SHORT *cur_x, const SHORT *cur_y, SHORT *last_x, SHORT *last_y, + const WORD base_vk) +{ + int cur_vk = 0, cur_x_st, cur_y_st; + int last_vk = 0, last_x_st, last_y_st; + + cur_x_st = joystick_state(*cur_x); + cur_y_st = joystick_state(*cur_y); + if (cur_x_st || cur_y_st) + cur_vk = base_vk + js_vk_offs(cur_x_st, cur_y_st); + + last_x_st = joystick_state(*last_x); + last_y_st = joystick_state(*last_y); + if (last_x_st || last_y_st) + last_vk = base_vk + js_vk_offs(last_x_st, last_y_st); + + if (cur_vk != last_vk) + { + if (last_vk) + { + /* joystick was set, and now different. send a KEYUP event, and set + * last pos to centered, so the appropriate KEYDOWN event will be + * sent on the next call. */ + keystroke->VirtualKey = last_vk; + keystroke->Unicode = 0; /* unused */ + keystroke->Flags = XINPUT_KEYSTROKE_KEYUP; + keystroke->UserIndex = index; + keystroke->HidCode = 0; + + *last_x = 0; + *last_y = 0; + + return ERROR_SUCCESS; + } + + /* joystick was unset, send KEYDOWN. */ + keystroke->VirtualKey = cur_vk; + keystroke->Unicode = 0; /* unused */ + keystroke->Flags = XINPUT_KEYSTROKE_KEYDOWN; + keystroke->UserIndex = index; + keystroke->HidCode = 0; + + *last_x = *cur_x; + *last_y = *cur_y; + + return ERROR_SUCCESS; + } + + *last_x = *cur_x; + *last_y = *cur_y; + + return ERROR_EMPTY; +} + +static BOOL trigger_is_on(const BYTE value) +{ + return value > 30; +} + +static DWORD check_for_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke) +{ + xinput_controller *device = &controllers[index]; + const XINPUT_GAMEPAD *cur; + DWORD ret = ERROR_EMPTY; + int i; + + static const struct { + int mask; + WORD vk; + } buttons[] = { + { XINPUT_GAMEPAD_DPAD_UP, VK_PAD_DPAD_UP }, + { XINPUT_GAMEPAD_DPAD_DOWN, VK_PAD_DPAD_DOWN }, + { XINPUT_GAMEPAD_DPAD_LEFT, VK_PAD_DPAD_LEFT }, + { XINPUT_GAMEPAD_DPAD_RIGHT, VK_PAD_DPAD_RIGHT }, + { XINPUT_GAMEPAD_START, VK_PAD_START }, + { XINPUT_GAMEPAD_BACK, VK_PAD_BACK }, + { XINPUT_GAMEPAD_LEFT_THUMB, VK_PAD_LTHUMB_PRESS }, + { XINPUT_GAMEPAD_RIGHT_THUMB, VK_PAD_RTHUMB_PRESS }, + { XINPUT_GAMEPAD_LEFT_SHOULDER, VK_PAD_LSHOULDER }, + { XINPUT_GAMEPAD_RIGHT_SHOULDER, VK_PAD_RSHOULDER }, + { XINPUT_GAMEPAD_A, VK_PAD_A }, + { XINPUT_GAMEPAD_B, VK_PAD_B }, + { XINPUT_GAMEPAD_X, VK_PAD_X }, + { XINPUT_GAMEPAD_Y, VK_PAD_Y }, + /* note: guide button does not send an event */ + }; + + if (!verify_and_lock_device(device)) return ERROR_DEVICE_NOT_CONNECTED; - return ERROR_NOT_SUPPORTED; + cur = &device->state.Gamepad; + + /*** buttons ***/ + for (i = 0; i < ARRAY_SIZE(buttons); ++i) + { + if ((cur->wButtons & buttons[i].mask) ^ (device->last_keystroke.wButtons & buttons[i].mask)) + { + keystroke->VirtualKey = buttons[i].vk; + keystroke->Unicode = 0; /* unused */ + if (cur->wButtons & buttons[i].mask) + { + keystroke->Flags = XINPUT_KEYSTROKE_KEYDOWN; + device->last_keystroke.wButtons |= buttons[i].mask; + } + else + { + keystroke->Flags = XINPUT_KEYSTROKE_KEYUP; + device->last_keystroke.wButtons &= ~buttons[i].mask; + } + keystroke->UserIndex = index; + keystroke->HidCode = 0; + ret = ERROR_SUCCESS; + goto done; + } + } + + /*** triggers ***/ + if (trigger_is_on(cur->bLeftTrigger) ^ trigger_is_on(device->last_keystroke.bLeftTrigger)) + { + keystroke->VirtualKey = VK_PAD_LTRIGGER; + keystroke->Unicode = 0; /* unused */ + keystroke->Flags = trigger_is_on(cur->bLeftTrigger) ? XINPUT_KEYSTROKE_KEYDOWN : XINPUT_KEYSTROKE_KEYUP; + keystroke->UserIndex = index; + keystroke->HidCode = 0; + device->last_keystroke.bLeftTrigger = cur->bLeftTrigger; + ret = ERROR_SUCCESS; + goto done; + } + + if (trigger_is_on(cur->bRightTrigger) ^ trigger_is_on(device->last_keystroke.bRightTrigger)) + { + keystroke->VirtualKey = VK_PAD_RTRIGGER; + keystroke->Unicode = 0; /* unused */ + keystroke->Flags = trigger_is_on(cur->bRightTrigger) ? XINPUT_KEYSTROKE_KEYDOWN : XINPUT_KEYSTROKE_KEYUP; + keystroke->UserIndex = index; + keystroke->HidCode = 0; + device->last_keystroke.bRightTrigger = cur->bRightTrigger; + ret = ERROR_SUCCESS; + goto done; + } + + /*** joysticks ***/ + ret = check_joystick_keystroke(index, keystroke, &cur->sThumbLX, &cur->sThumbLY, + &device->last_keystroke.sThumbLX, + &device->last_keystroke.sThumbLY, VK_PAD_LTHUMB_UP); + if (ret == ERROR_SUCCESS) + goto done; + + ret = check_joystick_keystroke(index, keystroke, &cur->sThumbRX, &cur->sThumbRY, + &device->last_keystroke.sThumbRX, + &device->last_keystroke.sThumbRY, VK_PAD_RTHUMB_UP); + if (ret == ERROR_SUCCESS) + goto done; + +done: + unlock_device(device); + + return ret; +} + +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) +{ + TRACE("(index %u, reserved %u, keystroke %p)\n", index, reserved, keystroke); + + if (index >= XUSER_MAX_COUNT && index != XUSER_INDEX_ANY) + return ERROR_BAD_ARGUMENTS; + + if (index == XUSER_INDEX_ANY) + { + int i; + for (i = 0; i < XUSER_MAX_COUNT; ++i) + if (check_for_keystroke(i, keystroke) == ERROR_SUCCESS) + return ERROR_SUCCESS; + return ERROR_EMPTY; + } + + return check_for_keystroke(index, keystroke); } DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilities(DWORD index, DWORD flags, XINPUT_CAPABILITIES* capabilities) diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index f3456cd8e7..7de9a2a2e4 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -23,6 +23,7 @@ typedef struct _xinput_controller XINPUT_CAPABILITIES caps; void *platform_private; /* non-NULL when device is valid; validity may be read without holding crit */ XINPUT_STATE state; + XINPUT_GAMEPAD last_keystroke; XINPUT_VIBRATION vibration; } xinput_controller;

1 0

Alistair Leslie-Hughes : msado15: Implement _Recordset get_CursorLocation and put_CursorLocation.
by Alexandre Julliard 24 Jan '20

24 Jan '20

Module: wine Branch: master Commit: 7d51008ecf1666ea7ceb44c8f92185c30612ec90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d51008ecf1666ea7ceb44c8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 23 23:43:38 2020 +0000 msado15: Implement _Recordset get_CursorLocation and put_CursorLocation. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 20 ++++++++++++++++---- dlls/msado15/tests/msado15.c | 6 ++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 1d28d6b957..1f16add4c3 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -43,6 +43,7 @@ struct recordset LONG allocated; LONG index; VARIANT *data; + CursorLocationEnum cursor_location; }; struct fields @@ -1229,14 +1230,24 @@ static HRESULT WINAPI recordset_CancelBatch( _Recordset *iface, AffectEnum affec static HRESULT WINAPI recordset_get_CursorLocation( _Recordset *iface, CursorLocationEnum *cursor_loc ) { - FIXME( "%p, %p\n", iface, cursor_loc ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", iface, cursor_loc ); + + *cursor_loc = recordset->cursor_location; + + return S_OK; } static HRESULT WINAPI recordset_put_CursorLocation( _Recordset *iface, CursorLocationEnum cursor_loc ) { - FIXME( "%p, %u\n", iface, cursor_loc ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %u\n", iface, cursor_loc ); + + recordset->cursor_location = cursor_loc; + + return S_OK; } static HRESULT WINAPI recordset_NextRecordset( _Recordset *iface, VARIANT *records_affected, _Recordset **record_set ) @@ -1524,6 +1535,7 @@ HRESULT Recordset_create( void **obj ) recordset->ISupportErrorInfo_iface.lpVtbl = &recordset_supporterrorinfo_vtbl; recordset->refs = 1; recordset->index = -1; + recordset->cursor_location = adUseServer; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index afdf0dfb6a..917d131063 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -65,6 +65,7 @@ static void test_Recordset(void) Field *field; LONG refs, count, state; VARIANT missing, val, index; + CursorLocationEnum location; BSTR name; HRESULT hr; @@ -132,6 +133,11 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateClosed, "got %d\n", state ); + location = -1; + hr = _Recordset_get_CursorLocation( recordset, &location ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( location == adUseServer, "got %d\n", location ); + VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr );

1 0

Daniel Lehman : msxml3/tests: Fix copy & paste in traces.
by Alexandre Julliard 24 Jan '20

24 Jan '20

Module: wine Branch: master Commit: e31469eb58c248d52c922f31388d41a94b023c74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e31469eb58c248d52c922f31… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jan 22 22:08:45 2020 -0800 msxml3/tests: Fix copy & paste in traces. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 843343aa00..51bd1b47ca 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2221,7 +2221,7 @@ static void test_domnode( void ) ok(r == E_INVALIDARG, "get_nodeValue ret %08x\n", r ); r = IXMLDOMDocument_get_nodeValue( doc, &var ); - ok( r == S_FALSE, "nextNode returned wrong code\n"); + ok( r == S_FALSE, "get_nodeValue returned wrong code\n"); ok( V_VT(&var) == VT_NULL, "variant wasn't empty\n"); ok( V_BSTR(&var) == NULL, "variant value wasn't null\n"); @@ -2391,7 +2391,7 @@ static void test_domnode( void ) { type = NODE_INVALID; r = IXMLDOMNode_get_nodeType( node, &type); - ok( r == S_OK, "getNamedItem returned wrong code\n"); + ok( r == S_OK, "get_nodeType returned wrong code\n"); ok( type == NODE_ATTRIBUTE, "node not an attribute\n"); str = NULL; @@ -2424,7 +2424,7 @@ static void test_domnode( void ) type = NODE_INVALID; r = IXMLDOMNode_get_nodeType( next, &type); - ok( r == S_OK, "getNamedItem returned wrong code\n"); + ok( r == S_OK, "get_nodeType returned wrong code\n"); ok( type == NODE_TEXT, "node not text\n"); str = (void *)0xdeadbeef; @@ -2513,7 +2513,7 @@ static void test_domnode( void ) { type = NODE_INVALID; r = IXMLDOMNode_get_nodeType( node, &type); - ok( r == S_OK, "getNamedItem returned wrong code\n"); + ok( r == S_OK, "get_nodeType returned wrong code\n"); ok( type == NODE_ELEMENT, "node not text\n"); r = IXMLDOMNode_hasChildNodes( node, NULL );

1 0

Daniel Lehman : vcruntime140_1: Add stub dll.
by Alexandre Julliard 24 Jan '20

24 Jan '20

Module: wine Branch: master Commit: 7a5cf7cce935841f8415fd6383cfbe6af4d8b3d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a5cf7cce935841f8415fd63… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jan 22 22:02:20 2020 -0800 vcruntime140_1: Add stub dll. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/vcruntime140_1/Makefile.in | 1 + dlls/vcruntime140_1/vcruntime140_1.spec | 3 +++ 4 files changed, 7 insertions(+) diff --git a/configure b/configure index 7ff3737bda..5fca5bd27f 100755 --- a/configure +++ b/configure @@ -1609,6 +1609,7 @@ enable_vcomp120 enable_vcomp140 enable_vcomp90 enable_vcruntime140 +enable_vcruntime140_1 enable_vdmdbg enable_version enable_virtdisk @@ -20907,6 +20908,7 @@ wine_fn_config_makefile dlls/vcomp120 enable_vcomp120 wine_fn_config_makefile dlls/vcomp140 enable_vcomp140 wine_fn_config_makefile dlls/vcomp90 enable_vcomp90 wine_fn_config_makefile dlls/vcruntime140 enable_vcruntime140 +wine_fn_config_makefile dlls/vcruntime140_1 enable_vcruntime140_1 wine_fn_config_makefile dlls/vdhcp.vxd enable_win16 wine_fn_config_makefile dlls/vdmdbg enable_vdmdbg wine_fn_config_makefile dlls/ver.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 681d315eed..36f65378a4 100644 --- a/configure.ac +++ b/configure.ac @@ -3717,6 +3717,7 @@ WINE_CONFIG_MAKEFILE(dlls/vcomp120) WINE_CONFIG_MAKEFILE(dlls/vcomp140) WINE_CONFIG_MAKEFILE(dlls/vcomp90) WINE_CONFIG_MAKEFILE(dlls/vcruntime140) +WINE_CONFIG_MAKEFILE(dlls/vcruntime140_1) WINE_CONFIG_MAKEFILE(dlls/vdhcp.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/vdmdbg) WINE_CONFIG_MAKEFILE(dlls/ver.dll16,enable_win16) diff --git a/dlls/vcruntime140_1/Makefile.in b/dlls/vcruntime140_1/Makefile.in new file mode 100644 index 0000000000..b5e20fe92f --- /dev/null +++ b/dlls/vcruntime140_1/Makefile.in @@ -0,0 +1 @@ +MODULE = vcruntime140_1.dll diff --git a/dlls/vcruntime140_1/vcruntime140_1.spec b/dlls/vcruntime140_1/vcruntime140_1.spec new file mode 100644 index 0000000000..55f568ef13 --- /dev/null +++ b/dlls/vcruntime140_1/vcruntime140_1.spec @@ -0,0 +1,3 @@ +@ stub __CxxFrameHandler4 +@ stub __NLG_Dispatch2 +@ stub __NLG_Return2

1 0