February 2022 - Wine-Commits

Rémi Bernon : dssenh: Only fill hash buffer when it's provided.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: f9bca7ed42235ca72587b6886f2bb02e992a79a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9bca7ed42235ca72587b688… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 17:37:12 2021 +0200 dssenh: Only fill hash buffer when it's provided. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30244 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9b19a110ea6adb289cc1afa8e33d8b259164801e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dssenh/main.c | 2 +- dlls/dssenh/tests/dssenh.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 6286b4604fb..2f100d3473e 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -942,7 +942,7 @@ BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYT SetLastError( ERROR_MORE_DATA ); return FALSE; } - memcpy( data, hash->value, hash->len ); + if (data) memcpy( data, hash->value, hash->len ); *len = hash->len; return TRUE; diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index f0fe4a02f97..f399f67d210 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -472,9 +472,16 @@ static void test_hash(const struct hash_test *tests, int testLen) ok(result && (hashLen == tests[i].hashLen), "Expected %d hash len, got %d.Error: %x\n", tests[i].hashLen, hashLen, GetLastError()); + dataLen = 0xdeadbeef; + result = CryptGetHashParam(hHash, HP_HASHVAL, 0, &dataLen, 0); + ok(result, "Expected hash value return.\n"); + ok(dataLen == hashLen, "Expected hash length to match.\n"); + + hashLen = 0xdeadbeef; result = CryptGetHashParam(hHash, HP_HASHVAL, hashValue, &hashLen, 0); ok(result, "Expected hash value return.\n"); + ok(dataLen == hashLen, "Expected hash length to match.\n"); ok(!memcmp(hashValue, tests[i].hash, tests[i].hashLen), "Incorrect hash output.\n"); result = CryptHashData(hHash, data, dataLen, 0);

1 0

