February 2022 - Wine-commits

Hiroki Awata : dsound: Notify DSBPN_OFFSETSTOP earlier.
by Alexandre Julliard 25 Feb '22

25 Feb '22

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

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

25 Feb '22

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

Gijs Vermeulen : vcomp: Implement omp_get_num_procs().
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 718699df4033ae2a4725ef7c72b52004803d6c03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=718699df4033ae2a4725ef7c… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jun 4 20:10:27 2021 +0200 vcomp: Implement omp_get_num_procs(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50041 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 616e2284e038c00757eee940bb2c469531f4acdd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vcomp/main.c | 6 ++++-- dlls/vcomp/tests/vcomp.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 3c6d48d41cc..375119f2adf 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -41,6 +41,7 @@ static DWORD vcomp_context_tls = TLS_OUT_OF_INDEXES; static HMODULE vcomp_module; static int vcomp_max_threads; static int vcomp_num_threads; +static int vcomp_num_procs; static BOOL vcomp_nested_fork = FALSE; static RTL_CRITICAL_SECTION vcomp_section; @@ -986,8 +987,8 @@ int CDECL omp_get_nested(void) int CDECL omp_get_num_procs(void) { - TRACE("stub\n"); - return 1; + TRACE("\n"); + return vcomp_num_procs; } int CDECL omp_get_num_threads(void) @@ -1680,6 +1681,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) vcomp_module = instance; vcomp_max_threads = sysinfo.dwNumberOfProcessors; vcomp_num_threads = sysinfo.dwNumberOfProcessors; + vcomp_num_procs = sysinfo.dwNumberOfProcessors; break; } diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 478bb5d7cfe..16008d17728 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -117,6 +117,7 @@ static void (CDECL *pomp_destroy_lock)(omp_lock_t *lock); static void (CDECL *pomp_destroy_nest_lock)(omp_nest_lock_t *lock); static int (CDECL *pomp_get_max_threads)(void); static int (CDECL *pomp_get_nested)(void); +static int (CDECL *pomp_get_num_procs)(void); static int (CDECL *pomp_get_num_threads)(void); static int (CDECL *pomp_get_thread_num)(void); static int (CDECL *pomp_in_parallel)(void); @@ -352,6 +353,7 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(omp_destroy_nest_lock); VCOMP_GET_PROC(omp_get_max_threads); VCOMP_GET_PROC(omp_get_nested); + VCOMP_GET_PROC(omp_get_num_procs); VCOMP_GET_PROC(omp_get_num_threads); VCOMP_GET_PROC(omp_get_thread_num); VCOMP_GET_PROC(omp_in_parallel); @@ -2209,11 +2211,24 @@ static void test_reduction_float_double(void) } } +static void test_omp_get_num_procs(void) +{ + SYSTEM_INFO sysinfo; + int num_procs; + + num_procs = pomp_get_num_procs(); + ok(num_procs > 0, "expected non-zero num_procs\n"); + GetSystemInfo(&sysinfo); + ok(sysinfo.dwNumberOfProcessors > 0, "expected non-zero dwNumberOfProcessors\n"); + ok(num_procs == sysinfo.dwNumberOfProcessors, "got dwNumberOfProcessors %d num_procs %d\n", sysinfo.dwNumberOfProcessors, num_procs); +} + START_TEST(vcomp) { if (!init_vcomp()) return; + test_omp_get_num_procs(); test_omp_get_num_threads(FALSE); test_omp_get_num_threads(TRUE); test_vcomp_fork();

1 0

Vijay Kiran Kamuju : msdrm: Add stub DRMRegisterContent function.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 4eea9e383abe42652f8e35ba5ddfbf3cb7eb3f51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eea9e383abe42652f8e35ba… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Feb 19 14:02:32 2021 +0100 msdrm: Add stub DRMRegisterContent function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50595 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit afd5550b07f6d55e56738f61d829085d6bc82888) Conflicts: dlls/msdrm/Makefile.in dlls/msdrm/main.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msdrm/main.c | 13 ++++++++++++- dlls/msdrm/msdrm.spec | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msdrm/main.c b/dlls/msdrm/main.c index b278d77c83a..6ca7c5fb050 100644 --- a/dlls/msdrm/main.c +++ b/dlls/msdrm/main.c @@ -1,7 +1,8 @@ /* - * msdrm.dll + * Windows Rights Management Client * * Copyright 2016 Austin English + * Copyright 2021 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,9 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdrm); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { @@ -36,3 +40,10 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) return TRUE; } + +HRESULT WINAPI DRMRegisterContent(BOOL value) +{ + FIXME("(%u): stub\n", value); + + return S_OK; +} diff --git a/dlls/msdrm/msdrm.spec b/dlls/msdrm/msdrm.spec index 5d4d3d61bce..85cbb02541d 100644 --- a/dlls/msdrm/msdrm.spec +++ b/dlls/msdrm/msdrm.spec @@ -70,7 +70,7 @@ @ stub DRMIsWindowProtected @ stub DRMLoadLibrary @ stub DRMParseUnboundLicense -@ stub DRMRegisterContent +@ stdcall DRMRegisterContent(long) @ stub DRMRegisterProtectedWindow @ stub DRMRegisterRevocationList @ stub DRMRepair

1 0

Nikolay Sivov : oleaut32: Added ICreateTypeInfo2::DeleteFuncDesc().
by Alexandre Julliard 25 Feb '22

25 Feb '22

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

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

25 Feb '22

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

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

25 Feb '22

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

Rémi Bernon : dinput/tests: Add tests for IGamepadStatics_get_Gamepads.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 3c2bb0f87c48faf17adc5f2ae8a1229043b7ee70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c2bb0f87c48faf17adc5f2a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 23 17:49:39 2022 +0100 dinput/tests: Add tests for IGamepadStatics_get_Gamepads. Showing that HID gamepads aren't listed 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 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index d98faf7d3ee..f01bed08030 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -3271,11 +3271,14 @@ static void test_windows_gaming_input(void) .InputReportByteLength = 8, }; static const WCHAR *controller_class_name = RuntimeClass_Windows_Gaming_Input_RawGameController; + static const WCHAR *gamepad_class_name = RuntimeClass_Windows_Gaming_Input_Gamepad; IRawGameController *raw_controller, *tmp_raw_controller; IVectorView_RawGameController *controllers_view; IRawGameControllerStatics *controller_statics; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + IVectorView_Gamepad *gamepads_view; + IGamepadStatics *gamepad_statics; IGameController *game_controller; UINT32 size; HSTRING str; @@ -3331,6 +3334,21 @@ static void test_windows_gaming_input(void) goto done; } + /* HID gamepads aren't exposed as WGI gamepads on Windows */ + + hr = WindowsCreateString( gamepad_class_name, wcslen( gamepad_class_name ), &str ); + ok( hr == S_OK, "WindowsCreateString returned %#lx\n", hr ); + hr = RoGetActivationFactory( str, &IID_IGamepadStatics, (void **)&gamepad_statics ); + ok( hr == S_OK, "RoGetActivationFactory returned %#lx\n", hr ); + WindowsDeleteString( str ); + hr = IGamepadStatics_get_Gamepads( gamepad_statics, &gamepads_view ); + ok( hr == S_OK, "get_Gamepads returned %#lx\n", hr ); + hr = IVectorView_Gamepad_get_Size( gamepads_view, &size ); + ok( hr == S_OK, "get_Size returned %#lx\n", hr ); + ok( size == 0, "got size %u\n", size ); + IVectorView_Gamepad_Release( gamepads_view ); + IGamepadStatics_Release( gamepad_statics ); + check_runtimeclass( raw_controller, RuntimeClass_Windows_Gaming_Input_RawGameController ); check_interface( raw_controller, &IID_IUnknown, TRUE ); check_interface( raw_controller, &IID_IInspectable, TRUE );

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 58d4037290f73e048afe7592a1f293c927171f80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58d4037290f73e048afe7592… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Feb 24 19:15:46 2022 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/po/fi.po b/po/fi.po index b121eaa546f..41e57561142 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6950,54 +6950,40 @@ msgid "This network connection does not exist.\n" msgstr "Tätä verkkoyhteyttä ei ole.\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "Keskeytysaikana virheellinen.\n" +msgstr "Kutsu keskeytetty.\n" #: dlls/kernel32/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "Kahva ei kelpaa.\n" +msgstr "Tiedoston kahva ei kelpaa.\n" #: dlls/kernel32/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "Verkko-osoite ei kelpaa.\n" +msgstr "Osoittimen osoite ei kelpaa.\n" #: dlls/kernel32/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "Nimi ei kelpaa.\n" +msgstr "Argumentti ei kelpaa.\n" #: dlls/kernel32/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "Vastapuoli nollasi yhteyden.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "Pistettä ei löydy.\n" +msgstr "Isäntää ei löydy.\n" #: dlls/kernel32/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "Attribuuttia ei löydy.\n" +msgstr "Isäntää ei löydy (ei-autoritatiivinen).\n" #: dlls/kernel32/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "On tapahtunut peruuttamaton virhe.\n" +msgstr "Peruuttamaton virhe.\n" #: dlls/kernel32/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "Nimi kelpaa, ei tietuetta.\n" #: dlls/kernel32/winerror.mc:3817 msgid "Not implemented.\n" @@ -18357,8 +18343,8 @@ msgid "" msgstr "" "Jos tätä ongelmaa ei esiinny Windowsin kanssa eikä sitä ole vielä " "raportoitu, voit tallentaa yksityiskohtaisemmat tiedot tiedostoon Tallenna " -"nimellä -kohdassa ja sitten <a href=\"https://wiki.winehq.org/Bugs" -"\">lähettää virheraportin</a> ja liittää tiedoston raporttiin." +"nimellä -kohdassa ja sitten <a href=\"https://wiki.winehq.org/" +"Bugs\">lähettää virheraportin</a> ja liittää tiedoston raporttiin." #: programs/winedbg/winedbg.rc:40 msgid ""

