November 2021 - Wine-Commits

Dmitry Timoshkov : comctl32: Add semi-stub for ImageList_WriteEx.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: c692c59c2e2f1a61352b7f1b55807e3b84bd98ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=c692c59c2e2f1a61352b7f1b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 19 15:58:33 2021 +0300 comctl32: Add semi-stub for ImageList_WriteEx. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.spec | 1 + dlls/comctl32/imagelist.c | 8 ++++++++ include/commctrl.h | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index e3b889b9bd3..73f25906205 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -188,6 +188,7 @@ @ stdcall ImageList_SetImageCount(ptr long) @ stdcall ImageList_SetOverlayImage(ptr long long) @ stdcall ImageList_Write(ptr ptr) +@ stdcall ImageList_WriteEx(ptr long ptr) @ stdcall InitCommonControlsEx(ptr) @ stdcall InitMUILanguage(long) @ stdcall InitializeFlatSB(long) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 307ccc0336c..8da8beec1e0 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3058,6 +3058,14 @@ failed: return result; } +/************************************************************************* + * ImageList_WriteEx [COMCTL32.@] + */ +BOOL WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD flags, IStream *pstm) +{ + FIXME("%p %08x %p: semi-stub\n", himl, flags, pstm); + return ImageList_Write(himl, pstm); +} /************************************************************************* * ImageList_Write [COMCTL32.@] diff --git a/include/commctrl.h b/include/commctrl.h index 41abceb0138..025eb328c32 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -601,7 +601,8 @@ BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT); #ifdef __IStream_INTERFACE_DEFINED__ HIMAGELIST WINAPI ImageList_Read(LPSTREAM); -BOOL WINAPI ImageList_Write(HIMAGELIST, LPSTREAM); +BOOL WINAPI ImageList_Write(HIMAGELIST,IStream*); +BOOL WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*); #endif #define ImageList_AddIcon(himl,hicon) ImageList_ReplaceIcon(himl,-1,hicon)

1 0

Piotr Caban : msvcp_win: Add stub dll.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: 241455e84b93c2deaf2c300c007aa0612994f7d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=241455e84b93c2deaf2c300c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 19 19:46:43 2021 +0100 msvcp_win: Add stub dll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/msvcp_win/Makefile.in | 1 + dlls/msvcp_win/msvcp_win.spec | 3761 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 3765 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=241455e84b93c2deaf2c…

1 0

Zebediah Figura : wined3d: Add a helper to calculate the vertex attribute address for a stream element.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: 6f0d15e0e3af22f5c3c347ccd62a45a9feb64de1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f0d15e0e3af22f5c3c347cc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 18 21:06:16 2021 -0600 wined3d: Add a helper to calculate the vertex attribute address for a stream element. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 58 +++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f0d15e0e3af22f5c3c3…

1 0

Piotr Caban : msvcp140: Fix _Winerror_message test failures.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: afc0d31d3e4a5861fa20cf2e82aec92c8cee14f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afc0d31d3e4a5861fa20cf2e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 19 13:26:18 2021 +0100 msvcp140: Fix _Winerror_message test failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51307 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 8a3771842a0..31c8cfc4f59 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1254,8 +1254,10 @@ static void test__Winerror_message(void) memset(buf, 'a', sizeof(buf)); ret = p__Winerror_message(0, buf, sizeof(buf)); - ok(ret == ret_fm, "ret = %u, expected %u\n", ret, ret_fm); - ok(!strcmp(buf, buf_fm), "buf = %s, expected %s\n", buf, buf_fm); + ok(ret == ret_fm || (ret_fm > 2 && buf_fm[ret_fm - 1] == '\n' && + buf_fm[ret_fm - 2] == '\r' && ret + 2 == ret_fm), + "ret = %u, expected %u\n", ret, ret_fm); + ok(!strncmp(buf, buf_fm, ret), "buf = %s, expected %s\n", buf, buf_fm); memset(buf, 'a', sizeof(buf)); ret = p__Winerror_message(0, buf, 2);

1 0

Connor McAdams : uiautomationcore: Implement UiaHostProviderFromHwnd.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: b5f4511b8eb92e357a4688d886f9228230405d11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5f4511b8eb92e357a4688d8… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Nov 16 14:32:31 2021 -0500 uiautomationcore: Implement UiaHostProviderFromHwnd. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/Makefile.in | 2 +- dlls/uiautomationcore/tests/uiautomation.c | 7 +- dlls/uiautomationcore/uia_main.c | 134 ++++++++++++++++++++++++++++- 3 files changed, 134 insertions(+), 9 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 5a72ea144c4..f0973fdec4c 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,6 +1,6 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore -IMPORTS = uuid ole32 +IMPORTS = uuid ole32 oleaut32 user32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 52a6648dad2..76d2e06e07e 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -58,17 +58,13 @@ static void test_UiaHostProviderFromHwnd(void) p = (void *)0xdeadbeef; hr = UiaHostProviderFromHwnd(NULL, &p); -todo_wine { ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(p == NULL, "Unexpected instance.\n"); -} + p = NULL; hr = UiaHostProviderFromHwnd(hwnd, &p); -todo_wine ok(hr == S_OK, "Failed to get host provider, hr %#x.\n", hr); -if (hr == S_OK) -{ p2 = NULL; hr = UiaHostProviderFromHwnd(hwnd, &p2); ok(hr == S_OK, "Failed to get host provider, hr %#x.\n", hr); @@ -80,7 +76,6 @@ if (hr == S_OK) ok(p2 == NULL, "Unexpected instance.\n"); IRawElementProviderSimple_Release(p); -} DestroyWindow(hwnd); UnregisterClassA("HostProviderFromHwnd class", NULL); diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 174e4756920..44fd42742d9 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -18,6 +18,7 @@ #define COBJMACROS +#include "initguid.h" #include "uiautomation.h" #include "wine/debug.h" @@ -145,6 +146,117 @@ static const IUnknownVtbl uia_reserved_obj_vtbl = { static IUnknown uia_reserved_ns_iface = {&uia_reserved_obj_vtbl}; static IUnknown uia_reserved_ma_iface = {&uia_reserved_obj_vtbl}; +/* + * UiaHostProviderFromHwnd IRawElementProviderSimple interface. + */ +struct hwnd_host_provider { + IRawElementProviderSimple IRawElementProviderSimple_iface; + LONG refcount; + + HWND hwnd; +}; + +static inline struct hwnd_host_provider *impl_from_hwnd_host_provider(IRawElementProviderSimple *iface) +{ + return CONTAINING_RECORD(iface, struct hwnd_host_provider, IRawElementProviderSimple_iface); +} + +HRESULT WINAPI hwnd_host_provider_QueryInterface(IRawElementProviderSimple *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IRawElementProviderSimple) || IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else + return E_NOINTERFACE; + + IRawElementProviderSimple_AddRef(iface); + return S_OK; +} + +ULONG WINAPI hwnd_host_provider_AddRef(IRawElementProviderSimple *iface) +{ + struct hwnd_host_provider *host_prov = impl_from_hwnd_host_provider(iface); + ULONG refcount = InterlockedIncrement(&host_prov->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + + return refcount; +} + +ULONG WINAPI hwnd_host_provider_Release(IRawElementProviderSimple *iface) +{ + struct hwnd_host_provider *host_prov = impl_from_hwnd_host_provider(iface); + ULONG refcount = InterlockedDecrement(&host_prov->refcount); + + TRACE("%p, refcount %d\n", iface, refcount); + + if (!refcount) + heap_free(host_prov); + + return refcount; +} + +HRESULT WINAPI hwnd_host_provider_get_ProviderOptions(IRawElementProviderSimple *iface, + enum ProviderOptions *ret_val) +{ + TRACE("%p, %p\n", iface, ret_val); + *ret_val = ProviderOptions_ServerSideProvider; + return S_OK; +} + +HRESULT WINAPI hwnd_host_provider_GetPatternProvider(IRawElementProviderSimple *iface, + PATTERNID pattern_id, IUnknown **ret_val) +{ + TRACE("%p, %d, %p\n", iface, pattern_id, ret_val); + *ret_val = NULL; + return S_OK; +} + +HRESULT WINAPI hwnd_host_provider_GetPropertyValue(IRawElementProviderSimple *iface, + PROPERTYID prop_id, VARIANT *ret_val) +{ + struct hwnd_host_provider *host_prov = impl_from_hwnd_host_provider(iface); + + TRACE("%p, %d, %p\n", iface, prop_id, ret_val); + + VariantInit(ret_val); + switch (prop_id) + { + case UIA_NativeWindowHandlePropertyId: + V_VT(ret_val) = VT_I4; + V_I4(ret_val) = HandleToUlong(host_prov->hwnd); + break; + + case UIA_ProviderDescriptionPropertyId: + V_VT(ret_val) = VT_BSTR; + V_BSTR(ret_val) = SysAllocString(L"Wine: HWND Provider Proxy"); + break; + + default: + break; + } + + return S_OK; +} + +HRESULT WINAPI hwnd_host_provider_get_HostRawElementProvider(IRawElementProviderSimple *iface, + IRawElementProviderSimple **ret_val) +{ + TRACE("%p, %p\n", iface, ret_val); + *ret_val = NULL; + return S_OK; +} + +IRawElementProviderSimpleVtbl hwnd_host_provider_vtbl = { + hwnd_host_provider_QueryInterface, + hwnd_host_provider_AddRef, + hwnd_host_provider_Release, + hwnd_host_provider_get_ProviderOptions, + hwnd_host_provider_GetPatternProvider, + hwnd_host_provider_GetPropertyValue, + hwnd_host_provider_get_HostRawElementProvider, +}; + /*********************************************************************** * UiaClientsAreListening (uiautomationcore.@) */ @@ -219,8 +331,26 @@ void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *callback) HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **provider) { - FIXME("(%p, %p): stub\n", hwnd, provider); - return E_NOTIMPL; + struct hwnd_host_provider *host_prov; + + TRACE("(%p, %p)\n", hwnd, provider); + + if (provider) + *provider = NULL; + + if (!IsWindow(hwnd) || !provider) + return E_INVALIDARG; + + host_prov = heap_alloc(sizeof(*host_prov)); + if (!host_prov) + return E_OUTOFMEMORY; + + host_prov->IRawElementProviderSimple_iface.lpVtbl = &hwnd_host_provider_vtbl; + host_prov->refcount = 1; + host_prov->hwnd = hwnd; + *provider = &host_prov->IRawElementProviderSimple_iface; + + return S_OK; } HRESULT WINAPI UiaDisconnectProvider(IRawElementProviderSimple *provider)

