wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Nikolay Sivov : ole32: Move apartment and activation management to a separate file.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 04e11b587123e1068189015e3e6f2ad5c1faa2f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04e11b587123e1068189015e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 25 18:18:15 2020 +0300 ole32: Move apartment and activation management to a separate file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/Makefile.in | 1 + dlls/ole32/apartment.c | 1289 ++++++++++++++++++++++++++++++++++++ dlls/ole32/compobj.c | 1497 +++++------------------------------------- dlls/ole32/compobj_private.h | 20 +- 4 files changed, 1456 insertions(+), 1351 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04e11b587123e1068189…

1 0

Nikolay Sivov : ole32: Simplify apartment lookup helper.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 89d8e13bf0d922bce2ed3fc9bab7d89c945d4408 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89d8e13bf0d922bce2ed3fc9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 25 18:18:14 2020 +0300 ole32: Simplify apartment lookup helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 10 +++------- dlls/ole32/compobj_private.h | 2 +- dlls/ole32/marshal.c | 4 ++-- dlls/ole32/stubmanager.c | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4bd8c2474b..a68cab0fe9 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1237,12 +1237,8 @@ DWORD apartment_release(struct apartment *apt) return ret; } -/* The given OXID must be local to this process: - * - * The ref parameter is here mostly to ensure people remember that - * they get one, you should normally take a ref for thread safety. - */ -struct apartment *apartment_findfromoxid(OXID oxid, BOOL ref) +/* The given OXID must be local to this process */ +struct apartment *apartment_findfromoxid(OXID oxid) { struct apartment *result = NULL; struct list *cursor; @@ -1254,7 +1250,7 @@ struct apartment *apartment_findfromoxid(OXID oxid, BOOL ref) if (apt->oxid == oxid) { result = apt; - if (ref) apartment_addref(result); + apartment_addref(result); break; } } diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 7958b119bc..6e8b7ae2cf 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -246,7 +246,7 @@ void OLEDD_UnInitialize(void) DECLSPEC_HIDDEN; /* Apartment Functions */ -struct apartment *apartment_findfromoxid(OXID oxid, BOOL ref) DECLSPEC_HIDDEN; +struct apartment *apartment_findfromoxid(OXID oxid) DECLSPEC_HIDDEN; struct apartment *apartment_findfromtid(DWORD tid) DECLSPEC_HIDDEN; DWORD apartment_release(struct apartment *apt) DECLSPEC_HIDDEN; HRESULT apartment_disconnectproxies(struct apartment *apt) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 9fb68e66f0..8cc35354d5 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1468,7 +1468,7 @@ static HRESULT std_unmarshal_interface(MSHCTX dest_context, void *dest_context_d * ignore table marshaling and normal marshaling rules regarding number of * unmarshals, etc, but if you abuse these rules then your proxy could end * up returning RPC_E_DISCONNECTED. */ - if ((stub_apt = apartment_findfromoxid(obj.std.oxid, TRUE))) + if ((stub_apt = apartment_findfromoxid(obj.std.oxid))) { if ((stubmgr = get_stub_manager(stub_apt, obj.std.oid))) { @@ -1555,7 +1555,7 @@ static HRESULT std_release_marshal_data(IStream *pStm) wine_dbgstr_longlong(obj.std.oid), wine_dbgstr_guid(&obj.std.ipid)); - if (!(apt = apartment_findfromoxid(obj.std.oxid, TRUE))) + if (!(apt = apartment_findfromoxid(obj.std.oxid))) { WARN("Could not map OXID %s to apartment object\n", wine_dbgstr_longlong(obj.std.oxid)); diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 16f9c3dc52..338b89750e 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -503,7 +503,7 @@ static HRESULT ipid_to_ifstub(const IPID *ipid, struct apartment **stub_apt, { /* FIXME: hack for IRemUnknown */ if (ipid->Data2 == 0xffff) - *stub_apt = apartment_findfromoxid(*(const OXID *)ipid->Data4, TRUE); + *stub_apt = apartment_findfromoxid(*(const OXID *)ipid->Data4); else *stub_apt = apartment_findfromtid(ipid->Data2); if (!*stub_apt)

1 0

Nikolay Sivov : ole32: Get rid of typedef'ed type for apartment structure.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 929575154214482a11761a82b19db8b035a4ad1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=929575154214482a11761a82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 25 18:18:13 2020 +0300 ole32: Get rid of typedef'ed type for apartment structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 56 ++++++++++++++++++++++---------------------- dlls/ole32/compobj_private.h | 24 +++++++++---------- dlls/ole32/marshal.c | 19 +++++++-------- dlls/ole32/rpc.c | 10 ++++---- dlls/ole32/stubmanager.c | 26 ++++++++++---------- 5 files changed, 67 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=929575154214482a1176…

1 0

Zebediah Figura : vkd3d-shader: Do not check for NULL in vkd3d_shader_free_shader_code().
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: vkd3d Branch: master Commit: f895f0dce6149b2c9aa0b386aeb70f8eae633d8d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f895f0dce6149b2c9aa0b38… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 24 11:16:45 2020 -0500 vkd3d-shader: Do not check for NULL in vkd3d_shader_free_shader_code(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 68e23da..e3abaf7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -917,9 +917,6 @@ void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_ void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code) { - if (!shader_code) - return; - vkd3d_free((void *)shader_code->code); }

1 0

Zebediah Figura : vkd3d-shader: Do not check for NULL in vkd3d_shader_free_scan_descriptor_info().
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: vkd3d Branch: master Commit: 6c10b5280444d5c6219d3c557a3d6f1c994a33eb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6c10b5280444d5c6219d3c5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 25 10:22:28 2020 -0500 vkd3d-shader: Do not check for NULL in vkd3d_shader_free_scan_descriptor_info(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e0a04fc..68e23da 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -884,14 +884,16 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if (instruction.handler_idx == VKD3DSIH_INVALID) { WARN("Encountered unrecognized or invalid instruction.\n"); - vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); + if (scan_descriptor_info) + vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); ret = VKD3D_ERROR_INVALID_SHADER; goto done; } if ((ret = vkd3d_shader_scan_instruction(&context, &instruction)) < 0) { - vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); + if (scan_descriptor_info) + vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); goto done; } ++message_context->line; @@ -910,9 +912,6 @@ done: void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info) { - if (!scan_descriptor_info) - return; - vkd3d_free(scan_descriptor_info->descriptors); }

1 0

Gijs Vermeulen : amstream: Implement IMediaStreamFilter::ReferenceTimeToStreamTime().
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: a53288e8c95d59b03eefe10f4963b555b04426aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=a53288e8c95d59b03eefe10f… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Aug 25 20:30:51 2020 +0200 amstream: Implement IMediaStreamFilter::ReferenceTimeToStreamTime(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 20 +++++++++++--- dlls/amstream/tests/amstream.c | 59 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 13fd30c3a5..b63a0301d6 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -616,11 +616,25 @@ static HRESULT WINAPI filter_SupportSeeking(IMediaStreamFilter *iface, BOOL rend return E_NOINTERFACE; } -static HRESULT WINAPI filter_ReferenceTimeToStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *pTime) +static HRESULT WINAPI filter_ReferenceTimeToStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *time) { - FIXME("(%p)->(%p): Stub!\n", iface, pTime); + struct filter *filter = impl_from_IMediaStreamFilter(iface); - return E_NOTIMPL; + TRACE("filter %p, time %p.\n", filter, time); + + EnterCriticalSection(&filter->cs); + + if (!filter->clock) + { + LeaveCriticalSection(&filter->cs); + return S_FALSE; + } + + *time -= filter->start_time; + + LeaveCriticalSection(&filter->cs); + + return S_OK; } static HRESULT WINAPI filter_GetCurrentStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *time) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a25ae42a31..f4c033a180 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5436,6 +5436,64 @@ static void test_mediastreamfilter_get_current_stream_time(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_reference_time_to_stream_time(void) +{ + IMediaStreamFilter *filter; + struct testclock clock; + REFERENCE_TIME time; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaStreamFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + testclock_init(&clock); + + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdeadbeef, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaStreamFilter_SetSyncSource(filter, &clock.IReferenceClock_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + clock.get_time_hr = E_FAIL; + + /* Crashes on native. */ + if (0) + { + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + } + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdeadbeef, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaStreamFilter_Run(filter, 23456789); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdd47d2da, "Got time %s.\n", wine_dbgstr_longlong(time)); + + clock.time = 34567890; + clock.get_time_hr = S_OK; + + time = 0xdeadbeefdeadbeef; + hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0xdeadbeefdd47d2da, "Got time %s.\n", wine_dbgstr_longlong(time)); + + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_ddrawstream_getsetdirectdraw(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5892,6 +5950,7 @@ START_TEST(amstream) test_mediastreamfilter_get_duration(); test_mediastreamfilter_get_stop_position(); test_mediastreamfilter_get_current_stream_time(); + test_mediastreamfilter_reference_time_to_stream_time(); CoUninitialize(); }

1 0

Martin Storsjo : ntdll: Capture vector registers in arm64 RtlCaptureContext.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: a9639dd6053f1e7de915c29851cc1be45ed537d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9639dd6053f1e7de915c298… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Aug 25 20:01:30 2020 +0300 ntdll: Capture vector registers in arm64 RtlCaptureContext. Since 5b3842451ba6 we set the flag indicating that the context contained float registers, but we didn't actually populate them yet. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index d0f8c875b8..8d21c39f6c 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -96,6 +96,22 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, "stp x29, x30, [x0, #0xf0]\n\t" /* context->Fp,Lr */ "mov x1, sp\n\t" "stp x1, x30, [x0, #0x100]\n\t" /* context->Sp,Pc */ + "stp q0, q1, [x0, #0x110]\n\t" /* context->V[0-1] */ + "stp q2, q3, [x0, #0x130]\n\t" /* context->V[2-3] */ + "stp q4, q5, [x0, #0x150]\n\t" /* context->V[4-5] */ + "stp q6, q7, [x0, #0x170]\n\t" /* context->V[6-7] */ + "stp q8, q9, [x0, #0x190]\n\t" /* context->V[8-9] */ + "stp q10, q11, [x0, #0x1a0]\n\t" /* context->V[10-11] */ + "stp q12, q13, [x0, #0x1c0]\n\t" /* context->V[12-13] */ + "stp q14, q15, [x0, #0x1e0]\n\t" /* context->V[14-15] */ + "stp q16, q17, [x0, #0x210]\n\t" /* context->V[16-17] */ + "stp q18, q19, [x0, #0x230]\n\t" /* context->V[18-19] */ + "stp q20, q21, [x0, #0x250]\n\t" /* context->V[20-21] */ + "stp q22, q23, [x0, #0x270]\n\t" /* context->V[22-23] */ + "stp q24, q25, [x0, #0x290]\n\t" /* context->V[24-25] */ + "stp q26, q27, [x0, #0x2a0]\n\t" /* context->V[26-27] */ + "stp q28, q29, [x0, #0x2c0]\n\t" /* context->V[28-29] */ + "stp q30, q31, [x0, #0x2e0]\n\t" /* context->V[30-31] */ "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ "movk w1, #0x7\n\t" /* CONTEXT_FULL */ "str w1, [x0]\n\t" /* context->ContextFlags */

1 0

Martin Storsjo : ntdll: Fix arm64 jump buffer float restoration.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 99a6ae5b863b220e72f01abc9ce3ab1c7be9d7f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99a6ae5b863b220e72f01abc… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Aug 25 19:53:58 2020 +0300 ntdll: Fix arm64 jump buffer float restoration. Fix a typo in copying fields from the jump buffer to the context, use the right type of long in the struct. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 719c71f952..d0f8c875b8 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -57,8 +57,8 @@ struct MSVCRT_JUMP_BUFFER unsigned __int64 Fp; unsigned __int64 Lr; unsigned __int64 Sp; - unsigned long Fpcr; - unsigned long Fpsr; + ULONG Fpcr; + ULONG Fpsr; double D[8]; }; @@ -1002,7 +1002,7 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) context->Fpsr = jmp->Fpsr; for (i = 0; i < 8; i++) - context->V[8+i].D[0] = jmp->D[0]; + context->V[8+i].D[0] = jmp->D[i]; } else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) {

1 0

Ziqing Hui : windowscodecs/tests: Add CopyPixels data tests for uncompressed images.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 64c7d59ee98f5c613ba96f19e1974cb71906d932 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64c7d59ee98f5c613ba96f19… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Aug 25 22:01:56 2020 +0800 windowscodecs/tests: Add CopyPixels data tests for uncompressed images. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 11d661ba7d..1a7ef95ada 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -943,8 +943,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra WICDdsFormatInfo format_info; WICRect rect = { 0, 0, 1, 1 }, rect_test_a = { 0, 0, 0, 0 }, rect_test_b = { 0, 0, 0xdeadbeaf, 0xdeadbeaf }; WICRect rect_test_c = { -0xdeadbeaf, -0xdeadbeaf, 1, 1 }, rect_test_d = { 0xdeadbeaf, 0xdeadbeaf, 1, 1 }; - BYTE buffer[2048]; - DWORD pixels[2048]; + BYTE buffer[2048], pixels[2048]; UINT stride, frame_stride, frame_size, frame_width, frame_height, width_in_blocks, height_in_blocks, bpp; UINT width, height, depth, array_index; UINT block_offset; @@ -1106,23 +1105,34 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); if (is_compressed(format_info.DxgiFormat)) { - decode_block(test_data[i].data + block_offset, width_in_blocks * height_in_blocks, - format_info.DxgiFormat, frame_width, frame_height, pixels); + format_info.DxgiFormat, frame_width, frame_height, (DWORD *)pixels); + } else { + memcpy(pixels, test_data[i].data + block_offset, frame_size); + } - hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), buffer); - ok(hr == S_OK, "Test %u, frame %u: CopyPixels failed, hr %#x\n", i, frame_index, hr); - if (hr == S_OK) { + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), buffer); + ok(hr == S_OK, "Test %u, frame %u: CopyPixels failed, hr %#x\n", i, frame_index, hr); + if (hr == S_OK) { + if (is_compressed(format_info.DxgiFormat)) { ok(color_buffer_match((DWORD *)pixels, (DWORD *)buffer, 1), "Test %u, frame %u: Pixels mismatch\n", i, frame_index); + } else { + ok(!strncmp((const char *)pixels, (const char *)buffer, bpp / 8), + "Test %u, frame %u: Pixels mismatch\n", i, frame_index); } + } - hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, frame_stride, sizeof(buffer), buffer); - ok(hr == S_OK, "Test %u, frame %u: CopyPixels failed, hr %#x\n", i, frame_index, hr); - if (hr == S_OK) { + hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, frame_stride, sizeof(buffer), buffer); + ok(hr == S_OK, "Test %u, frame %u: CopyPixels failed, hr %#x\n", i, frame_index, hr); + if (hr == S_OK) { + if (is_compressed(format_info.DxgiFormat)) { ok(color_buffer_match((DWORD *)pixels, (DWORD *)buffer, frame_size / (bpp / 8)), - "Test %u, frame %u: Pixels mismatch\n", i, frame_index); - } + "Test %u, frame %u: Pixels mismatch\n", i, frame_index); + } else { + ok(!strncmp((const char *)pixels, (const char *)buffer, frame_size), + "Test %u, frame %u: Pixels mismatch\n", i, frame_index); + }; } }