Hiroki Awata : dsound: Notify DSBPN_OFFSETSTOP earlier.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: 1ecb100289dc3e38c4972b585df17b678da81cfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ecb100289dc3e38c4972b58… Author: Hiroki Awata <castaneai(a)by.black> Date: Sat Jun 5 12:28:47 2021 +0900 dsound: Notify DSBPN_OFFSETSTOP earlier. Some games may not receive the DSBPN_OFFSETSTOP event and get stuck if CloseHandle is called immediately after IDirectSoundBuffer::Stop. To solve this problem, IDirectSoundBuffer::Stop will immediately notify the DSBPN_OFFSETSTOP event. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41292 Signed-off-by: Hiroki Awata <castaneai(a)by.black> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8116d4e11cd11ba466c1cd92a6a81ca015e230e0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/buffer.c | 7 ++----- dlls/dsound/mixer.c | 6 +----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index fafa6fc6015..dc3b54906ce 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -296,8 +296,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Play(IDirectSoundBuffer8 *iface, DW if (This->state == STATE_STOPPED) { This->leadin = TRUE; This->state = STATE_STARTING; - } else if (This->state == STATE_STOPPING) - This->state = STATE_PLAYING; + } for (i = 0; i < This->num_filters; i++) { IMediaObject_Discontinuity(This->filters[i].obj, 0); @@ -317,9 +316,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Stop(IDirectSoundBuffer8 *iface) AcquireSRWLockExclusive(&This->lock); - if (This->state == STATE_PLAYING) - This->state = STATE_STOPPING; - else if (This->state == STATE_STARTING) + if (This->state == STATE_PLAYING || This->state == STATE_STARTING) { This->state = STATE_STOPPED; DSOUND_CheckEvent(This, 0, 0); diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index a6402b09eff..124d1e4fba1 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -593,11 +593,7 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff if (dsb->buflen && dsb->state) { TRACE("Checking %p, frames=%d\n", dsb, frames); AcquireSRWLockShared(&dsb->lock); - /* if buffer is stopping it is stopped now */ - if (dsb->state == STATE_STOPPING) { - dsb->state = STATE_STOPPED; - DSOUND_CheckEvent(dsb, 0, 0); - } else if (dsb->state != STATE_STOPPED) { + if (dsb->state != STATE_STOPPED) { /* if the buffer was starting, it must be playing now */ if (dsb->state == STATE_STARTING)

1 0

Zhiyi Zhang : uxtheme/tests: Test SetWindowTheme() with a non-existent subclass.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: e049b275c566e55613f2179c5b58bbfc27524dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e049b275c566e55613f2179c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 21 17:14:37 2021 +0800 uxtheme/tests: Test SetWindowTheme() with a non-existent subclass. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 59f3758ecb627000e8fa845d80190a29131096c9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/uxtheme/tests/system.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 5b6c91dc481..ae4de902730 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -102,6 +102,7 @@ static void test_GetWindowTheme(void) static void test_SetWindowTheme(void) { + HTHEME hTheme; HRESULT hRes; HWND hWnd; @@ -110,12 +111,30 @@ todo_wine ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); /* Only do the bare minimum to get a valid hwnd */ - hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); + hWnd = CreateWindowExA(0, "button", "test", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); ok(hWnd != NULL, "Failed to create a test window.\n"); hRes = SetWindowTheme(hWnd, NULL, NULL); ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); + if (IsThemeActive()) + { + hTheme = OpenThemeData(hWnd, L"Button"); + ok(!!hTheme, "OpenThemeData failed.\n"); + CloseThemeData(hTheme); + + hRes = SetWindowTheme(hWnd, L"deadbeef", NULL); + ok(hRes == S_OK, "Expected S_OK, got 0x%08x.\n", hRes); + + hTheme = OpenThemeData(hWnd, L"Button"); + todo_wine ok(!!hTheme, "OpenThemeData failed.\n"); + CloseThemeData(hTheme); + } + else + { + skip("No active theme, skipping rest of SetWindowTheme tests.\n"); + } + DestroyWindow(hWnd); }

1 0

Florian Eder : cmd: Do not change errorlevel when setting environment variables.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: bc6346ba85e044a8460d41a01ce7df62fa7d906f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc6346ba85e044a8460d41a0… Author: Florian Eder <others.meder(a)gmail.com> Date: Tue Jun 1 07:02:54 2021 +0000 cmd: Do not change errorlevel when setting environment variables. Changes CMD to set its errorlevel to 0 only when the value of an environment variable is set in in non-interactive / batch mode, retains the previous value otherwise. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47791 Signed-off-by: Florian Eder <others.meder(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 617d14bc1238b57327a8400eda1c1ab22624beb7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 0fb40d94e49..3f9465320c1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4222,7 +4222,7 @@ void WCMD_setshow_env (WCHAR *s) { if ((!status) & (gle == ERROR_ENVVAR_NOT_FOUND)) { errorlevel = 1; } else if (!status) WCMD_print_error(); - else errorlevel = 0; + else if (!interactive) errorlevel = 0; } }

1 0

Nikolay Sivov : oleaut32: Added ICreateTypeInfo2::DeleteFuncDesc().
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: f2a45ae5c446a69479cfecceef16ad062993d0cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2a45ae5c446a69479cfecce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 5 10:45:35 2021 +0300 oleaut32: Added ICreateTypeInfo2::DeleteFuncDesc(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e3ef9b5426900b21209bb14c3d18caaf52e57f60) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 78 +++++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 52 +++++++++++++++++++++-------- 2 files changed, 116 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ff709ddef62..825851c948e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -8241,6 +8241,83 @@ static void test_DeleteImplType(void) DeleteFileW(filenameW); } +static void test_DeleteFuncDesc(void) +{ + OLECHAR interface1W[] = L"interface1"; + WCHAR filenameW[MAX_PATH], temp_path[MAX_PATH]; + ICreateTypeInfo2 *createti2; + ICreateTypeInfo *createti; + ICreateTypeLib2 *createtl; + FUNCDESC funcdesc; + TYPEATTR *typeattr; + ITypeInfo *ti; + ITypeLib *tl; + HRESULT hr; + + GetTempPathW(ARRAY_SIZE(temp_path), temp_path); + GetTempFileNameW(temp_path, L"tlb", 0, filenameW); + + hr = CreateTypeLib2(SYS_WIN32, filenameW, &createtl); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + hr = ICreateTypeInfo_QueryInterface(createti, &IID_ICreateTypeInfo2, (void **)&createti2); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + ICreateTypeInfo_Release(createti); + + hr = ICreateTypeInfo2_QueryInterface(createti2, &IID_ITypeInfo, (void **)&ti); + ok(hr == S_OK, "Failed to get typeinfo, hr %#x.\n", hr); + + memset(&funcdesc, 0, sizeof(FUNCDESC)); + funcdesc.funckind = FUNC_PUREVIRTUAL; + funcdesc.invkind = INVOKE_PROPERTYGET; + funcdesc.callconv = CC_STDCALL; + funcdesc.elemdescFunc.tdesc.vt = VT_BSTR; + U(funcdesc.elemdescFunc).idldesc.wIDLFlags = IDLFLAG_NONE; + + hr = ICreateTypeInfo2_AddFuncDesc(createti2, 0, &funcdesc); + ok(hr == S_OK, "Failed to add a funcdesc, hr %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(typeattr->cFuncs == 1, "Unexpected cFuncs %u.\n", typeattr->cFuncs); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + hr = ICreateTypeInfo2_DeleteFuncDesc(createti2, 1); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = ICreateTypeInfo2_DeleteFuncDesc(createti2, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(!typeattr->cFuncs, "Unexpected cFuncs %u.\n", typeattr->cFuncs); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + hr = ICreateTypeLib2_SaveAllChanges(createtl); + ok(hr == S_OK, "Failed to save changes, hr %#x.\n", hr); + ICreateTypeLib2_Release(createtl); + ITypeInfo_Release(ti); + ICreateTypeInfo2_Release(createti2); + + /* Load and check typeinfo. */ + hr = LoadTypeLibEx(filenameW, REGKIND_NONE, &tl); + ok(hr == S_OK, "Failed to load typelib, hr %#x.\n", hr); + + hr = ITypeLib_GetTypeInfo(tl, 0, &ti); + ok(hr == S_OK, "Failed to get typeinfo, hr %#x.\n", hr); + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(!typeattr->cFuncs, "Unexpected cFuncs value.\n"); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + ITypeInfo_Release(ti); + + ITypeLib_Release(tl); + + DeleteFileW(filenameW); +} + START_TEST(typelib) { const WCHAR *filename; @@ -8282,4 +8359,5 @@ START_TEST(typelib) test_stub(); test_dep(); test_DeleteImplType(); + test_DeleteFuncDesc(); } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 65d29734800..4669b03d5fc 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5587,6 +5587,22 @@ static ULONG WINAPI ITypeInfo_fnAddRef( ITypeInfo2 *iface) return ref; } +static void typeinfo_release_funcdesc(TLBFuncDesc *func) +{ + unsigned int i; + + for (i = 0; i < func->funcdesc.cParams; ++i) + { + ELEMDESC *elemdesc = &func->funcdesc.lprgelemdescParam[i]; + if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) + VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); + TLB_FreeCustData(&func->pParamDesc[i].custdata_list); + } + heap_free(func->funcdesc.lprgelemdescParam); + heap_free(func->pParamDesc); + TLB_FreeCustData(&func->custdata_list); +} + static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) { UINT i; @@ -5595,18 +5611,7 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) for (i = 0; i < This->typeattr.cFuncs; ++i) { - int j; - TLBFuncDesc *pFInfo = &This->funcdescs[i]; - for(j = 0; j < pFInfo->funcdesc.cParams; j++) - { - ELEMDESC *elemdesc = &pFInfo->funcdesc.lprgelemdescParam[j]; - if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) - VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); - TLB_FreeCustData(&pFInfo->pParamDesc[j].custdata_list); - } - heap_free(pFInfo->funcdesc.lprgelemdescParam); - heap_free(pFInfo->pParamDesc); - TLB_FreeCustData(&pFInfo->custdata_list); + typeinfo_release_funcdesc(&This->funcdescs[i]); } heap_free(This->funcdescs); @@ -11373,8 +11378,27 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDesc(ICreateTypeInfo2 *iface, UINT index) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u - stub\n", This, index); - return E_NOTIMPL; + unsigned int i; + + TRACE("%p %u\n", This, index); + + if (index >= This->typeattr.cFuncs) + return TYPE_E_ELEMENTNOTFOUND; + + typeinfo_release_funcdesc(&This->funcdescs[index]); + + --This->typeattr.cFuncs; + if (index != This->typeattr.cFuncs) + { + memmove(This->funcdescs + index, This->funcdescs + index + 1, + sizeof(*This->funcdescs) * (This->typeattr.cFuncs - index)); + for (i = index; i < This->typeattr.cFuncs; ++i) + TLB_relink_custdata(&This->funcdescs[i].custdata_list); + } + + This->needs_layout = TRUE; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDescByMemId(ICreateTypeInfo2 *iface,

1 0

Damjan Jovanovic : server: The owner of a securable object should have all the standard access rights.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: 4fddab4813fed0361a2e082be27ae5d1dbd0bdee URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fddab4813fed0361a2e082b… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Jun 6 03:59:38 2021 +0200 server: The owner of a securable object should have all the standard access rights. Cygwin fork() fails in NtCreateSymbolicLinkObject(). We successfully create the link but then fail to alloc_handle() with STATUS_ACCESS_DENIED, because the requested access rights exceed what the owner is allowed. Allow it more. Thank you to Dmitry Timoshkov for debugging the security details from alloc_handle() onwards. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48891 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 31e984a09d6bb9ce774da9bee7e24eea2a379f75) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/tests/security.c | 19 +++++++++++++++++-- server/token.c | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 020e69277e0..828601ca782 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1083,10 +1083,25 @@ todo_wine { SetLastError(0xdeadbeef); rc = AccessCheck(sd, token, DELETE, &mapping, &priv_set, &priv_set_len, &granted, &status); ok(rc, "AccessCheck error %d\n", GetLastError()); -todo_wine { ok(status == 1, "expected 1, got %d\n", status); ok(granted == DELETE, "expected DELETE, got %#x\n", granted); -} + + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, WRITE_OWNER, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == WRITE_OWNER, "expected WRITE_OWNER, got %#x\n", granted); + + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, SYNCHRONIZE, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == SYNCHRONIZE, "expected SYNCHRONIZE, got %#x\n", granted); + granted = 0xdeadbeef; status = 0xdeadbeef; SetLastError(0xdeadbeef); diff --git a/server/token.c b/server/token.c index 30320851436..d18c454aba9 100644 --- a/server/token.c +++ b/server/token.c @@ -1124,7 +1124,7 @@ static unsigned int token_access_check( struct token *token, * determined here. */ if (token_sid_present( token, owner, FALSE )) { - current_access |= (READ_CONTROL | WRITE_DAC); + current_access |= (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE); if (desired_access == current_access) { *granted_access = current_access;

1 0

Rémi Bernon : dssenh: Return NTE_BAD_KEYSET when key cannot be opened.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: e83cd0e70fa015cfdb3f5cc71b6a1539ec1bc7b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e83cd0e70fa015cfdb3f5cc7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 17:37:11 2021 +0200 dssenh: Return NTE_BAD_KEYSET when key cannot be opened. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30244 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cf770571bf538f2794f56220f649b232688d1736) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dssenh/main.c | 3 ++- dlls/dssenh/tests/dssenh.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 82822e4daec..6286b4604fb 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -286,7 +286,8 @@ BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags { case 0: case 0 | CRYPT_MACHINE_KEYSET: - ret = read_key_container( name, flags ); + if (!(ret = read_key_container( name, flags ))) + SetLastError( NTE_BAD_KEYSET ); break; case CRYPT_NEWKEYSET: diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index b72b1e3a614..f0fe4a02f97 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -75,7 +75,7 @@ static void test_acquire_context(void) result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, 0); if (!result) { - todo_wine ok(GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); + ok(GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, CRYPT_NEWKEYSET); }

1 0

Rémi Bernon : dinput/tests: Add some windows.gaming.input device tests.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: d0248b6c6a673e359106e21863df3fc25b817616 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0248b6c6a673e359106e218… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 23 17:49:37 2022 +0100 dinput/tests: Add some windows.gaming.input device tests. Only works with an XBox gamepad, looks like DInput gamepads aren't exposed as WGI gamepads. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick8.c | 170 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 9c700c00971..959f91aae78 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -31,11 +31,21 @@ #include "dinputd.h" #include "devguid.h" #include "mmsystem.h" +#include "roapi.h" +#include "unknwn.h" +#include "winstring.h" #include "wine/hid.h" #include "dinput_test.h" +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Devices_Haptics +#define WIDL_using_Windows_Gaming_Input +#include "windows.gaming.input.h" + struct check_objects_todos { BOOL type; @@ -3181,6 +3191,165 @@ done: return device != NULL; } +#define check_interface( a, b, c ) check_interface_( __LINE__, a, b, c ) +static void check_interface_( unsigned int line, void *iface_ptr, REFIID iid, BOOL supported ) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected; + IUnknown *unk; + + expected = supported ? S_OK : E_NOINTERFACE; + hr = IUnknown_QueryInterface( iface, iid, (void **)&unk ); + ok_ (__FILE__, line)( hr == expected, "got hr %#lx, expected %#lx.\n", hr, expected ); + if (SUCCEEDED(hr)) IUnknown_Release( unk ); +} + +#define check_runtimeclass( a, b ) check_runtimeclass_( __LINE__, (IInspectable *)a, b ) +static void check_runtimeclass_( int line, IInspectable *inspectable, const WCHAR *class_name ) +{ + const WCHAR *buffer; + UINT32 length; + HSTRING str; + HRESULT hr; + + hr = IInspectable_GetRuntimeClassName( inspectable, &str ); + ok_ (__FILE__, line)( hr == S_OK, "GetRuntimeClassName returned %#lx\n", hr ); + buffer = WindowsGetStringRawBuffer( str, &length ); + ok_ (__FILE__, line)( !wcscmp( buffer, class_name ), "got class name %s\n", debugstr_w(buffer) ); + WindowsDeleteString( str ); +} + +static void test_windows_gaming_input(void) +{ +#include "psh_hid_macros.h" + const unsigned char report_desc[] = { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_GAMEPAD), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_GAMEPAD), + COLLECTION(1, Physical), + USAGE(1, HID_USAGE_GENERIC_X), + USAGE(1, HID_USAGE_GENERIC_Y), + USAGE(1, HID_USAGE_GENERIC_RX), + USAGE(1, HID_USAGE_GENERIC_RY), + USAGE(1, HID_USAGE_GENERIC_Z), + USAGE(1, HID_USAGE_GENERIC_RZ), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 127), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 127), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 6), + INPUT(1, Data|Var|Abs), + + USAGE(1, HID_USAGE_GENERIC_HATSWITCH), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 8), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 8), + REPORT_SIZE(1, 4), + REPORT_COUNT(1, 1), + INPUT(1, Data|Var|Abs|Null), + + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 12), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 12), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; +#include "pop_hid_macros.h" + + static const HIDP_CAPS hid_caps = + { + .InputReportByteLength = 8, + }; + static const WCHAR *controller_class_name = RuntimeClass_Windows_Gaming_Input_RawGameController; + + IVectorView_RawGameController *controllers_view; + IRawGameControllerStatics *controller_statics; + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + IRawGameController *raw_controller; + UINT32 size; + HSTRING str; + HRESULT hr; + + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); + GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); + SetCurrentDirectoryW( tempdir ); + + cleanup_registry_keys(); + + hr = RoInitialize( RO_INIT_MULTITHREADED ); + ok( hr == RPC_E_CHANGED_MODE, "RoInitialize returned %#lx\n", hr ); + + hr = WindowsCreateString( controller_class_name, wcslen( controller_class_name ), &str ); + ok( hr == S_OK, "WindowsCreateString returned %#lx\n", hr ); + hr = RoGetActivationFactory( str, &IID_IRawGameControllerStatics, (void **)&controller_statics ); + ok( hr == S_OK || broken( hr == REGDB_E_CLASSNOTREG ), "RoGetActivationFactory returned %#lx\n", hr ); + WindowsDeleteString( str ); + + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip( "%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w( controller_class_name ) ); + goto done; + } + + hr = IRawGameControllerStatics_get_RawGameControllers( controller_statics, &controllers_view ); + ok( hr == S_OK, "get_RawGameControllers returned %#lx\n", hr ); + hr = IVectorView_RawGameController_get_Size( controllers_view, &size ); + ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + ok( size == 0, "got size %u\n", size ); + + if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; + + hr = IVectorView_RawGameController_get_Size( controllers_view, &size ); + ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + ok( size == 0, "got size %u\n", size ); + IVectorView_RawGameController_Release( controllers_view ); + + hr = IRawGameControllerStatics_get_RawGameControllers( controller_statics, &controllers_view ); + ok( hr == S_OK, "get_RawGameControllers returned %#lx\n", hr ); + hr = IVectorView_RawGameController_get_Size( controllers_view, &size ); + ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + todo_wine + ok( size == 1, "got size %u\n", size ); + hr = IVectorView_RawGameController_GetAt( controllers_view, 0, &raw_controller ); + todo_wine + ok( hr == S_OK, "GetAt returned %#lx\n", hr ); + IVectorView_RawGameController_Release( controllers_view ); + if (hr != S_OK) + { + IRawGameControllerStatics_Release( controller_statics ); + goto done; + } + + check_runtimeclass( raw_controller, RuntimeClass_Windows_Gaming_Input_RawGameController ); + check_interface( raw_controller, &IID_IUnknown, TRUE ); + check_interface( raw_controller, &IID_IInspectable, TRUE ); + check_interface( raw_controller, &IID_IAgileObject, TRUE ); + check_interface( raw_controller, &IID_IRawGameController, TRUE ); + check_interface( raw_controller, &IID_IRawGameController2, TRUE ); + check_interface( raw_controller, &IID_IGameController, TRUE ); + check_interface( raw_controller, &IID_IGamepad, FALSE ); + + IRawGameController_Release( raw_controller ); + IRawGameControllerStatics_Release( controller_statics ); + +done: + pnp_driver_stop(); + cleanup_registry_keys(); + SetCurrentDirectoryW( cwd ); + + RoUninitialize(); +} + START_TEST( joystick8 ) { if (!dinput_test_init()) return; @@ -3200,6 +3369,7 @@ START_TEST( joystick8 ) test_simple_joystick( 0x800 ); test_driving_wheel_axes(); + test_windows_gaming_input(); } CoUninitialize();

1 0

Zebediah Figura : wined3d: Accelerate texture DISCARD maps as well.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: 125f5b72100d2a0f82f118b857349ff6915a661f URL: https://source.winehq.org/git/wine.git/?a=commit;h=125f5b72100d2a0f82f118b8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 20:21:42 2022 -0600 wined3d: Accelerate texture DISCARD maps as well. 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/adapter_gl.c | 76 +++++++++++++++++++++++++++-------------------- dlls/wined3d/adapter_vk.c | 54 +++++++++++++++++++-------------- dlls/wined3d/cs.c | 9 +++--- dlls/wined3d/texture.c | 33 ++++++++++++++++++++ 4 files changed, 113 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=125f5b72100d2a0f82f1…

1 0

Eric Pouech : faultrep/tests: Enable compilation with long types.
by Alexandre Julliard Feb. 24, 2022

Feb. 24, 2022

Module: wine Branch: master Commit: e913d34eb25f5bf0570b99549da9105d66de3f8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e913d34eb25f5bf0570b9954… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:29:40 2022 +0100 faultrep/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/faultrep/tests/Makefile.in | 1 - dlls/faultrep/tests/faultrep.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/faultrep/tests/Makefile.in b/dlls/faultrep/tests/Makefile.in index 202dd0571ba..404bd4d7d3f 100644 --- a/dlls/faultrep/tests/Makefile.in +++ b/dlls/faultrep/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = faultrep.dll IMPORTS = faultrep advapi32 diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index 41f03ee8870..83acd34a6d4 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -82,11 +82,11 @@ static void test_AddERExcludedApplicationA(void) SetLastError(0xdeadbeef); res = AddERExcludedApplicationA(NULL); - ok(!res, "got %d and 0x%x (expected FALSE)\n", res, GetLastError()); + ok(!res, "got %d and 0x%lx (expected FALSE)\n", res, GetLastError()); SetLastError(0xdeadbeef); res = AddERExcludedApplicationA(""); - ok(!res, "got %d and 0x%x (expected FALSE)\n", res, GetLastError()); + ok(!res, "got %d and 0x%lx (expected FALSE)\n", res, GetLastError()); SetLastError(0xdeadbeef); /* existence of the path doesn't matter this function succeeded */ @@ -99,12 +99,12 @@ static void test_AddERExcludedApplicationA(void) } else { - ok(res, "AddERExcludedApplicationA failed (le=0x%x)\n", GetLastError()); + ok(res, "AddERExcludedApplicationA failed (le=0x%lx)\n", GetLastError()); /* add, when already present */ SetLastError(0xdeadbeef); res = AddERExcludedApplicationA("winetest_faultrep.exe"); - ok(res, "AddERExcludedApplicationA failed (le=0x%x)\n", GetLastError()); + ok(res, "AddERExcludedApplicationA failed (le=0x%lx)\n", GetLastError()); } /* cleanup */

1 0