1 0

Connor McAdams : uiautomationcore/tests: Expand UiaHostProviderFromHwnd tests.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: 2e7b6da243eb2ad9d9412b3865bf9ca18a5168d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e7b6da243eb2ad9d9412b38… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Nov 16 14:32:32 2021 -0500 uiautomationcore/tests: Expand UiaHostProviderFromHwnd tests. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/tests/Makefile.in | 2 +- dlls/uiautomationcore/tests/uiautomation.c | 53 +++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/tests/Makefile.in b/dlls/uiautomationcore/tests/Makefile.in index 1d08e19093f..fbd53507fbe 100644 --- a/dlls/uiautomationcore/tests/Makefile.in +++ b/dlls/uiautomationcore/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = uiautomationcore.dll -IMPORTS = uiautomationcore user32 ole32 +IMPORTS = uiautomationcore user32 ole32 oleaut32 C_SRCS = \ uiautomation.c diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 76d2e06e07e..e5fa12535be 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -34,9 +34,12 @@ static LRESULT WINAPI test_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPAR static void test_UiaHostProviderFromHwnd(void) { IRawElementProviderSimple *p, *p2; + enum ProviderOptions prov_opt; WNDCLASSA cls; HRESULT hr; HWND hwnd; + VARIANT v; + int i; cls.style = 0; cls.lpfnWndProc = test_wnd_proc; @@ -61,6 +64,9 @@ static void test_UiaHostProviderFromHwnd(void) ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(p == NULL, "Unexpected instance.\n"); + hr = UiaHostProviderFromHwnd(hwnd, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + p = NULL; hr = UiaHostProviderFromHwnd(hwnd, &p); ok(hr == S_OK, "Failed to get host provider, hr %#x.\n", hr); @@ -75,9 +81,54 @@ static void test_UiaHostProviderFromHwnd(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(p2 == NULL, "Unexpected instance.\n"); - IRawElementProviderSimple_Release(p); + hr = IRawElementProviderSimple_GetPropertyValue(p, UIA_NativeWindowHandlePropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == HandleToUlong(hwnd), "V_I4(&v) = %#x, expected %#x\n", V_I4(&v), HandleToUlong(hwnd)); + + hr = IRawElementProviderSimple_GetPropertyValue(p, UIA_ProviderDescriptionPropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(V_VT(&v) == VT_BSTR, "V_VT(&v) = %d\n", V_VT(&v)); + VariantClear(&v); + /* No patterns are implemented on the HWND Host provider. */ + for (i = UIA_InvokePatternId; i < (UIA_CustomNavigationPatternId + 1); i++) + { + IUnknown *unk; + + unk = (void *)0xdeadbeef; + hr = IRawElementProviderSimple_GetPatternProvider(p, i, &unk); + ok(hr == S_OK, "Unexpected hr %#x, %d.\n", hr, i); + ok(!unk, "Pattern %d returned %p\n", i, unk); + } + + hr = IRawElementProviderSimple_get_ProviderOptions(p, &prov_opt); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok((prov_opt == ProviderOptions_ServerSideProvider) || + broken(prov_opt == ProviderOptions_ClientSideProvider), /* Windows < 10 1507 */ + "Unexpected provider options %#x\n", prov_opt); + + /* Test behavior post Window destruction. */ DestroyWindow(hwnd); + + hr = IRawElementProviderSimple_GetPropertyValue(p, UIA_NativeWindowHandlePropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == HandleToUlong(hwnd), "V_I4(&v) = %#x, expected %#x\n", V_I4(&v), HandleToUlong(hwnd)); + + hr = IRawElementProviderSimple_GetPropertyValue(p, UIA_ProviderDescriptionPropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(V_VT(&v) == VT_BSTR, "V_VT(&v) = %d\n", V_VT(&v)); + VariantClear(&v); + + hr = IRawElementProviderSimple_get_ProviderOptions(p, &prov_opt); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok((prov_opt == ProviderOptions_ServerSideProvider) || + broken(prov_opt == ProviderOptions_ClientSideProvider), /* Windows < 10 1507 */ + "Unexpected provider options %#x\n", prov_opt); + + IRawElementProviderSimple_Release(p); + UnregisterClassA("HostProviderFromHwnd class", NULL); }

1 0

Piotr Caban : msvcp140: Fix _Winerror_map test failures.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: c90d72588e65916f29694f9b56f060281e3ee276 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c90d72588e65916f29694f9b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 19 13:26:25 2021 +0100 msvcp140: Fix _Winerror_map test failures. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 5 +++-- dlls/msvcp90/misc.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 31c8cfc4f59..c79e425190b 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1270,6 +1270,7 @@ static void test__Winerror_map(void) static struct { int winerr, doserr; BOOL broken; + int broken_doserr; } tests[] = { {ERROR_INVALID_FUNCTION, ENOSYS}, {ERROR_FILE_NOT_FOUND, ENOENT}, {ERROR_PATH_NOT_FOUND, ENOENT}, {ERROR_TOO_MANY_OPEN_FILES, EMFILE}, @@ -1285,7 +1286,7 @@ static void test__Winerror_map(void) {ERROR_FILE_EXISTS, EEXIST}, {ERROR_CANNOT_MAKE, EACCES}, {ERROR_INVALID_PARAMETER, EINVAL, TRUE}, {ERROR_OPEN_FAILED, EIO}, {ERROR_BUFFER_OVERFLOW, ENAMETOOLONG}, {ERROR_DISK_FULL, ENOSPC}, - {ERROR_INVALID_NAME, EINVAL}, {ERROR_NEGATIVE_SEEK, EINVAL}, + {ERROR_INVALID_NAME, ENOENT, TRUE, EINVAL}, {ERROR_NEGATIVE_SEEK, EINVAL}, {ERROR_BUSY_DRIVE, EBUSY}, {ERROR_DIR_NOT_EMPTY, ENOTEMPTY}, {ERROR_BUSY, EBUSY}, {ERROR_ALREADY_EXISTS, EEXIST}, {ERROR_LOCKED, ENOLCK}, {ERROR_DIRECTORY, EINVAL}, @@ -1313,7 +1314,7 @@ static void test__Winerror_map(void) for(i=0; i<ARRAY_SIZE(tests); i++) { ret = p__Winerror_map(tests[i].winerr); - ok(ret == tests[i].doserr || broken(tests[i].broken && !ret), + ok(ret == tests[i].doserr || broken(tests[i].broken && ret == tests[i].broken_doserr), "_Winerror_map(%d) returned %d, expected %d\n", tests[i].winerr, ret, tests[i].doserr); } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 5376d4f2da1..2d309911f10 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -216,7 +216,7 @@ static const struct { {ERROR_FILE_EXISTS, EEXIST}, {ERROR_CANNOT_MAKE, EACCES}, {ERROR_INVALID_PARAMETER, EINVAL}, {ERROR_OPEN_FAILED, EIO}, {ERROR_BUFFER_OVERFLOW, ENAMETOOLONG}, {ERROR_DISK_FULL, ENOSPC}, - {ERROR_INVALID_NAME, EINVAL}, {ERROR_NEGATIVE_SEEK, EINVAL}, + {ERROR_INVALID_NAME, ENOENT}, {ERROR_NEGATIVE_SEEK, EINVAL}, {ERROR_BUSY_DRIVE, EBUSY}, {ERROR_DIR_NOT_EMPTY, ENOTEMPTY}, {ERROR_BUSY, EBUSY}, {ERROR_ALREADY_EXISTS, EEXIST}, {ERROR_LOCKED, ENOLCK}, {ERROR_DIRECTORY, EINVAL},

1 0

Piotr Caban : msvcrt: Skip small-block heap tests if _set_sbh_threshold is not available.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: acc7907dc973ce0e2fe615a0726bafdd13eb4754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acc7907dc973ce0e2fe615a0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 19 13:46:12 2021 +0100 msvcrt: Skip small-block heap tests if _set_sbh_threshold is not available. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49181 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/heap.c | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index 6745aeea768..a747482130d 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -23,11 +23,13 @@ #include <errno.h> #include "wine/test.h" -static void (__cdecl *p_aligned_free)(void*) = NULL; -static void * (__cdecl *p_aligned_malloc)(size_t,size_t) = NULL; -static void * (__cdecl *p_aligned_offset_malloc)(size_t,size_t,size_t) = NULL; -static void * (__cdecl *p_aligned_realloc)(void*,size_t,size_t) = NULL; -static void * (__cdecl *p_aligned_offset_realloc)(void*,size_t,size_t,size_t) = NULL; +static void (__cdecl *p_aligned_free)(void*); +static void * (__cdecl *p_aligned_malloc)(size_t,size_t); +static void * (__cdecl *p_aligned_offset_malloc)(size_t,size_t,size_t); +static void * (__cdecl *p_aligned_realloc)(void*,size_t,size_t); +static void * (__cdecl *p_aligned_offset_realloc)(void*,size_t,size_t,size_t); +static int (__cdecl *p__set_sbh_threshold)(size_t); +static size_t (__cdecl *p__get_sbh_threshold)(void); static void test_aligned_malloc(unsigned int size, unsigned int alignment) { @@ -415,28 +417,37 @@ static void test_aligned(void) static void test_sbheap(void) { + HMODULE msvcrt = GetModuleHandleA("msvcrt.dll"); void *mem; int threshold; + p__set_sbh_threshold = (void*)GetProcAddress(msvcrt, "_set_sbh_threshold"); + p__get_sbh_threshold = (void*)GetProcAddress(msvcrt, "_get_sbh_threshold"); + if (!p__set_sbh_threshold || !p__get_sbh_threshold) + { + win_skip("_set_sbh_threshold not available\n"); + return; + } + if(sizeof(void*) == 8) { - ok(!_set_sbh_threshold(0), "_set_sbh_threshold succeeded\n"); - ok(!_set_sbh_threshold(1000), "_set_sbh_threshold succeeded\n"); + ok(!p__set_sbh_threshold(0), "_set_sbh_threshold succeeded\n"); + ok(!p__set_sbh_threshold(1000), "_set_sbh_threshold succeeded\n"); return; } mem = malloc(1); ok(mem != NULL, "malloc failed\n"); - ok(_set_sbh_threshold(1), "_set_sbh_threshold failed\n"); - threshold = _get_sbh_threshold(); + ok(p__set_sbh_threshold(1), "_set_sbh_threshold failed\n"); + threshold = p__get_sbh_threshold(); ok(threshold == 16, "threshold = %d\n", threshold); - ok(_set_sbh_threshold(8), "_set_sbh_threshold failed\n"); - threshold = _get_sbh_threshold(); + ok(p__set_sbh_threshold(8), "_set_sbh_threshold failed\n"); + threshold = p__get_sbh_threshold(); ok(threshold == 16, "threshold = %d\n", threshold); - ok(_set_sbh_threshold(1000), "_set_sbh_threshold failed\n"); - threshold = _get_sbh_threshold(); + ok(p__set_sbh_threshold(1000), "_set_sbh_threshold failed\n"); + threshold = p__get_sbh_threshold(); ok(threshold == 1008, "threshold = %d\n", threshold); free(mem); @@ -449,8 +460,8 @@ static void test_sbheap(void) ok(mem != NULL, "realloc failed\n"); ok(!((UINT_PTR)mem & 0xf), "incorrect alignment (%p)\n", mem); - ok(_set_sbh_threshold(0), "_set_sbh_threshold failed\n"); - threshold = _get_sbh_threshold(); + ok(p__set_sbh_threshold(0), "_set_sbh_threshold failed\n"); + threshold = p__get_sbh_threshold(); ok(threshold == 0, "threshold = %d\n", threshold); free(mem);

1 0

Zebediah Figura : wined3d: Allow OpenGL transform feedback buffer objects to be suballocated from a larger buffer.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: 3057929d5473ca9b4416fb9ece5a66623d9b8325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3057929d5473ca9b4416fb9e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 18 21:06:19 2021 -0600 wined3d: Allow OpenGL transform feedback buffer objects to be suballocated from a larger buffer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 21b5ba1d032..adbaa50a349 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4651,6 +4651,7 @@ static void state_so(struct wined3d_context *context, const struct wined3d_state const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_buffer *buffer; unsigned int offset, size, i; + struct wined3d_bo_gl *bo_gl; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); @@ -4666,6 +4667,7 @@ static void state_so(struct wined3d_context *context, const struct wined3d_state buffer = state->stream_output[i].buffer; offset = state->stream_output[i].offset; + bo_gl = wined3d_bo_gl(buffer->buffer_object); if (offset == ~0u) { FIXME("Appending to stream output buffers not implemented.\n"); @@ -4673,7 +4675,7 @@ static void state_so(struct wined3d_context *context, const struct wined3d_state } size = buffer->resource.size - offset; GL_EXTCALL(glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, i, - wined3d_bo_gl(buffer->buffer_object)->id, offset, size)); + bo_gl->id, bo_gl->buffer_offset + offset, size)); buffer->bo_user.valid = true; } checkGLcall("bind transform feedback buffers");

1 0

Ivo Ivanov : joy.cpl: Allow devices as steering wheels, that only support single-axis effects.
by Alexandre Julliard Nov. 19, 2021

Nov. 19, 2021

Module: wine Branch: master Commit: c2235c44c5f8fedaad775c69b9a475725874bbc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2235c44c5f8fedaad775c69… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 19 09:39:42 2021 +0100 joy.cpl: Allow devices as steering wheels, that only support single-axis effects. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51873 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index c96efb17aa3..a1308606f98 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -790,6 +790,7 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) DIEFFECT dieffect; DWORD axes[2] = {DIJOFS_X, DIJOFS_Y}; int direction[2] = {0, 0}; + int num_axes = 2; struct Joystick *joystick = pvRef; DIRAMPFORCE rforce; DICONSTANTFORCE cforce; @@ -811,8 +812,8 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) dieffect.dwSize = sizeof(dieffect); dieffect.dwFlags = DIEFF_CARTESIAN|DIEFF_OBJECTOFFSETS; dieffect.dwDuration = FF_PLAY_TIME; + dieffect.dwGain = DI_FFNOMINALMAX; - dieffect.cAxes = 2; dieffect.rgdwAxes = axes; dieffect.rglDirection = direction; @@ -865,8 +866,14 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) dieffect.dwFlags |= DIEP_TYPESPECIFICPARAMS; } - hr = IDirectInputDevice2_CreateEffect( - joystick->device, &pdei->guid, &dieffect, &joystick->effects[joystick->cur_effect].effect, NULL); + do + { + dieffect.cAxes = num_axes--; + hr = IDirectInputDevice2_CreateEffect( + joystick->device, &pdei->guid, &dieffect, &joystick->effects[joystick->cur_effect].effect, NULL); + } + while (FAILED(hr) && num_axes); + if (FAILED(hr)) { FIXME("Failed to create effect with type %s, hr %#x\n", debugstr_guid(&pdei->guid), hr);

1 0