1 0

Ziqing Hui : windowscodecs: Remove get_pixel_format_bpp().
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: f39fd206b5646cfd7ececdc12e5d3428745511be URL: https://source.winehq.org/git/wine.git/?a=commit;h=f39fd206b5646cfd7ececdc1… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Aug 25 22:01:47 2020 +0800 windowscodecs: Remove get_pixel_format_bpp(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index d16fc9700d..72c884b0ed 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -125,6 +125,7 @@ typedef struct dds_info { WICDdsDimension dimension; WICDdsAlphaMode alpha_mode; const GUID *pixel_format; + UINT pixel_format_bpp; } dds_info; typedef struct dds_frame_info { @@ -470,11 +471,18 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h info->dimension = get_dimension(NULL, header_dxt10); info->alpha_mode = header_dxt10->miscFlags2 & 0x00000008; info->data_offset = sizeof(DWORD) + sizeof(*header) + sizeof(*header_dxt10); + if (is_compressed(info->format)) { + info->pixel_format_bpp = 32; + } else { + info->pixel_format_bpp = 0; + FIXME("Pixel format bpp is incorrect for uncompressed DDS image with extended header\n"); + } } else { info->format = format_info->dxgi_format; info->dimension = get_dimension(header, NULL); info->alpha_mode = get_alpha_mode_from_fourcc(header->ddspf.fourCC); info->data_offset = sizeof(DWORD) + sizeof(*header); + info->pixel_format_bpp = format_info->wic_format_bpp; } info->pixel_format = (info->alpha_mode == WICDdsAlphaModePremultiplied) ? &GUID_WICPixelFormat32bppPBGRA : &GUID_WICPixelFormat32bppBGRA; @@ -502,27 +510,6 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h if (info->dimension == WICDdsTextureCube) info->frame_count *= 6; } -static UINT get_pixel_format_bpp(const GUID *pixel_format) -{ - HRESULT hr; - UINT bpp = 0; - IWICComponentInfo *info = NULL; - IWICPixelFormatInfo* format_info = NULL; - - hr = CreateComponentInfo(pixel_format, &info); - if (hr != S_OK) goto end; - hr = IWICComponentInfo_QueryInterface(info, &IID_IWICPixelFormatInfo, (void **)&format_info); - if (hr != S_OK) goto end; - - IWICPixelFormatInfo_GetBitsPerPixel(format_info, &bpp); - -end: - if (format_info) IWICPixelFormatInfo_Release(format_info); - if (info) IWICComponentInfo_Release(info); - - return bpp; -} - static void decode_block(const BYTE *block_data, UINT block_count, DXGI_FORMAT format, UINT width, UINT height, DWORD *buffer) { @@ -766,6 +753,8 @@ static HRESULT WINAPI DdsFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, if (!pbBuffer) return E_INVALIDARG; bpp = This->info.pixel_format_bpp; + if (!bpp) return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + frame_stride = This->info.width * bpp / 8; frame_size = frame_stride * This->info.height; if (!prc) { @@ -1326,7 +1315,7 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, frame_decode->info.width_in_blocks = frame_width_in_blocks; frame_decode->info.height_in_blocks = frame_height_in_blocks; frame_decode->info.pixel_format = This->info.pixel_format; - frame_decode->info.pixel_format_bpp = get_pixel_format_bpp(This->info.pixel_format); + frame_decode->info.pixel_format_bpp = This->info.pixel_format_bpp; frame_decode->block_data = HeapAlloc(GetProcessHeap(), 0, frame_size); frame_decode->pixel_data = NULL; hr = IStream_Seek(This->stream, seek, SEEK_SET, NULL);

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
70
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 2020