1 0

Eric Pouech : comctl32/tests: Use correct integral type.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 330261b9b4010fb94235721e2c49813f51cad692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=330261b9b4010fb94235721e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:26:47 2022 +0100 comctl32/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 2 +- dlls/comctl32/tests/rebar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index a4d6a658cda..2ce964f8a27 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -1210,7 +1210,7 @@ static void test_wm_notify(void) DONT_CONVERT_SEND | DONT_CONVERT_RECEIVE}, {&nmtbr, sizeof(nmtbr), NULL, 0, (WCHAR **)&nmtbr.tbButton.iString, NULL, TBN_RESTORE, TBN_RESTORE, DONT_CONVERT_SEND | DONT_CONVERT_RECEIVE}, - {&nmtbdi, sizeof(nmtbdi), &nmtbdi.dwMask, TBNF_TEXT, &nmtbdi.pszText, &nmtbdi.cchText, TBN_GETDISPINFOW, + {&nmtbdi, sizeof(nmtbdi), (UINT*)&nmtbdi.dwMask, TBNF_TEXT, &nmtbdi.pszText, &nmtbdi.cchText, TBN_GETDISPINFOW, TBN_GETDISPINFOW, DONT_CONVERT_SEND | DONT_CONVERT_RECEIVE}, {&nmtb, sizeof(nmtb), NULL, 0, &nmtb.pszText, &nmtb.cchText, TBN_GETBUTTONINFOW, TBN_GETBUTTONINFOA, SEND_EMPTY_IF_NULL | CONVERT_SEND | CONVERT_RECEIVE}, diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 63449d4d457..e868198b4d8 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -195,7 +195,7 @@ static int string_width(const CHAR *s) { typedef struct { RECT rc; - DWORD fStyle; + UINT fStyle; UINT cx; } rbband_result_t;

1 0