March 2022 - Wine-commits - list.winehq.org

Piotr Caban : msvcp110: Use _Condition_variable in _Cnd_t implementation.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: 3f97321c73320cd2cb05cd1b66e9134ff676e058 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f97321c73320cd2cb05cd1b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 15 14:36:56 2022 +0100 msvcp110: Use _Condition_variable in _Cnd_t implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 73 ++++++++++++----------------------------------- dlls/msvcp90/msvcp90.h | 18 ++++++++++++ dlls/msvcp90/msvcp_main.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f97321c73320cd2cb05…

1 0

Piotr Caban : msvcp140: Add SRWLock based _Mtx_t and _Cnd_t implementation.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: b8128f4162b5af7168ef7683543b96cd47d92748 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8128f4162b5af7168ef7683… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 15 14:37:01 2022 +0100 msvcp140: Add SRWLock based _Mtx_t and _Cnd_t implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 13 +++--- dlls/msvcp90/msvcp90.h | 37 +++++++++++------ dlls/msvcp90/msvcp_main.c | 101 +++++++++++++++++++++++++++++++++++----------- 3 files changed, 107 insertions(+), 44 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c7047f72164..103eca6f4a3 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -22,9 +22,6 @@ #include "msvcp90.h" -#include "windef.h" -#include "winbase.h" -#include "winternl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp); @@ -714,7 +711,7 @@ unsigned int __cdecl _Random_device(void) typedef struct { DWORD flags; - critical_section cs; + cs cs; DWORD thread_id; DWORD count; } *_Mtx_t; @@ -802,7 +799,7 @@ int __cdecl _Mtx_trylock(_Mtx_arg_t mtx) return 0; } -critical_section* __cdecl _Mtx_getconcrtcs(_Mtx_arg_t mtx) +void* __cdecl _Mtx_getconcrtcs(_Mtx_arg_t mtx) { return &MTX_T_FROM_ARG(mtx)->cs; } @@ -825,7 +822,7 @@ void __cdecl _Mtx_reset_owner(_Mtx_arg_t mtx) typedef struct { - _Condition_variable cv; + cv cv; } *_Cnd_t; #if _MSVCP_VER >= 140 @@ -852,7 +849,7 @@ int __cdecl _Cnd_init(_Cnd_t *cnd) int __cdecl _Cnd_wait(_Cnd_arg_t cnd, _Mtx_arg_t mtx) { - _Condition_variable *cv = &CND_T_FROM_ARG(cnd)->cv; + cv *cv = &CND_T_FROM_ARG(cnd)->cv; _Mtx_t m = MTX_T_FROM_ARG(mtx); _Mtx_clear_owner(mtx); @@ -863,7 +860,7 @@ int __cdecl _Cnd_wait(_Cnd_arg_t cnd, _Mtx_arg_t mtx) int __cdecl _Cnd_timedwait(_Cnd_arg_t cnd, _Mtx_arg_t mtx, const xtime *xt) { - _Condition_variable *cv = &CND_T_FROM_ARG(cnd)->cv; + cv *cv = &CND_T_FROM_ARG(cnd)->cv; _Mtx_t m = MTX_T_FROM_ARG(mtx); bool r; diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 49840affcf6..b996ae84a46 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -19,6 +19,7 @@ #include "stdbool.h" #include "stdlib.h" #include "windef.h" +#include "winbase.h" #include "cxx.h" #define CXX_EXCEPTION 0xe06d7363 @@ -58,6 +59,12 @@ typedef struct void *tail; } critical_section; +typedef union +{ + critical_section conc; + SRWLOCK win; +} cs; + typedef struct cv_queue { struct cv_queue *next; LONG expired; @@ -69,18 +76,24 @@ typedef struct { critical_section lock; } _Condition_variable; -extern void cs_init(critical_section*); -extern void cs_destroy(critical_section*); -extern void cs_lock(critical_section*); -extern void cs_unlock(critical_section*); -extern bool cs_trylock(critical_section*); - -extern void cv_init(_Condition_variable*); -extern void cv_destroy(_Condition_variable*); -extern void cv_wait(_Condition_variable*, critical_section*); -extern bool cv_wait_for(_Condition_variable*, critical_section*, unsigned int); -extern void cv_notify_one(_Condition_variable*); -extern void cv_notify_all(_Condition_variable*); +typedef union +{ + _Condition_variable conc; + CONDITION_VARIABLE win; +} cv; + +extern void cs_init(cs*); +extern void cs_destroy(cs*); +extern void cs_lock(cs*); +extern void cs_unlock(cs*); +extern bool cs_trylock(cs*); + +extern void cv_init(cv*); +extern void cv_destroy(cv*); +extern void cv_wait(cv*, cs*); +extern bool cv_wait_for(cv*, cs*, unsigned int); +extern void cv_notify_one(cv*); +extern void cv_notify_all(cv*); #endif #if _MSVCP_VER >= 100 diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index afaa461312e..4c9faec9e26 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -56,7 +56,7 @@ DEFINE_VTBL_WRAPPER(56); void* (__cdecl *MSVCRT_set_new_handler)(void*); -#if _MSVCP_VER >= 110 +#if _MSVCP_VER >= 110 && _MSVCP_VER <= 120 #ifdef __ASM_USE_THISCALL_WRAPPER extern void *call_thiscall_func; @@ -93,59 +93,112 @@ bool (__thiscall *_Condition_variable_wait_for)(_Condition_variable*, void (__thiscall *_Condition_variable_notify_one)(_Condition_variable*); void (__thiscall *_Condition_variable_notify_all)(_Condition_variable*); -void cs_init(critical_section *cs) +void cs_init(cs *cs) { - call_func1(critical_section_ctor, cs); + call_func1(critical_section_ctor, &cs->conc); } -void cs_destroy(critical_section *cs) +void cs_destroy(cs *cs) { - call_func1(critical_section_dtor, cs); + call_func1(critical_section_dtor, &cs->conc); } -void cs_lock(critical_section *cs) +void cs_lock(cs *cs) { - call_func1(critical_section_lock, cs); + call_func1(critical_section_lock, &cs->conc); } -void cs_unlock(critical_section *cs) +void cs_unlock(cs *cs) { - call_func1(critical_section_unlock, cs); + call_func1(critical_section_unlock, &cs->conc); } -bool cs_trylock(critical_section *cs) +bool cs_trylock(cs *cs) { - return call_func1(critical_section_trylock, cs); + return call_func1(critical_section_trylock, &cs->conc); } -void cv_init(_Condition_variable *cv) +void cv_init(cv *cv) { - call_func1(_Condition_variable_ctor, cv); + call_func1(_Condition_variable_ctor, &cv->conc); } -void cv_destroy(_Condition_variable *cv) +void cv_destroy(cv *cv) { - call_func1(_Condition_variable_dtor, cv); + call_func1(_Condition_variable_dtor, &cv->conc); } -void cv_wait(_Condition_variable *cv, critical_section *cs) +void cv_wait(cv *cv, cs *cs) { - call_func2(_Condition_variable_wait, cv, cs); + call_func2(_Condition_variable_wait, &cv->conc, &cs->conc); } -bool cv_wait_for(_Condition_variable *cv, critical_section *cs, unsigned int timeout) +bool cv_wait_for(cv *cv, cs *cs, unsigned int timeout) { - return call_func3(_Condition_variable_wait_for, cv, cs, timeout); + return call_func3(_Condition_variable_wait_for, &cv->conc, &cs->conc, timeout); } -void cv_notify_one(_Condition_variable *cv) +void cv_notify_one(cv *cv) { - call_func1(_Condition_variable_notify_one, cv); + call_func1(_Condition_variable_notify_one, &cv->conc); } -void cv_notify_all(_Condition_variable *cv) +void cv_notify_all(cv *cv) { - call_func1(_Condition_variable_notify_all, cv); + call_func1(_Condition_variable_notify_all, &cv->conc); +} +#elif _MSVCP_VER >= 140 +void cs_init(cs *cs) +{ + InitializeSRWLock(&cs->win); +} + +void cs_destroy(cs *cs) +{ +} + +void cs_lock(cs *cs) +{ + AcquireSRWLockExclusive(&cs->win); +} + +void cs_unlock(cs *cs) +{ + ReleaseSRWLockExclusive(&cs->win); +} + +bool cs_trylock(cs *cs) +{ + return TryAcquireSRWLockExclusive(&cs->win); +} + +void cv_init(cv *cv) +{ + InitializeConditionVariable(&cv->win); +} + +void cv_destroy(cv *cv) +{ +} + +void cv_wait(cv *cv, cs *cs) +{ + SleepConditionVariableSRW(&cv->win, &cs->win, INFINITE, 0); +} + +bool cv_wait_for(cv *cv, cs *cs, unsigned int timeout) +{ + return SleepConditionVariableSRW(&cv->win, &cs->win, timeout, 0); +} + +void cv_notify_one(cv *cv) +{ + WakeConditionVariable(&cv->win); +} + +void cv_notify_all(cv *cv) +{ + WakeAllConditionVariable(&cv->win); } #endif @@ -240,7 +293,7 @@ static void init_cxx_funcs(void) } #endif -#if _MSVCP_VER >= 110 +#if _MSVCP_VER >= 110 && _MSVCP_VER <= 120 if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ { critical_section_ctor = (void*)GetProcAddress(hcon, "??0critical_section(a)Concurrency@@QEAA(a)XZ");

