August 2023 - Wine-commits - list.winehq.org

Nikolay Sivov : vkd3d-shader/hlsl: Add constant folding for 'sqrt'.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: vkd3d Branch: master Commit: 58bc61e48dba02c1308908b8485c199f62a4806f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/58bc61e48dba02c1308908b8485c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 5 10:39:04 2023 +0200 vkd3d-shader/hlsl: Add constant folding for 'sqrt'. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 49 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 2 files changed, 51 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 8b191de9..7784b983 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -231,6 +231,51 @@ static bool fold_rcp(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons return true; } +static bool fold_sqrt(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src, const struct vkd3d_shader_location *loc) +{ + enum hlsl_base_type type = dst_type->base_type; + unsigned int k; + + assert(type == src->node.data_type->base_type); + + for (k = 0; k < dst_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + if (ctx->profile->major_version >= 4 && src->value.u[k].f < 0.0f) + { + hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_IMAGINARY_NUMERIC_RESULT, + "Imaginary square root result."); + } + dst->u[k].f = sqrtf(src->value.u[k].f); + if (ctx->profile->major_version < 4 && !isfinite(dst->u[k].f)) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NON_FINITE_RESULT, + "Infinities and NaNs are not allowed by the shader model."); + } + break; + + case HLSL_TYPE_DOUBLE: + if (src->value.u[k].d < 0.0) + { + hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_IMAGINARY_NUMERIC_RESULT, + "Imaginary square root result."); + } + dst->u[k].d = sqrt(src->value.u[k].d); + break; + + default: + FIXME("Fold 'sqrt' for type %s.\n", debug_hlsl_type(ctx, dst_type)); + return false; + } + } + + return true; +} + static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { @@ -830,6 +875,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_rcp(ctx, &res, instr->data_type, arg1, &instr->loc); break; + case HLSL_OP1_SQRT: + success = fold_sqrt(ctx, &res, instr->data_type, arg1, &instr->loc); + break; + case HLSL_OP2_ADD: success = fold_add(ctx, &res, instr->data_type, arg1, arg2); break; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c0fd460f..73d4d496 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -133,10 +133,12 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_MISSING_ATTRIBUTE = 5024, VKD3D_SHADER_ERROR_HLSL_RECURSIVE_CALL = 5025, VKD3D_SHADER_ERROR_HLSL_INCONSISTENT_SAMPLER = 5026, + VKD3D_SHADER_ERROR_HLSL_NON_FINITE_RESULT = 5027, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO = 5301, VKD3D_SHADER_WARNING_HLSL_UNKNOWN_ATTRIBUTE = 5302, + VKD3D_SHADER_WARNING_HLSL_IMAGINARY_NUMERIC_RESULT = 5303, VKD3D_SHADER_ERROR_GLSL_INTERNAL = 6000,

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add constant folding for 'log2'.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: vkd3d Branch: master Commit: 932c5e36dc6a69660ee6476147ce83325209189a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/932c5e36dc6a69660ee6476147ce8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 5 11:09:21 2023 +0200 vkd3d-shader/hlsl: Add constant folding for 'log2'. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 49 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 50 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 7784b983..376bd258 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -152,6 +152,51 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, return true; } +static bool fold_log2(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src, const struct vkd3d_shader_location *loc) +{ + enum hlsl_base_type type = dst_type->base_type; + unsigned int k; + + assert(type == src->node.data_type->base_type); + + for (k = 0; k < dst_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + if (ctx->profile->major_version >= 4 && src->value.u[k].f < 0.0f) + { + hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_NON_FINITE_RESULT, + "Indefinite logarithm result."); + } + dst->u[k].f = log2f(src->value.u[k].f); + if (ctx->profile->major_version < 4 && !isfinite(dst->u[k].f)) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NON_FINITE_RESULT, + "Infinities and NaNs are not allowed by the shader model."); + } + break; + + case HLSL_TYPE_DOUBLE: + if (src->value.u[k].d < 0.0) + { + hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_NON_FINITE_RESULT, + "Indefinite logarithm result."); + } + dst->u[k].d = log2(src->value.u[k].d); + break; + + default: + FIXME("Fold 'log2' for type %s.\n", debug_hlsl_type(ctx, dst_type)); + return false; + } + } + + return true; +} + static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src) { @@ -867,6 +912,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_cast(ctx, &res, instr->data_type, arg1); break; + case HLSL_OP1_LOG2: + success = fold_log2(ctx, &res, instr->data_type, arg1, &instr->loc); + break; + case HLSL_OP1_NEG: success = fold_neg(ctx, &res, instr->data_type, arg1); break; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 73d4d496..c719085e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -139,6 +139,7 @@ enum vkd3d_shader_error VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO = 5301, VKD3D_SHADER_WARNING_HLSL_UNKNOWN_ATTRIBUTE = 5302, VKD3D_SHADER_WARNING_HLSL_IMAGINARY_NUMERIC_RESULT = 5303, + VKD3D_SHADER_WARNING_HLSL_NON_FINITE_RESULT = 5304, VKD3D_SHADER_ERROR_GLSL_INTERNAL = 6000,

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Use type width in fold_rcp().
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: vkd3d Branch: master Commit: 98f63c46f8df264999a9e368f3dca3e98f5132ea URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98f63c46f8df264999a9e368f3dca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 5 20:47:00 2023 +0200 vkd3d-shader/hlsl: Use type width in fold_rcp(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 376bd258..41a72ab6 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -239,7 +239,7 @@ static bool fold_rcp(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons assert(type == src->node.data_type->base_type); - for (k = 0; k < 4; ++k) + for (k = 0; k < dst_type->dimx; ++k) { switch (type) {

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

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: 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

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

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

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

Gabriel Ivăncescu : mshtml: Skip windows with no URI when deciding whether to send storage events.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: db53e46bad3196a662976ea4c9c34a251aad10d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/db53e46bad3196a662976ea4c9c34a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 10 19:10:23 2023 +0300 mshtml: Skip windows with no URI when deciding whether to send storage events. They're not going to match anyway. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index cad2b2dbd32..2cf32580b2a 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -282,6 +282,8 @@ static HRESULT send_storage_event_impl(struct send_storage_event_ctx *ctx, HTMLI origin = storage->session_storage->origin; origin_len = ctx->skip_window ? wcslen(origin) : storage->session_storage->origin_len; bstr = NULL; + }else if(!window->base.outer_window->uri) { + return S_OK; }else { hres = IUri_GetHost(window->base.outer_window->uri, &bstr); if(hres != S_OK) {

1 0