wine-commits August 2023

wine-commits@winehq.org

1 participants
667 discussions

Zebediah Figura : vkd3d-shader: Introduce struct vkd3d_shader_scan_descriptor_info1.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: vkd3d Branch: master Commit: 4e9798f6f703fc50683156b03cb957e54f398a4f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4e9798f6f703fc50683156b03cb95… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 18:52:21 2023 -0500 vkd3d-shader: Introduce struct vkd3d_shader_scan_descriptor_info1. --- libs/vkd3d-shader/spirv.c | 18 +++---- libs/vkd3d-shader/vkd3d_shader_main.c | 90 ++++++++++++++++++++++++-------- libs/vkd3d-shader/vkd3d_shader_private.h | 19 ++++++- 3 files changed, 95 insertions(+), 32 deletions(-)

1 0

Zebediah Figura : vkd3d-shader: Centralize cleanup on error in scan_with_parser().
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: vkd3d Branch: master Commit: fd4a820c4be13ce75e29496aba67332005576906 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fd4a820c4be13ce75e29496aba673… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 18:36:30 2023 -0500 vkd3d-shader: Centralize cleanup on error in scan_with_parser(). --- libs/vkd3d-shader/vkd3d_shader_main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 4d45e1e2..569409cc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1132,11 +1132,7 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info { instruction = &parser->instructions.elements[i]; if ((ret = vkd3d_shader_scan_instruction(&context, instruction)) < 0) - { - if (scan_descriptor_info) - vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); break; - } } for (i = 0; i < ARRAY_SIZE(parser->shader_desc.flat_constant_count); ++i) @@ -1156,13 +1152,17 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info || !vkd3d_shader_signature_from_shader_signature(&signature_info->patch_constant, &parser->shader_desc.patch_constant_signature)) { - vkd3d_shader_free_scan_signature_info(signature_info); - if (scan_descriptor_info) - vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); ret = VKD3D_ERROR_OUT_OF_MEMORY; } } + if (ret < 0) + { + if (scan_descriptor_info) + vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); + if (signature_info) + vkd3d_shader_free_scan_signature_info(signature_info); + } vkd3d_shader_scan_context_cleanup(&context); return ret; }

1 0