1 0

Piotr Caban : msvcp140: Add condition variable tests.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: e3d02807fc7be6351fc80aa814d21b86e4e0236d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3d02807fc7be6351fc80aa8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 15 14:37:14 2022 +0100 msvcp140: Add condition variable tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 191 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index b24c5e0f53d..14ba4a767d0 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -142,6 +142,45 @@ typedef struct { void *arg; } _Threadpool_chore; +typedef struct +{ + HANDLE hnd; + DWORD id; +} _Thrd_t; + +typedef struct cs_queue +{ + struct cs_queue *next; + BOOL free; + int unknown; +} cs_queue; + +typedef struct +{ + ULONG_PTR unk_thread_id; + cs_queue unk_active; + void *unknown[2]; + cs_queue *head; + void *tail; +} critical_section; + +typedef struct +{ + DWORD flags; + critical_section cs; + DWORD thread_id; + DWORD count; +} *_Mtx_t; + +typedef void *_Cnd_t; + +typedef struct { + __time64_t sec; + int nsec; +} xtime; + +typedef int (__cdecl *_Thrd_start_t)(void*); + enum file_type { file_not_found = -1, none_file, @@ -172,6 +211,20 @@ static void (__thiscall *p__TaskEventLogger__LogWorkItemStarted)(_TaskEventLogge static int (__cdecl *p__Schedule_chore)(_Threadpool_chore*); static int (__cdecl *p__Reschedule_chore)(const _Threadpool_chore*); static void (__cdecl *p__Release_chore)(_Threadpool_chore*); +static int (__cdecl *p__Mtx_init)(_Mtx_t*, int); +static void (__cdecl *p__Mtx_destroy)(_Mtx_t); +static int (__cdecl *p__Mtx_lock)(_Mtx_t); +static int (__cdecl *p__Mtx_unlock)(_Mtx_t); +static int (__cdecl *p__Cnd_init)(_Cnd_t*); +static void (__cdecl *p__Cnd_destroy)(_Cnd_t); +static int (__cdecl *p__Cnd_wait)(_Cnd_t, _Mtx_t); +static int (__cdecl *p__Cnd_timedwait)(_Cnd_t, _Mtx_t, const xtime*); +static int (__cdecl *p__Cnd_broadcast)(_Cnd_t); +static int (__cdecl *p__Cnd_signal)(_Cnd_t); +static int (__cdecl *p__Thrd_create)(_Thrd_t*, _Thrd_start_t, void*); +static int (__cdecl *p__Thrd_join)(_Thrd_t, int*); +static int (__cdecl *p__Xtime_diff_to_millis2)(const xtime*, const xtime*); +static int (__cdecl *p_xtime_get)(xtime*, int); static void (__cdecl *p_Close_dir)(void*); static MSVCP_bool (__cdecl *p_Current_get)(WCHAR *); @@ -269,6 +322,21 @@ static BOOL init(void) SET(p__Syserror_map, "?_Syserror_map(a)std@@YAPBDH(a)Z"); } + SET(p__Mtx_init, "_Mtx_init"); + SET(p__Mtx_destroy, "_Mtx_destroy"); + SET(p__Mtx_lock, "_Mtx_lock"); + SET(p__Mtx_unlock, "_Mtx_unlock"); + SET(p__Cnd_init, "_Cnd_init"); + SET(p__Cnd_destroy, "_Cnd_destroy"); + SET(p__Cnd_wait, "_Cnd_wait"); + SET(p__Cnd_timedwait, "_Cnd_timedwait"); + SET(p__Cnd_broadcast, "_Cnd_broadcast"); + SET(p__Cnd_signal, "_Cnd_signal"); + SET(p__Thrd_create, "_Thrd_create"); + SET(p__Thrd_join, "_Thrd_join"); + SET(p__Xtime_diff_to_millis2, "_Xtime_diff_to_millis2"); + SET(p_xtime_get, "xtime_get"); + SET(p_Close_dir, "_Close_dir"); SET(p_Current_get, "_Current_get"); SET(p_Current_set, "_Current_set"); @@ -1385,6 +1453,128 @@ static void test_Equivalent(void) ok(SetCurrentDirectoryW(current_path), "SetCurrentDirectoryW failed\n"); } +#define NUM_THREADS 10 +#define TIMEDELTA 250 /* 250 ms uncertainty allowed */ +struct cndmtx +{ + HANDLE initialized; + LONG started; + int thread_no; + + _Cnd_t cnd; + _Mtx_t mtx; + BOOL timed_wait; +}; + +static int __cdecl cnd_wait_thread(void *arg) +{ + struct cndmtx *cm = arg; + int r; + + p__Mtx_lock(cm->mtx); + + if(InterlockedIncrement(&cm->started) == cm->thread_no) + SetEvent(cm->initialized); + + if(cm->timed_wait) { + xtime xt; + + p_xtime_get(&xt, 1); + xt.sec += 2; + r = p__Cnd_timedwait(cm->cnd, cm->mtx, &xt); + ok(!r, "timed wait failed\n"); + } else { + r = p__Cnd_wait(cm->cnd, cm->mtx); + ok(!r, "wait failed\n"); + } + + p__Mtx_unlock(cm->mtx); + return 0; +} + +static void test_cnd(void) +{ + _Thrd_t threads[NUM_THREADS]; + xtime xt, before, after; + struct cndmtx cm; + int r, i, diff; + _Cnd_t cnd; + _Mtx_t mtx; + + r = p__Cnd_init(&cnd); + ok(!r, "failed to init cnd\n"); + + r = p__Mtx_init(&mtx, 0); + ok(!r, "failed to init mtx\n"); + + p__Cnd_destroy(NULL); + + /* test _Cnd_signal/_Cnd_wait */ + cm.initialized = CreateEventW(NULL, FALSE, FALSE, NULL); + cm.started = 0; + cm.thread_no = 1; + cm.cnd = cnd; + cm.mtx = mtx; + cm.timed_wait = FALSE; + p__Thrd_create(&threads[0], cnd_wait_thread, (void*)&cm); + + WaitForSingleObject(cm.initialized, INFINITE); + p__Mtx_lock(mtx); + p__Mtx_unlock(mtx); + + r = p__Cnd_signal(cm.cnd); + ok(!r, "failed to signal\n"); + p__Thrd_join(threads[0], NULL); + + /* test _Cnd_timedwait time out */ + p__Mtx_lock(mtx); + p_xtime_get(&before, 1); + xt = before; + xt.sec += 1; + /* try to avoid failures on spurious wakeup */ + p__Cnd_timedwait(cnd, mtx, &xt); + r = p__Cnd_timedwait(cnd, mtx, &xt); + p_xtime_get(&after, 1); + p__Mtx_unlock(mtx); + + diff = p__Xtime_diff_to_millis2(&after, &before); + ok(r == 2, "should have timed out\n"); + ok(diff > 1000 - TIMEDELTA, "got %d\n", diff); + + /* test _Cnd_timedwait */ + cm.started = 0; + cm.timed_wait = TRUE; + p__Thrd_create(&threads[0], cnd_wait_thread, (void*)&cm); + + WaitForSingleObject(cm.initialized, INFINITE); + p__Mtx_lock(mtx); + p__Mtx_unlock(mtx); + + r = p__Cnd_signal(cm.cnd); + ok(!r, "failed to signal\n"); + p__Thrd_join(threads[0], NULL); + + /* test _Cnd_broadcast */ + cm.started = 0; + cm.thread_no = NUM_THREADS; + + for(i = 0; i < cm.thread_no; i++) + p__Thrd_create(&threads[i], cnd_wait_thread, (void*)&cm); + + WaitForSingleObject(cm.initialized, INFINITE); + p__Mtx_lock(mtx); + p__Mtx_unlock(mtx); + + r = p__Cnd_broadcast(cnd); + ok(!r, "failed to broadcast\n"); + for(i = 0; i < cm.thread_no; i++) + p__Thrd_join(threads[i], NULL); + + p__Cnd_destroy(cnd); + p__Mtx_destroy(mtx); + CloseHandle(cm.initialized); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1410,5 +1600,6 @@ START_TEST(msvcp140) test__Winerror_map(); test__Syserror_map(); test_Equivalent(); + test_cnd(); FreeLibrary(msvcp); }

