November 2022 - Wine-Commits

Zhiyi Zhang : light.msstyles: Add Menu stub class.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 3b3f364ba9a09f5d92ce47dfaa22cb4cb65f8c7b URL: https://gitlab.winehq.org/wine/wine/-/commit/3b3f364ba9a09f5d92ce47dfaa22cb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 24 18:01:56 2022 +0800 light.msstyles: Add Menu stub class. Fix DTS Master Audio Suite save file button can not be clicked. The application queries for Vista+ Menu class because Wine's default system version is set to Windows 7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52667 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2b86208f8c93f41c4d47ae4d2ebf271d0d3fdc5d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/light.msstyles/light.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index ba27c9461bc..38b5ac1377b 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -451,6 +451,10 @@ BLUE_INI TEXTFILE "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"\r\n; Menu\r\n" +"[Menu]\r\n" +"BgType = None\r\n" + "\r\n; Progress\r\n" "[Progress]\r\n" "ProgressChunkSize = 1\r\n"

1 0

Piotr Caban : msvcr100: Improve ThreadScheduler_ScheduleTask_loc stub.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 85e0b34b19f60f6258cb0a012aadb7d7eeb0c28b URL: https://gitlab.winehq.org/wine/wine/-/commit/85e0b34b19f60f6258cb0a012aadb7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Apr 3 20:30:41 2022 +0200 msvcr100: Improve ThreadScheduler_ScheduleTask_loc stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45916 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2d2dba53740a3bf6407e19c33e530a84945aceff) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/concurrency.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index e9047ab41b9..f66dfa43f36 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1217,11 +1217,45 @@ DEFINE_THISCALL_WRAPPER(ThreadScheduler_CreateScheduleGroup, 4) return NULL; } +typedef struct +{ + void (__cdecl *proc)(void*); + void *data; +} schedule_task_arg; + +static void WINAPI schedule_task_proc(PTP_CALLBACK_INSTANCE instance, void *context, PTP_WORK work) +{ + schedule_task_arg arg; + + arg = *(schedule_task_arg*)context; + operator_delete(context); + arg.proc(arg.data); +} + DEFINE_THISCALL_WRAPPER(ThreadScheduler_ScheduleTask_loc, 16) void __thiscall ThreadScheduler_ScheduleTask_loc(ThreadScheduler *this, void (__cdecl *proc)(void*), void* data, /*location*/void *placement) { + schedule_task_arg *arg; + TP_WORK *work; + FIXME("(%p %p %p %p) stub\n", this, proc, data, placement); + + arg = operator_new(sizeof(*arg)); + arg->proc = proc; + arg->data = data; + + work = CreateThreadpoolWork(schedule_task_proc, arg, NULL); + if(!work) { + scheduler_resource_allocation_error e; + + operator_delete(arg); + scheduler_resource_allocation_error_ctor_name(&e, NULL, + HRESULT_FROM_WIN32(GetLastError())); + _CxxThrowException(&e, &scheduler_resource_allocation_error_exception_type); + } + SubmitThreadpoolWork(work); + CloseThreadpoolWork(work); } DEFINE_THISCALL_WRAPPER(ThreadScheduler_ScheduleTask, 12) @@ -1229,6 +1263,7 @@ void __thiscall ThreadScheduler_ScheduleTask(ThreadScheduler *this, void (__cdecl *proc)(void*), void* data) { FIXME("(%p %p %p) stub\n", this, proc, data); + ThreadScheduler_ScheduleTask_loc(this, proc, data, NULL); } DEFINE_THISCALL_WRAPPER(ThreadScheduler_IsAvailableLocation, 8)

1 0