Zebediah Figura : vkd3d-shader: Factor more code into vkd3d_shader_scan_get_uav_descriptor_info().
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: vkd3d Branch: master Commit: 9c5cb2de189e837d2a73c5763c903135b507f09c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9c5cb2de189e837d2a73c5763c903… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 17:59:09 2023 -0500 vkd3d-shader: Factor more code into vkd3d_shader_scan_get_uav_descriptor_info(). --- libs/vkd3d-shader/vkd3d_shader_main.c | 39 ++++++++++++----------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e6ffb84d..4d45e1e2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -703,18 +703,23 @@ static struct vkd3d_shader_cf_info *vkd3d_shader_scan_find_innermost_loop_cf_inf return NULL; } -static struct vkd3d_shader_descriptor_info *vkd3d_shader_scan_get_uav_descriptor_info( - const struct vkd3d_shader_scan_context *context, unsigned int range_id) +static void vkd3d_shader_scan_add_uav_flag(const struct vkd3d_shader_scan_context *context, + const struct vkd3d_shader_register *reg, uint32_t flag) { + unsigned int range_id = reg->idx[0].offset; unsigned int i; + if (!context->scan_descriptor_info) + return; + for (i = 0; i < context->uav_range_count; ++i) { if (context->uav_ranges[i].id == range_id) - return &context->scan_descriptor_info->descriptors[context->uav_ranges[i].descriptor_idx]; + { + context->scan_descriptor_info->descriptors[context->uav_ranges[i].descriptor_idx].flags |= flag; + break; + } } - - return NULL; } static bool vkd3d_shader_instruction_is_uav_read(const struct vkd3d_shader_instruction *instruction) @@ -730,13 +735,7 @@ static bool vkd3d_shader_instruction_is_uav_read(const struct vkd3d_shader_instr static void vkd3d_shader_scan_record_uav_read(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_register *reg) { - struct vkd3d_shader_descriptor_info *d; - - if (!context->scan_descriptor_info) - return; - - d = vkd3d_shader_scan_get_uav_descriptor_info(context, reg->idx[0].offset); - d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ; + vkd3d_shader_scan_add_uav_flag(context, reg, VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ); } static bool vkd3d_shader_instruction_is_uav_counter(const struct vkd3d_shader_instruction *instruction) @@ -749,13 +748,7 @@ static bool vkd3d_shader_instruction_is_uav_counter(const struct vkd3d_shader_in static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_register *reg) { - struct vkd3d_shader_descriptor_info *d; - - if (!context->scan_descriptor_info) - return; - - d = vkd3d_shader_scan_get_uav_descriptor_info(context, reg->idx[0].offset); - d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER; + vkd3d_shader_scan_add_uav_flag(context, reg, VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER); } static bool vkd3d_shader_instruction_is_uav_atomic_op(const struct vkd3d_shader_instruction *instruction) @@ -768,13 +761,7 @@ static bool vkd3d_shader_instruction_is_uav_atomic_op(const struct vkd3d_shader_ static void vkd3d_shader_scan_record_uav_atomic_op(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_register *reg) { - struct vkd3d_shader_descriptor_info *d; - - if (!context->scan_descriptor_info) - return; - - d = vkd3d_shader_scan_get_uav_descriptor_info(context, reg->idx[0].offset); - d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_ATOMICS; + vkd3d_shader_scan_add_uav_flag(context, reg, VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_ATOMICS); } static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *context,

1 0

Alistair Leslie-Hughes : setupapi: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: f54646d7a91219008f5b3e2d7b6e6efad37509ec URL: https://gitlab.winehq.org/wine/wine/-/commit/f54646d7a91219008f5b3e2d7b6e6e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 29 18:17:03 2023 +1000 setupapi: Remove DECLSPEC_HIDDEN usage. --- dlls/setupapi/setupapi_private.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index df218314d6e..9d3d19c84c0 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -45,7 +45,7 @@ #define PNF_HEADER L"Wine PNF header\n" -extern HINSTANCE SETUPAPI_hInstance DECLSPEC_HIDDEN; +extern HINSTANCE SETUPAPI_hInstance; static inline char *strdupWtoA( const WCHAR *str ) { @@ -82,9 +82,9 @@ char * WINAPI UnicodeToMultiByte( const WCHAR *str, UINT code_page ) __WINE_DEA /* string substitutions */ struct inf_file; -extern const WCHAR *DIRID_get_string( int dirid ) DECLSPEC_HIDDEN; -extern const WCHAR *PARSER_get_inf_filename( HINF hinf ) DECLSPEC_HIDDEN; -extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context ) DECLSPEC_HIDDEN; +extern const WCHAR *DIRID_get_string( int dirid ); +extern const WCHAR *PARSER_get_inf_filename( HINF hinf ); +extern WCHAR *PARSER_get_dest_dir( INFCONTEXT *context ); /* support for ANSI queue callback functions */ @@ -94,11 +94,11 @@ struct callback_WtoA_context PSP_FILE_CALLBACK_A orig_handler; }; -UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, UINT_PTR, UINT_PTR ) DECLSPEC_HIDDEN; +UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, UINT_PTR, UINT_PTR ); -extern OSVERSIONINFOW OsVersionInfo DECLSPEC_HIDDEN; +extern OSVERSIONINFOW OsVersionInfo; -extern BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) DECLSPEC_HIDDEN; -extern void cleanup_fake_dlls(void) DECLSPEC_HIDDEN; +extern BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ); +extern void cleanup_fake_dlls(void); #endif /* __SETUPAPI_PRIVATE_H */

1 0

Alistair Leslie-Hughes : wmp: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 90081ca8432d1bc3a11c6043d1c4f7be46fcb402 URL: https://gitlab.winehq.org/wine/wine/-/commit/90081ca8432d1bc3a11c6043d1c4f7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 29 18:17:03 2023 +1000 wmp: Remove DECLSPEC_HIDDEN usage. --- dlls/wmp/wmp_private.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index ffeaca09a47..b5e580d91ca 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -36,7 +36,7 @@ TID_LIST LAST_tid } typeinfo_id; -HRESULT get_typeinfo(typeinfo_id tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; +HRESULT get_typeinfo(typeinfo_id tid, ITypeInfo **typeinfo); typedef struct { IConnectionPoint IConnectionPoint_iface; @@ -111,22 +111,22 @@ struct WindowsMediaPlayer { HWND msg_window; }; -BOOL init_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; -void destroy_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; -WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) DECLSPEC_HIDDEN; -WMPPlaylist *unsafe_impl_from_IWMPPlaylist(IWMPPlaylist *iface) DECLSPEC_HIDDEN; -HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) DECLSPEC_HIDDEN; -HRESULT create_playlist(BSTR name, BSTR url, LONG count, IWMPPlaylist **ppPlaylist) DECLSPEC_HIDDEN; -void ConnectionPointContainer_Init(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; -void ConnectionPointContainer_Destroy(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; -void call_sink(ConnectionPoint *This, DISPID dispid, DISPPARAMS *dispparams) DECLSPEC_HIDDEN; +BOOL init_player(WindowsMediaPlayer*); +void destroy_player(WindowsMediaPlayer*); +WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface); +WMPPlaylist *unsafe_impl_from_IWMPPlaylist(IWMPPlaylist *iface); +HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia); +HRESULT create_playlist(BSTR name, BSTR url, LONG count, IWMPPlaylist **ppPlaylist); +void ConnectionPointContainer_Init(WindowsMediaPlayer *wmp); +void ConnectionPointContainer_Destroy(WindowsMediaPlayer *wmp); +void call_sink(ConnectionPoint *This, DISPID dispid, DISPPARAMS *dispparams); -HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); -void unregister_wmp_class(void) DECLSPEC_HIDDEN; -void unregister_player_msg_class(void) DECLSPEC_HIDDEN; +void unregister_wmp_class(void); +void unregister_player_msg_class(void); -extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; +extern HINSTANCE wmp_instance; static inline HRESULT return_bstr(const WCHAR *value, BSTR *p) {

1 0

Ilia Docin : sane.ds: Use BGR order to store 24 bit color DIB pixels.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: b8c38f418699bf71896de5f5cbbd6dd07082b390 URL: https://gitlab.winehq.org/wine/wine/-/commit/b8c38f418699bf71896de5f5cbbd6d… Author: Ilia Docin <ilya.docin(a)contentai.ru> Date: Sun Aug 6 14:25:23 2023 +0300 sane.ds: Use BGR order to store 24 bit color DIB pixels. --- dlls/sane.ds/ds_image.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/ds_image.c b/dlls/sane.ds/ds_image.c index 93193abc69f..2c52184a056 100644 --- a/dlls/sane.ds/ds_image.c +++ b/dlls/sane.ds/ds_image.c @@ -301,10 +301,11 @@ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, BITMAPINFOHEADER *header = NULL; int dib_bytes; int dib_bytes_per_line; - BYTE *line; + BYTE *line, color_buffer; RGBQUAD *colors; + RGBTRIPLE *pixels; int color_size = 0; - int i; + int i, j; BYTE *p; TRACE("DG_IMAGE/DAT_IMAGENATIVEXFER/MSG_GET\n"); @@ -425,6 +426,17 @@ TW_UINT16 SANE_ImageNativeXferGet (pTW_IDENTITY pOrigin, twRC = SANE_CALL( read_data, &params ); if (twRC != TWCC_SUCCESS) break; if (retlen < activeDS.frame_params.bytes_per_line) break; + /* TWAIN: for 24 bit color DIBs, the pixels are stored in BGR order */ + if (activeDS.frame_params.format == FMT_RGB && activeDS.frame_params.depth == 8) + { + pixels = (RGBTRIPLE *) line; + for (j = 0; j < activeDS.frame_params.pixels_per_line; ++j) + { + color_buffer = pixels[j].rgbtRed; + pixels[j].rgbtRed = pixels[j].rgbtBlue; + pixels[j].rgbtBlue = color_buffer; + } + } line -= dib_bytes_per_line; } activeDS.progressWnd = ScanningDialogBox(activeDS.progressWnd, -1);

1 0

Zhiyi Zhang : mfmediaengine: Implement media_engine_GetSeekable().
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 5daa21f9618765c2dd588ee1cd6593b3752444f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/5daa21f9618765c2dd588ee1cd6593… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 10 11:30:42 2023 +0800 mfmediaengine: Implement media_engine_GetSeekable(). --- dlls/mfmediaengine/main.c | 22 ++++++++++++-- dlls/mfmediaengine/tests/mfmediaengine.c | 51 ++++++++++++-------------------- 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 2ef1cb8413a..1395eb9bffc 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1899,17 +1899,35 @@ static HRESULT WINAPI media_engine_GetPlayed(IMFMediaEngineEx *iface, IMFMediaTi static HRESULT WINAPI media_engine_GetSeekable(IMFMediaEngineEx *iface, IMFMediaTimeRange **seekable) { struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); - HRESULT hr = E_NOTIMPL; + IMFMediaTimeRange *time_range = NULL; + DWORD flags; + HRESULT hr; - FIXME("(%p, %p): stub.\n", iface, seekable); + TRACE("%p, %p.\n", iface, seekable); EnterCriticalSection(&engine->cs); if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) hr = MF_E_SHUTDOWN; + else + { + hr = create_time_range(&time_range); + if (SUCCEEDED(hr) && !isnan(engine->duration) && engine->presentation.source) + { + hr = IMFMediaSource_GetCharacteristics(engine->presentation.source, &flags); + if (SUCCEEDED(hr) && (flags & MFBYTESTREAM_IS_SEEKABLE)) + hr = IMFMediaTimeRange_AddRange(time_range, 0.0, engine->duration); + } + } LeaveCriticalSection(&engine->cs); + if (FAILED(hr) && time_range) + { + IMFMediaTimeRange_Release(time_range); + time_range = NULL; + } + *seekable = time_range; return hr; } diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 815f637d1cb..318684dc4f9 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -2285,15 +2285,11 @@ static void test_GetSeekable(void) /* Media engine is not ready */ hr = IMFMediaEngineEx_GetSeekable(media_engine, &time_range); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - { - count = IMFMediaTimeRange_GetLength(time_range); - ok(!count, "Unexpected count %lu.\n", count); - refcount = IMFMediaTimeRange_Release(time_range); - ok(!refcount, "Got unexpected refcount %lu.\n", refcount); - } + count = IMFMediaTimeRange_GetLength(time_range); + ok(!count, "Unexpected count %lu.\n", count); + refcount = IMFMediaTimeRange_Release(time_range); + ok(!refcount, "Got unexpected refcount %lu.\n", refcount); hr = IMFMediaEngineEx_Play(media_engine); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -2307,22 +2303,18 @@ static void test_GetSeekable(void) /* Media engine is ready */ hr = IMFMediaEngineEx_GetSeekable(media_engine, &time_range); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - { - count = IMFMediaTimeRange_GetLength(time_range); - ok(count == 1, "Unexpected count %lu.\n", count); - hr = IMFMediaTimeRange_GetStart(time_range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(start == 0, "Unexpected start %lf.\n", start); - hr = IMFMediaTimeRange_GetEnd(time_range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - duration = IMFMediaEngineEx_GetDuration(media_engine); - ok(end == duration, "Unexpected end %lf.\n", end); - refcount = IMFMediaTimeRange_Release(time_range); - ok(!refcount, "Got unexpected refcount %lu.\n", refcount); - } + count = IMFMediaTimeRange_GetLength(time_range); + ok(count == 1, "Unexpected count %lu.\n", count); + hr = IMFMediaTimeRange_GetStart(time_range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(start == 0, "Unexpected start %lf.\n", start); + hr = IMFMediaTimeRange_GetEnd(time_range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + duration = IMFMediaEngineEx_GetDuration(media_engine); + ok(end == duration, "Unexpected end %lf.\n", end); + refcount = IMFMediaTimeRange_Release(time_range); + ok(!refcount, "Got unexpected refcount %lu.\n", refcount); /* Media engine is shut down */ hr = IMFMediaEngineEx_Shutdown(media_engine); @@ -2331,7 +2323,6 @@ static void test_GetSeekable(void) time_range = (IMFMediaTimeRange *)0xdeadbeef; hr = IMFMediaEngineEx_GetSeekable(media_engine, &time_range); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); - todo_wine ok(time_range == NULL || broken(time_range == (IMFMediaTimeRange *)0xdeadbeef) /* <= Win10 1507 */, "Got unexpected pointer.\n"); @@ -2357,15 +2348,11 @@ static void test_GetSeekable(void) ok(res == S_OK, "Unexpected res %#lx.\n", res); hr = IMFMediaEngineEx_GetSeekable(media_engine, &time_range); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - { - count = IMFMediaTimeRange_GetLength(time_range); - ok(!count, "Unexpected count %lu.\n", count); - refcount = IMFMediaTimeRange_Release(time_range); - ok(!refcount, "Got unexpected refcount %lu.\n", refcount); - } + count = IMFMediaTimeRange_GetLength(time_range); + ok(!count, "Unexpected count %lu.\n", count); + refcount = IMFMediaTimeRange_Release(time_range); + ok(!refcount, "Got unexpected refcount %lu.\n", refcount); done: hr = IMFMediaEngineEx_Shutdown(media_engine);

1 0

Zhiyi Zhang : mfmediaengine/tests: Test IMFMediaEngine::GetSeekable().
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 4f0a7cd89ad8b50dc953c18dad3dfe9989282ee4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f0a7cd89ad8b50dc953c18dad3dfe… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 25 17:20:12 2023 +0800 mfmediaengine/tests: Test IMFMediaEngine::GetSeekable(). --- dlls/mfmediaengine/tests/mfmediaengine.c | 407 +++++++++++++++++++++++++++++++ 1 file changed, 407 insertions(+)

1 0

Zhiyi Zhang : mfmediaengine/tests: Fix a test failure in test_GetDuration().
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 3893db0a2028e2c3d512ab0c651ce7d9f727e6d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/3893db0a2028e2c3d512ab0c651ce7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 9 11:38:59 2023 +0800 mfmediaengine/tests: Fix a test failure in test_GetDuration(). d19af88f59dbd6a7372adf64c2a0410fd8f85a1c happens to change test_transfer_notify_EventNotify() and that affects test_GetDuration(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55422 --- dlls/mfmediaengine/tests/mfmediaengine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 7ddc1fa0679..9490670cdf9 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -1957,7 +1957,7 @@ static void test_GetDuration(void) url = SysAllocString(L"i420-64x64.avi"); hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine, stream, url); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - res = WaitForSingleObject(notify->ready_event, 5000); + res = WaitForSingleObject(notify->frame_ready_event, 5000); ok(!res, "Unexpected res %#lx.\n", res); duration = IMFMediaEngineEx_GetDuration(media_engine);

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 7f4225e3b01cb9053bbd0165caae4417e009de28 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f4225e3b01cb9053bbd0165caae44… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Thu Aug 10 23:24:19 2023 +0200 po: Update Dutch translation. --- po/nl.po | 41 ++++++++++++----------------------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/po/nl.po b/po/nl.po index f962f5cac6a..b44f6ea1744 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-05-26 10:45+0200\n" +"PO-Revision-Date: 2023-08-10 22:50+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -4030,10 +4030,8 @@ msgid "Syntax error in regular expression" msgstr "Formuleringsfout in reguliere expressie" #: dlls/jscript/jscript.rc:66 -#, fuzzy -#| msgid "Expected identifier" msgid "Unexpected quantifier" -msgstr "Verwachte ID" +msgstr "Onverwachte kwantor" #: dlls/jscript/jscript.rc:67 msgid "Exception thrown and not caught" @@ -4096,10 +4094,8 @@ msgid "'this' is not a | object" msgstr "'this' is geen | object" #: dlls/jscript/jscript.rc:81 -#, fuzzy -#| msgid "'this' is not a | object" msgid "'key' is not an object" -msgstr "'this' is geen | object" +msgstr "'key' is geen object" #: dlls/jscript/jscript.rc:82 msgid "Property cannot have both accessors and a value" @@ -14906,52 +14902,39 @@ msgstr "Primair DNS-achtervoegsel" #: programs/klist/klist.rc:28 msgid "Usage: klist <tickets | tgt | purge | get [service principal name]>\n" -msgstr "" +msgstr "Gebruik: klist <tickets | tgt | purge | get [service hoofdnaam]>\n" #: programs/klist/klist.rc:29 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown error\n" -msgstr "Onbekende fout" +msgstr "Onbekende fout\n" #: programs/klist/klist.rc:30 -#, fuzzy -#| msgid "Start Menu" msgid "Start Time" -msgstr "Start Menu" +msgstr "Starttijd" #: programs/klist/klist.rc:31 -#, fuzzy -#| msgctxt "maximum 31 characters" -#| msgid "FLE Standard Time" msgid "End Time" -msgstr "Oost-Europa Standaard Tijd" +msgstr "Eindtijd" #: programs/klist/klist.rc:32 -#, fuzzy -#| msgid "Enter new time: " msgid "Renew Time" -msgstr "Voer de nieuwe tijd in: " +msgstr "Vernieuwingstijd" #: programs/klist/klist.rc:33 msgid "Ticket Flags" -msgstr "" +msgstr "Ticketlabels" #: programs/klist/klist.rc:34 msgid "Cached Tickets" -msgstr "" +msgstr "Tijdelijk opgeslagen Tickets" #: programs/klist/klist.rc:36 -#, fuzzy -#| msgid "Encryption Type" msgid "KerbTicket Encryption Type" -msgstr "Type Versleuteling" +msgstr "KerbTicket Encryptie Type" #: programs/klist/klist.rc:37 -#, fuzzy -#| msgid "Current Connections" msgid "Current LogonId is" -msgstr "Huidige verbindingen" +msgstr "Huidige LoginId is" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information"

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2023