1 0

Francois Gouget : kernelbase: Add a trailing linefeed to a couple of FIXME() messages.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: 082c647e688b2baa34ed9e34c38231691c21ef26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=082c647e688b2baa34ed9e34… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:53:48 2022 +0100 kernelbase: Add a trailing linefeed to a couple of FIXME() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index d59f20adb6e..410d87ce620 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -2433,7 +2433,7 @@ HRESULT WINAPI PathMatchSpecExA(const char *path, const char *mask, DWORD flags) TRACE("%s, %s\n", wine_dbgstr_a(path), wine_dbgstr_a(mask)); if (flags) - FIXME("Ignoring flags %#lx.", flags); + FIXME("Ignoring flags %#lx.\n", flags); if (!lstrcmpA(mask, "*.*")) return S_OK; /* Matches every path */ @@ -2488,7 +2488,7 @@ HRESULT WINAPI PathMatchSpecExW(const WCHAR *path, const WCHAR *mask, DWORD flag TRACE("%s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(mask)); if (flags) - FIXME("Ignoring flags %#lx.", flags); + FIXME("Ignoring flags %#lx.\n", flags); if (!lstrcmpW(mask, L"*.*")) return S_OK; /* Matches every path */

1 0

Francois Gouget : po: Fix the French translation of 'code page'.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: 80845f8f5f8272cdb62c4eb50988d5e1f9b34f13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80845f8f5f8272cdb62c4eb5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:54:39 2022 +0100 po: Fix the French translation of 'code page'. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/fr.po b/po/fr.po index 113557f8c54..8fd4c4d7383 100644 --- a/po/fr.po +++ b/po/fr.po @@ -14198,11 +14198,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "Code de pages actif : %1!u!\n" +msgstr "Page de code active : %1!u!\n" #: programs/chcp.com/chcp.rc:29 msgid "Invalid code page\n" -msgstr "Code de pages invalide.\n" +msgstr "Page de code invalide\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -14217,12 +14217,12 @@ msgid "" msgstr "" "CHCP [nombre]\n" "\n" -" Modifie ou affiche le code de pages de la console actif.\n" +" Modifie ou affiche la page de code de la console active.\n" "\n" -" nombre Le code de pages de la console à activer.\n" +" nombre La page de code de la console à activer.\n" "\n" -" Lancer CHCP sans nombre en paramètre pour afficher le code de pages actif " -"de la console.\n" +" Lancer CHCP sans nombre en paramètre pour afficher la page de code de la " +"console active.\n" "\n" #: programs/clock/clock.rc:32

1 0

Francois Gouget : po: Fix backslash duplication in a French translation.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: a1a94dfd81418cefa28da6da0fc3b6c44c2a530a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1a94dfd81418cefa28da6da… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:55:01 2022 +0100 po: Fix backslash duplication in a French translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 8fd4c4d7383..75d71722af3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -17000,7 +17000,7 @@ msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" msgstr "" -"La valeur de registre « %1\\\\%2 » existe déjà. Voulez-vous la remplacer ?" +"La valeur de registre « %1\\%2 » existe déjà. Voulez-vous la remplacer ?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?"

1 0

Francois Gouget : po: Remove a space before a linefeed in the French translation.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: 8be5ec578a859df5e04eb957b3773a10ceda961d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8be5ec578a859df5e04eb957… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:55:40 2022 +0100 po: Remove a space before a linefeed in the French translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 75d71722af3..2213354b320 100644 --- a/po/fr.po +++ b/po/fr.po @@ -16854,7 +16854,7 @@ msgstr "" "REG IMPORT <fichier>\n" "\n" " Importe des clés et leurs valeurs à partir d'un fichier vers le registre.\n" -" \n" +"\n" " <fichier>\n" " Le chemin d'accès et le nom du fichier à importer.\n" "\n"

1 0

Francois Gouget : po: Remove spaces before linefeeds in the Spanish translation.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: c390852e3f46c567b3ac8f57ed80922a61d7c840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c390852e3f46c567b3ac8f57… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:56:31 2022 +0100 po: Remove spaces before linefeeds in the Spanish translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 246a27e23c4..e53677f3f75 100644 --- a/po/es.po +++ b/po/es.po @@ -17370,7 +17370,7 @@ msgid "" msgstr "" "Utilidad de registro de DLL de Wine\n" "\n" -"Proporciona servicios de registro de DLL. \n" +"Proporciona servicios de registro de DLL.\n" "\n" #: programs/regsvr32/regsvr32.rc:41 @@ -17392,7 +17392,7 @@ msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" -"regsvr32: cambio no válido o no reconocido [%1] \n" +"regsvr32: cambio no válido o no reconocido [%1]\n" "\n" #: programs/regsvr32/regsvr32.rc:43

1 0

Francois Gouget : po: Remove a space before a linefeed in the Chinese translation.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: 1f9a15688726adead1b2f5e8fa6b9045c629b21c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f9a15688726adead1b2f5e8… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:57:00 2022 +0100 po: Remove a space before a linefeed in the Chinese translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index fa9a8e469f0..f8927aa19e9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -13940,7 +13940,7 @@ msgstr "" "\n" "语法: MKLINK [options] link_name target\n" "\n" -"选项: \n" +"选项:\n" "/d 创建目录符号链接。\n" "/h 创建硬链接。\n" "/j 创建目录结。\n"

1 0

Rémi Bernon : winegstreamer: Implement H264 decoder SetOutputType.
by Alexandre Julliard 15 Mar '22

15 Mar '22

Module: wine Branch: master Commit: f71c51cb19fd694ad9e169ecc37767a93bbe40aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=f71c51cb19fd694ad9e169ec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 12:09:08 2022 +0100 winegstreamer: Implement H264 decoder SetOutputType. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 3 --- dlls/winegstreamer/h264_decoder.c | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2f855b5d9ca..feee38a5231 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6685,7 +6685,6 @@ static void test_h264_decoder(void) ok(hr == S_OK, "MFCreateMediaType returned %#lx\n", hr); init_media_type(media_type, default_outputs[0], -1); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "SetOutputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); @@ -6806,10 +6805,8 @@ static void test_h264_decoder(void) init_media_type(media_type, output_type_desc_win7, ARRAY_SIZE(output_type_desc_win7) - 1); hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); } - todo_wine ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); - todo_wine ok(ret == 1, "Release returned %lu\n", ret); flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index c587b6d185e..2f4b42ed101 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -47,6 +47,7 @@ struct h264_decoder IMFTransform IMFTransform_iface; LONG refcount; IMFMediaType *input_type; + IMFMediaType *output_type; }; static struct h264_decoder *impl_from_IMFTransform(IMFTransform *iface) @@ -184,6 +185,8 @@ static ULONG WINAPI transform_Release(IMFTransform *iface) { if (decoder->input_type) IMFMediaType_Release(decoder->input_type); + if (decoder->output_type) + IMFMediaType_Release(decoder->output_type); free(decoder); } @@ -340,6 +343,12 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM if (i == ARRAY_SIZE(h264_decoder_input_types)) return MF_E_INVALIDMEDIATYPE; + if (decoder->output_type) + { + IMFMediaType_Release(decoder->output_type); + decoder->output_type = NULL; + } + if (decoder->input_type) IMFMediaType_Release(decoder->input_type); IMFMediaType_AddRef((decoder->input_type = type)); @@ -349,8 +358,34 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - FIXME("iface %p, id %#lx, type %p, flags %#lx stub!\n", iface, id, type, flags); - return E_NOTIMPL; + struct h264_decoder *decoder = impl_from_IMFTransform(iface); + GUID major, subtype; + HRESULT hr; + ULONG i; + + TRACE("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags); + + if (!decoder->input_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) || + FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) + return hr; + + if (!IsEqualGUID(&major, &MFMediaType_Video)) + return MF_E_INVALIDMEDIATYPE; + + for (i = 0; i < ARRAY_SIZE(h264_decoder_output_types); ++i) + if (IsEqualGUID(&subtype, h264_decoder_output_types[i])) + break; + if (i == ARRAY_SIZE(h264_decoder_output_types)) + return MF_E_INVALIDMEDIATYPE; + + if (decoder->output_type) + IMFMediaType_Release(decoder->output_type); + IMFMediaType_AddRef((decoder->output_type = type)); + + return S_OK; } static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)

1 0