Gijs Vermeulen : setupapi: Add SetupQueryInfVersionInformationA/W stub.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 3f5133e4c72ebd56a1c748938c43a85afed01fad URL: https://gitlab.winehq.org/wine/wine/-/commit/3f5133e4c72ebd56a1c748938c43a8… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Apr 1 16:16:31 2022 +0200 setupapi: Add SetupQueryInfVersionInformationA/W stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52616 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dc0aa67ce690f67ae8c12d7bed0a449c1af8c693) Conflicts: dlls/setupapi/query.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/query.c | 18 ++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 828d8a1145a..ca11d274486 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -731,3 +731,21 @@ BOOL WINAPI SetupGetInfDriverStoreLocationW( SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI SetupQueryInfVersionInformationA(SP_INF_INFORMATION *info, UINT index, const char *key, char *buff, + DWORD size, DWORD *req_size) +{ + FIXME("info %p, index %d, key %s, buff %p, size %d, req_size %p stub!\n", info, index, debugstr_a(key), buff, + size, req_size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SetupQueryInfVersionInformationW(SP_INF_INFORMATION *info, UINT index, const WCHAR *key, WCHAR *buff, + DWORD size, DWORD *req_size) +{ + FIXME("info %p, index %d, key %s, buff %p, size %d, req_size %p stub!\n", info, index, debugstr_w(key), buff, + size, req_size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 1b3f5cc6bd8..71b31cf343c 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -491,8 +491,8 @@ @ stdcall SetupQueryInfFileInformationW(ptr long wstr long ptr) @ stdcall SetupQueryInfOriginalFileInformationA(ptr long ptr ptr) @ stdcall SetupQueryInfOriginalFileInformationW(ptr long ptr ptr) -@ stub SetupQueryInfVersionInformationA -@ stub SetupQueryInfVersionInformationW +@ stdcall SetupQueryInfVersionInformationA(ptr long str ptr long ptr) +@ stdcall SetupQueryInfVersionInformationW(ptr long wstr ptr long ptr) @ stub SetupQuerySourceListA @ stub SetupQuerySourceListW @ stdcall SetupQuerySpaceRequiredOnDriveA(long str ptr ptr long)

1 0

Eric Pouech : start: Wrap child inside a job so it gets killed when start.exe terminates.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: c5052649f53ff03696d0c417420b26e3ff1d3007 URL: https://gitlab.winehq.org/wine/wine/-/commit/c5052649f53ff03696d0c417420b26… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jan 25 08:31:34 2022 +0100 start: Wrap child inside a job so it gets killed when start.exe terminates. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50869 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a1abb524fee5b033e761d700b87353f14b009680) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/start/start.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/programs/start/start.c b/programs/start/start.c index dcd0a113f59..b5bf8187603 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -676,7 +676,24 @@ done: if (sei.fMask & SEE_MASK_NOCLOSEPROCESS) { DWORD exitcode; + HANDLE hJob; + JOBOBJECT_EXTENDED_LIMIT_INFORMATION info; + SetConsoleCtrlHandler(NULL, TRUE); + hJob = CreateJobObjectA(NULL, NULL); + /* Create a job where the child is associated... if the start.exe terminates + * before the child, the job will be terminated, and the child will be terminated as well. + * (The idea is to allow to kill (from a Unix standpoint) a created Windows + * process (here start.exe), and that the unix-kill of start.exe will be also terminate + * start.exe's child process). + */ + memset(&info, 0, sizeof(info)); + info.BasicLimitInformation.LimitFlags = + JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE | + JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK; + SetInformationJobObject(hJob, JobObjectExtendedLimitInformation, &info, sizeof(info)); + AssignProcessToJobObject(hJob, sei.hProcess); + WaitForSingleObject(sei.hProcess, INFINITE); GetExitCodeProcess(sei.hProcess, &exitcode); ExitProcess(exitcode);

1 0

Matteo Bruni : combase: Add RoSetErrorReportingFlags() stub.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 8f9b96896cd03c98c80d1fd2d74e9fbf2bb8220a URL: https://gitlab.winehq.org/wine/wine/-/commit/8f9b96896cd03c98c80d1fd2d74e9f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 14:05:32 2022 +0100 combase: Add RoSetErrorReportingFlags() stub. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 430583893e52a46eabca5056da3b73455501369a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-winrt-error-l1-1-0.spec | 2 +- .../api-ms-win-core-winrt-error-l1-1-1.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 9 +++++++++ include/roerrorapi.h | 10 ++++++++++ 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec index cf410136631..6505d8b86c4 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec @@ -5,7 +5,7 @@ @ stdcall RoOriginateError(long ptr) combase.RoOriginateError @ stub RoOriginateErrorW @ stub RoResolveRestrictedErrorInfoReference -@ stub RoSetErrorReportingFlags +@ stdcall RoSetErrorReportingFlags(long) combase.RoSetErrorReportingFlags @ stub RoTransformError @ stub RoTransformErrorW @ stub SetRestrictedErrorInfo diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec index d969540e94d..856a580db70 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec @@ -13,7 +13,7 @@ @ stub RoReportFailedDelegate @ stub RoReportUnhandledError @ stub RoResolveRestrictedErrorInfoReference -@ stub RoSetErrorReportingFlags +@ stdcall RoSetErrorReportingFlags(long) combase.RoSetErrorReportingFlags @ stub RoTransformError @ stub RoTransformErrorW @ stub SetRestrictedErrorInfo diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c2fafacdea3..b3f4d25b42c 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -312,7 +312,7 @@ @ stub RoReportUnhandledError @ stub RoResolveRestrictedErrorInfoReference @ stub RoRevokeActivationFactories -@ stub RoSetErrorReportingFlags +@ stdcall RoSetErrorReportingFlags(long) @ stub RoTransformError @ stub RoTransformErrorW @ stdcall RoUninitialize() diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 7d871fb885c..58c2cd59682 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -299,6 +299,15 @@ BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message) return FALSE; } +/*********************************************************************** + * RoSetErrorReportingFlags (combase.@) + */ +HRESULT WINAPI RoSetErrorReportingFlags(UINT32 flags) +{ + FIXME("(%08x): stub\n", flags); + return S_OK; +} + /*********************************************************************** * CleanupTlsOleState (combase.@) */ diff --git a/include/roerrorapi.h b/include/roerrorapi.h index 454e1a6c2e9..741347455b1 100644 --- a/include/roerrorapi.h +++ b/include/roerrorapi.h @@ -23,8 +23,18 @@ #include <restrictederrorinfo.h> #include <rpc.h> +typedef enum +{ + RO_ERROR_REPORTING_NONE = 0x0, + RO_ERROR_REPORTING_SUPPRESSEXCEPTIONS = 0x1, + RO_ERROR_REPORTING_FORCEEXCEPTIONS = 0x2, + RO_ERROR_REPORTING_USESETERRORINFO = 0x4, + RO_ERROR_REPORTING_SUPPRESSSETERRORINFO = 0x8, +} RO_ERROR_REPORTING_FLAGS; + HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info); BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message); BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception); +HRESULT WINAPI RoSetErrorReportingFlags(UINT32 flags); #endif /* _ROERROR_H */

1 0

Brendan Shanks : makefiles: On macOS, use @rpath instead of @loader_path when building Unix libs.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 7ae43d703d83f246a86cb403779dd96a40649c57 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ae43d703d83f246a86cb403779dd9… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Mar 7 12:59:02 2022 -0800 makefiles: On macOS, use @rpath instead of @loader_path when building Unix libs. Fixes launching 32-bit EXEs from a WOW64 build dir. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52618 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7b27e60e67d966a6db99dd2611310bc6e02a8e77) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- tools/winegcc/winegcc.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index dcce2e8644e..82870da724d 100755 --- a/configure +++ b/configure @@ -10380,7 +10380,7 @@ fi LIBS="$ac_save_LIBS" fi - UNIXLDFLAGS="-dynamiclib -install_name @loader_path/\$(UNIXLIB)" + UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/" LIBWINE_SHAREDLIB="libwine.$libwine_version.dylib" LIBWINE_LDFLAGS="-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version" diff --git a/configure.ac b/configure.ac index b42cb8a5346..b9903b04671 100644 --- a/configure.ac +++ b/configure.ac @@ -781,7 +781,7 @@ case $host_os in LIBS="$ac_save_LIBS" fi - UNIXLDFLAGS="-dynamiclib -install_name @loader_path/\$(UNIXLIB)" + UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/" AC_SUBST(LIBWINE_SHAREDLIB,"libwine.$libwine_version.dylib") AC_SUBST(LIBWINE_LDFLAGS,["-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"]) AC_SUBST(WINELOADER_DEPENDS,"wine_info.plist") diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 8644afe7535..5e666c395e5 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -415,7 +415,8 @@ static struct strarray get_link_args( struct options *opts, const char *output_n if (opts->unix_lib) { strarray_add( &flags, "-install_name" ); - strarray_add( &flags, strmake( "@loader_path/%s.so", output_name ) ); + strarray_add( &flags, strmake( "@rpath/%s.so", output_name ) ); + strarray_add( &flags, "-Wl,-rpath,@loader_path/" ); } strarray_addall( &link_args, flags ); return link_args;

1 0

Zhiyi Zhang : uxtheme: Search parts of any state in IsThemePartDefined().
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 704b6ef41c28c843f5ed538d4dc8742b2aaf64a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/704b6ef41c28c843f5ed538d4dc874… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 1 15:06:38 2022 +0800 uxtheme: Search parts of any state in IsThemePartDefined(). Tests show that IsThemePartDefined() doesn't use state ID to search parts. If a part of any state is present, the part is considered as defined. For example, disabled state of part EditText of class Edit is present in theme files but there is no default state for part EditText. So IsThemePartDefined(theme, EP_EDITTEXT, 0) failed previously and it should succeed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52581 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f11129d9c47b6ad0f52e4d2e88d17d9a0c2fe552) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/uxtheme/msstyles.c | 30 ++++++++++++++++++++++++++++++ dlls/uxtheme/msstyles.h | 1 + dlls/uxtheme/system.c | 6 +++--- dlls/uxtheme/tests/system.c | 13 +++---------- 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index c0f626d54aa..8c9225f1e1f 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -451,6 +451,36 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST return cur; } +/*********************************************************************** + * MSSTYLES_FindPart + * + * Find a part + * + * PARAMS + * tc Class to search + * iPartId Part ID to find + * + * RETURNS + * The part found, or NULL + */ +PTHEME_PARTSTATE MSSTYLES_FindPart(PTHEME_CLASS tc, int iPartId) +{ + PTHEME_PARTSTATE cur = tc->partstate; + + while (cur) + { + if (cur->iPartId == iPartId) + return cur; + + cur = cur->next; + } + + if (tc->overrides) + return MSSTYLES_FindPart(tc->overrides, iPartId); + + return NULL; +} + /*********************************************************************** * MSSTYLES_FindPartState * diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 12292cefae4..67f81315d7a 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -95,6 +95,7 @@ BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue) DECLSPE BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId) DECLSPEC_HIDDEN; PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf) DECLSPEC_HIDDEN; UINT MSSTYLES_GetThemeDPI(PTHEME_CLASS tc) DECLSPEC_HIDDEN; +PTHEME_PARTSTATE MSSTYLES_FindPart(PTHEME_CLASS tc, int iPartId) DECLSPEC_HIDDEN; PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 61a608e5962..5e245b16d3a 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -809,9 +809,9 @@ BOOL WINAPI IsThemePartDefined(HTHEME hTheme, int iPartId, int iStateId) SetLastError(E_HANDLE); return FALSE; } - if(MSSTYLES_FindPartState(hTheme, iPartId, iStateId, NULL)) - return TRUE; - return FALSE; + + SetLastError(NO_ERROR); + return !iStateId && MSSTYLES_FindPart(hTheme, iPartId); } /*********************************************************************** diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 40233bbe57d..b0124c14362 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -297,7 +297,6 @@ static void test_IsThemePartDefined(void) int state; BOOL defined; DWORD error; - BOOL todo; } tests[] = { @@ -308,7 +307,7 @@ static void test_IsThemePartDefined(void) {L"Button", BP_PUSHBUTTON, PBS_NORMAL, FALSE, NO_ERROR}, {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING, FALSE, NO_ERROR}, {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING + 1, FALSE, NO_ERROR}, - {L"Edit", EP_EDITTEXT, 0, TRUE, NO_ERROR, TRUE}, + {L"Edit", EP_EDITTEXT, 0, TRUE, NO_ERROR}, {L"Edit", EP_EDITTEXT, ETS_NORMAL, FALSE, NO_ERROR}, {L"Edit", EP_EDITTEXT, ETS_FOCUSED, FALSE, NO_ERROR}, }; @@ -334,9 +333,7 @@ static void test_IsThemePartDefined(void) SetLastError(0xdeadbeef); ret = IsThemePartDefined(theme, tests[i].part, tests[i].state); error = GetLastError(); - todo_wine_if(tests[i].todo) ok(ret == tests[i].defined, "Expected %d.\n", tests[i].defined); - todo_wine_if(error == 0xdeadbeef && tests[i].error == NO_ERROR) ok(error == tests[i].error, "Expected %#x, got %#x.\n", tests[i].error, error); if (theme) @@ -586,12 +583,8 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); bTPDefined = IsThemePartDefined(hTheme, 0 , 0); todo_wine - { - ok( bTPDefined == FALSE, "Expected FALSE\n"); - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); - } + ok( bTPDefined == FALSE, "Expected FALSE\n" ); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); DestroyWindow(hWnd); }

1 0

Francois Gouget : po: Fix an accelerator shortcut in the Norwegian Bokmål translation.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 55f6c5b97ef7dbfc9d9ef9cb5d68ec2ad7345388 URL: https://gitlab.winehq.org/wine/wine/-/commit/55f6c5b97ef7dbfc9d9ef9cb5d68ec… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 16:04:45 2022 +0100 po: Fix an accelerator shortcut in the Norwegian Bokmål translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3c0e25eb1ae8a516bdd4b4579e6bf8e939cf712c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- po/nb_NO.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 2786423410b..03ff7ad6a76 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -9253,7 +9253,7 @@ msgstr "&Blankt passord" #: dlls/oledb32/version.rc:84 msgid "Allow &saving password" -msgstr "Tillat lagring av pa%ssord" +msgstr "Tillat lagring av pa&ssord" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:"

1 0

Zhiyi Zhang : uxtheme/tests: Add IsThemePartDefined() tests.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 589af2859efa0aa673c21207829bc9f34313d5dc URL: https://gitlab.winehq.org/wine/wine/-/commit/589af2859efa0aa673c21207829bc9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 1 15:06:27 2022 +0800 uxtheme/tests: Add IsThemePartDefined() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6d1ad7d5e35ff526957e2ff6a98a062eab786610) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/uxtheme/tests/system.c | 75 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 68 insertions(+), 7 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 0385af663e3..40233bbe57d 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -274,20 +274,80 @@ static void test_IsThemed(void) { BOOL bThemeActive; BOOL bAppThemed; - BOOL bTPDefined; bThemeActive = IsThemeActive(); trace("Theming is %s\n", (bThemeActive) ? "active" : "inactive"); bAppThemed = IsAppThemed(); trace("Test executable is %s\n", (bAppThemed) ? "themed" : "not themed"); +} - SetLastError(0xdeadbeef); - bTPDefined = IsThemePartDefined(NULL, 0 , 0); - ok( bTPDefined == FALSE, "Expected FALSE\n"); - ok( GetLastError() == E_HANDLE, - "Expected E_HANDLE, got 0x%08x\n", - GetLastError()); +static void test_IsThemePartDefined(void) +{ + BOOL is_theme_active, ret; + HTHEME theme = NULL; + DWORD error; + HWND hwnd; + int i; + + static const struct + { + const WCHAR *class_name; + int part; + int state; + BOOL defined; + DWORD error; + BOOL todo; + } + tests[] = + { + {NULL, 0, 0, FALSE, E_HANDLE}, + {NULL, 0xdeadbeef, 0, FALSE, E_HANDLE}, + {L"Button", 0xdeadbeef, 0, FALSE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, 0, TRUE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, PBS_NORMAL, FALSE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING, FALSE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING + 1, FALSE, NO_ERROR}, + {L"Edit", EP_EDITTEXT, 0, TRUE, NO_ERROR, TRUE}, + {L"Edit", EP_EDITTEXT, ETS_NORMAL, FALSE, NO_ERROR}, + {L"Edit", EP_EDITTEXT, ETS_FOCUSED, FALSE, NO_ERROR}, + }; + + is_theme_active = IsThemeActive(); + hwnd = CreateWindowA(WC_STATICA, "", WS_POPUP, 0, 0, 1, 1, 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %#x.\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (!is_theme_active && tests[i].class_name) + continue; + + winetest_push_context("class %s part %d state %d", wine_dbgstr_w(tests[i].class_name), + tests[i].part, tests[i].state); + + if (tests[i].class_name) + { + theme = OpenThemeData(hwnd, tests[i].class_name); + ok(theme != NULL, "OpenThemeData failed, error %#x.\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + ret = IsThemePartDefined(theme, tests[i].part, tests[i].state); + error = GetLastError(); + todo_wine_if(tests[i].todo) + ok(ret == tests[i].defined, "Expected %d.\n", tests[i].defined); + todo_wine_if(error == 0xdeadbeef && tests[i].error == NO_ERROR) + ok(error == tests[i].error, "Expected %#x, got %#x.\n", tests[i].error, error); + + if (theme) + { + CloseThemeData(theme); + theme = NULL; + } + winetest_pop_context(); + } + + DestroyWindow(hwnd); } static void test_GetWindowTheme(void) @@ -1555,6 +1615,7 @@ START_TEST(system) */ test_IsThemed(); + test_IsThemePartDefined(); test_GetWindowTheme(); test_SetWindowTheme(); test_OpenThemeData();

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: stable Commit: 24e9b904011f4de2243ff20f86a48dddeb42bee5 URL: https://gitlab.winehq.org/wine/wine/-/commit/24e9b904011f4de2243ff20f86a48d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Mar 16 23:27:10 2022 -0600 po: Update Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6ecf25e9a8a94d8967809cb5031e6cf6d8b1e1bd) Conflicts: po/ca.po Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- po/ca.po | 648 ++++++++++++++++++++++++++------------------------------------- 1 file changed, 262 insertions(+), 386 deletions(-)

1 0