June 2020 - Wine-Commits - list.winehq.org

Michael Cronenworth : crypt32: Global variable compatibility update for gcc 10.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 94b6a19772214f05f750df0b4c176fe213c1fc35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94b6a19772214f05f750df0b… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:19 2020 -0600 crypt32: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5740b735cdb44fb89a41f3090dcc3dabf360ab41) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/crypt32/crypt32_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 3d0129e7d4..d92eb1a157 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -152,7 +152,7 @@ BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType, */ HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(ALG_ID); -HINSTANCE hInstance DECLSPEC_HIDDEN; +extern HINSTANCE hInstance DECLSPEC_HIDDEN; void crypt_oid_init(void) DECLSPEC_HIDDEN; void crypt_oid_free(void) DECLSPEC_HIDDEN;

1 0

Gerald Pfeifer : winedump: Add a default case to numeric_leaf().
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 483e26259ba0530a42be722976df63a489a0e6d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=483e26259ba0530a42be7229… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jan 23 23:09:00 2020 +0100 winedump: Add a default case to numeric_leaf(). This addresses two warnings issues by GCC 10 (currently in development stage 4, so this is unlikely to change): msc.c:687:9: warning: 'value' may be used uninitialized in this function msc.c:301:13: warning: 'value' may be used uninitialized in this function Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7299735fdf6cd4f0d7c96cf9dc89f8ef50785e1b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winedump/msc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index fbe7f9e541..6843f899b1 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -206,6 +206,7 @@ static int numeric_leaf(int* value, const unsigned short int* leaf) { case fv_integer: *value = fv.v.i; break; case fv_longlong: *value = (unsigned)fv.v.llu; printf("bad conversion\n"); break; + default: assert( 0 ); *value = 0; } return len; }

1 0

Michael Cronenworth : winebus: Global variable compatibility update for gcc 10.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: df434090e3d36468629832a9f200cd1670dc2e73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df434090e3d36468629832a9… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:29 2020 -0600 winebus: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 388348ddbf7d138fed3a6fe48bf6666a95ef3528) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/bus.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 041a37ad04..22a4b46a51 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -54,5 +54,5 @@ DEVICE_OBJECT* bus_enumerate_hid_devices(const platform_vtbl *vtbl, enum_func fu DWORD check_bus_option(const UNICODE_STRING *option, DWORD default_value) DECLSPEC_HIDDEN; BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; -HANDLE driver_key DECLSPEC_HIDDEN; -DEVICE_OBJECT *bus_pdo DECLSPEC_HIDDEN; +extern HANDLE driver_key DECLSPEC_HIDDEN; +extern DEVICE_OBJECT *bus_pdo DECLSPEC_HIDDEN;

1 0

Ken Thomases : winemac: Fix a string format warning for tick counts in update_clipboard().
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: 1216453225bf7eb4cb653c37b5e3aeee51857880 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1216453225bf7eb4cb653c37… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jun 1 11:31:52 2020 -0500 winemac: Fix a string format warning for tick counts in update_clipboard(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index cf5d56b1f1..65fb3cc8ec 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1783,7 +1783,7 @@ static void update_clipboard(void) static BOOL updating; TRACE("is_clipboard_owner %d last_clipboard_update %llu now %llu\n", - is_clipboard_owner, last_clipboard_update, GetTickCount64()); + is_clipboard_owner, (unsigned long long)last_clipboard_update, (unsigned long long)GetTickCount64()); if (updating) return; updating = TRUE;

1 0

Aaro Altonen : msado15: Implement IConnectionPointContainer_FindConnectionPoint.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: a1222a3595c8eafaef7df95b3804fa2205ac3c84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1222a3595c8eafaef7df95b… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Mon Jun 1 14:42:18 2020 +0300 msado15: Implement IConnectionPointContainer_FindConnectionPoint. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49303 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 17 +++++++++++++++-- dlls/msado15/tests/msado15.c | 27 +++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index be201cb90b..9e8c05522e 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -23,6 +23,7 @@ #include "initguid.h" #include "ocidl.h" #include "objbase.h" +#include "olectl.h" #include "msado15_backcompat.h" #include "wine/debug.h" @@ -455,8 +456,20 @@ static HRESULT WINAPI connpointcontainer_FindConnectionPoint( IConnectionPointCo REFIID riid, IConnectionPoint **point ) { struct connection *connection = impl_from_IConnectionPointContainer( iface ); - FIXME( "%p, %s, %p\n", connection, debugstr_guid( riid ), point ); - return E_NOTIMPL; + + TRACE( "%p, %s %p\n", connection, debugstr_guid( riid ), point ); + + if (!point) return E_POINTER; + + if (IsEqualIID( riid, connection->cp_connev.riid )) + { + *point = &connection->cp_connev.IConnectionPoint_iface; + IConnectionPoint_AddRef( *point ); + return S_OK; + } + + FIXME( "unsupported connection point %s\n", debugstr_guid( riid ) ); + return CONNECT_E_NOCONNECTION; } static const struct IConnectionPointContainerVtbl connpointcontainer_vtbl = diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 349363b7c5..a8d2afdd41 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -20,6 +20,7 @@ #define COBJMACROS #include <initguid.h> #include <oledb.h> +#include <olectl.h> #include <msado15_backcompat.h> #include "wine/test.h" @@ -805,10 +806,36 @@ static void test_Command(void) _Command_Release( command ); } +static void test_ConnectionPoint(void) +{ + HRESULT hr; + ULONG refs; + IConnectionPoint *point; + IConnectionPointContainer *pointcontainer; + + hr = CoCreateInstance( &CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, + &IID_IConnectionPointContainer, (void**)&pointcontainer ); + + hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, NULL ); + ok( hr == E_POINTER, "got %08x\n", hr ); + + hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_RecordsetEvents, &point ); + ok( hr == CONNECT_E_NOCONNECTION, "got %08x\n", hr ); + + hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, &point ); + ok( hr == S_OK, "got %08x\n", hr ); + + refs = IConnectionPoint_Release( point ); + ok( refs == 1, "got %u", refs ); + + IConnectionPointContainer_Release( pointcontainer ); +} + START_TEST(msado15) { CoInitialize( NULL ); test_Connection(); + test_ConnectionPoint(); test_Fields(); test_Recordset(); test_Stream();

1 0

Aaro Altonen : msado15: Add IConnectionPoint stub to _Connection.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: a8b647d8f89e6927bc1591d505eb63eb5ebfe860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8b647d8f89e6927bc1591d5… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Mon Jun 1 14:42:17 2020 +0300 msado15: Add IConnectionPoint stub to _Connection. Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 8ed39a3a51..be201cb90b 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -32,6 +32,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); +struct connection; + +struct connection_point +{ + IConnectionPoint IConnectionPoint_iface; + struct connection *conn; + const IID *riid; +}; + struct connection { _Connection Connection_iface; @@ -41,6 +50,7 @@ struct connection ObjectStateEnum state; LONG timeout; WCHAR *datasource; + struct connection_point cp_connev; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -58,6 +68,11 @@ static inline struct connection *impl_from_IConnectionPointContainer( IConnectio return CONTAINING_RECORD( iface, struct connection, IConnectionPointContainer_iface ); } +static inline struct connection_point *impl_from_IConnectionPoint( IConnectionPoint *iface ) +{ + return CONTAINING_RECORD( iface, struct connection_point, IConnectionPoint_iface ); +} + static ULONG WINAPI connection_AddRef( _Connection *iface ) { struct connection *connection = impl_from_Connection( iface ); @@ -453,6 +468,86 @@ static const struct IConnectionPointContainerVtbl connpointcontainer_vtbl = connpointcontainer_FindConnectionPoint }; +static HRESULT WINAPI connpoint_QueryInterface( IConnectionPoint *iface, REFIID riid, void **obj ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + + if (IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IConnectionPoint, riid )) + { + *obj = &connpoint->IConnectionPoint_iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid( riid ) ); + return E_NOINTERFACE; + } + + connection_AddRef( &connpoint->conn->Connection_iface ); + return S_OK; +} + +static ULONG WINAPI connpoint_AddRef( IConnectionPoint *iface ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + return IConnectionPointContainer_AddRef( &connpoint->conn->IConnectionPointContainer_iface ); +} + +static ULONG WINAPI connpoint_Release( IConnectionPoint *iface ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + return IConnectionPointContainer_Release( &connpoint->conn->IConnectionPointContainer_iface ); +} + +static HRESULT WINAPI connpoint_GetConnectionInterface( IConnectionPoint *iface, IID *iid ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p\n", connpoint, iid ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_GetConnectionPointContainer( IConnectionPoint *iface, + IConnectionPointContainer **container ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p\n", connpoint, container ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_Advise( IConnectionPoint *iface, IUnknown *unk_sink, + DWORD *cookie ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p, %p\n", connpoint, unk_sink, cookie ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_Unadvise( IConnectionPoint *iface, DWORD cookie ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %d\n", connpoint, cookie ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_EnumConnections( IConnectionPoint *iface, + IEnumConnections **points ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p\n", connpoint, points ); + return E_NOTIMPL; +} + +static const IConnectionPointVtbl connpoint_vtbl = +{ + connpoint_QueryInterface, + connpoint_AddRef, + connpoint_Release, + connpoint_GetConnectionInterface, + connpoint_GetConnectionPointContainer, + connpoint_Advise, + connpoint_Unadvise, + connpoint_EnumConnections +}; + HRESULT Connection_create( void **obj ) { struct connection *connection; @@ -466,6 +561,10 @@ HRESULT Connection_create( void **obj ) connection->timeout = 30; connection->datasource = NULL; + connection->cp_connev.conn = connection; + connection->cp_connev.riid = &DIID_ConnectionEvents; + connection->cp_connev.IConnectionPoint_iface.lpVtbl = &connpoint_vtbl; + *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); return S_OK;

1 0

Vijay Kiran Kamuju : include: Add missing enum, function and packing to msasn1.h.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: 1b249e9055172a7a6c208a0e95335a50ae1cc56a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b249e9055172a7a6c208a0e… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Jun 1 11:10:43 2020 +0200 include: Add missing enum, function and packing to msasn1.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msasn1.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/msasn1.h b/include/msasn1.h index dd0bcb5b3d..244ed61487 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 Austin English + * Copyright (C) 2020 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +19,8 @@ #ifndef __MS_ASN1_H__ #define __MS_ASN1_H__ +#include <pshpack8.h> + #ifdef __cplusplus extern "C" { #endif @@ -157,6 +160,13 @@ typedef enum tagASN1error_e ASN1_WRN_NOEOD = 1002, } ASN1error_e; +enum +{ + ASN1_CHOICE_BASE = 1, + ASN1_CHOICE_INVALID = -1, + ASN1_CHOICE_EXTENSION = 0 +}; + #define ASN1_SUCCEEDED(ret) (((int)(ret)) >= 0) #define ASN1_FAILED(ret) (((int)(ret)) < 0) @@ -301,6 +311,7 @@ void WINAPI ASN1_CloseEncoder(ASN1encoding_t); void WINAPI ASN1_CloseEncoder2(ASN1encoding_t); void WINAPI ASN1_CloseModule(ASN1module_t); ASN1error_e WINAPI ASN1_CreateDecoder(ASN1module_t, ASN1decoding_t*,ASN1octet_t*, ASN1uint32_t, ASN1decoding_t); +ASN1error_e WINAPI ASN1_CreateDecoderEx(ASN1module_t, ASN1decoding_t*,ASN1octet_t*, ASN1uint32_t, ASN1decoding_t, ASN1uint32_t); ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t, ASN1encoding_t*, ASN1octet_t*, ASN1uint32_t, ASN1encoding_t); ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t,ASN1encodingrule_e,ASN1uint32_t,ASN1uint32_t,const ASN1GenericFun_t [],const ASN1GenericFun_t [],const ASN1FreeFun_t [],const ASN1uint32_t [],ASN1magic_t); ASN1error_e WINAPI ASN1_Decode(ASN1decoding_t, void** , ASN1uint32_t, ASN1uint32_t, ASN1octet_t*, ASN1uint32_t); @@ -352,4 +363,6 @@ void WINAPI ASN1ztcharstring_free(ASN1charstring_t*); } #endif +#include <poppack.h> + #endif /* __MS_ASN1_H__ */

1 0

Alexandre Julliard : ntdll: Move server wait functions to the Unix library.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: c0319e0eabbad87a3e153c23f2461c881153b984 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0319e0eabbad87a3e153c23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 13:40:25 2020 +0200 ntdll: Move server wait functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/critsection.c | 2 +- dlls/ntdll/exception.c | 4 +- dlls/ntdll/process.c | 2 +- dlls/ntdll/server.c | 449 --------------------------------------- dlls/ntdll/sync.c | 12 +- dlls/ntdll/thread.c | 2 +- dlls/ntdll/unix/loader.c | 3 + dlls/ntdll/unix/server.c | 424 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_arm.c | 110 ++++++++++ dlls/ntdll/unix/signal_arm64.c | 98 +++++++++ dlls/ntdll/unix/signal_i386.c | 142 +++++++++++++ dlls/ntdll/unix/signal_powerpc.c | 202 ++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 134 ++++++++++++ dlls/ntdll/unix/unix_private.h | 9 + dlls/ntdll/unixlib.h | 8 +- dlls/ntdll/virtual.c | 18 +- 16 files changed, 1149 insertions(+), 470 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0319e0eabbad87a3e15…

1 0

Nikolay Sivov : dwrite: Add main loop variant for reverse substitution.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: 3e59649c9edfd27df45fca9112ecde9cb33d1740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e59649c9edfd27df45fca91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 1 12:23:37 2020 +0300 dwrite: Add main loop variant for reverse substitution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 50 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 29f2a95a8c..58e1a3941c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5610,6 +5610,19 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c } } +static BOOL opentype_is_gsub_lookup_reversed(const struct scriptshaping_context *context, const struct lookup *lookup) +{ + unsigned int subtable_offset, lookup_type = lookup->type; + + if (lookup->type == GSUB_LOOKUP_EXTENSION_SUBST) + { + subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, 0); + /* Assumes format 1. */ + lookup_type = table_read_be_word(&context->table->table, subtable_offset + 2); + } + return lookup_type == GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST; +} + void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, const struct shaping_features *features) { @@ -5626,19 +5639,38 @@ void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, { const struct lookup *lookup = &lookups.lookups[i]; - context->cur = 0; - while (context->cur < context->glyph_count) + if (!opentype_is_gsub_lookup_reversed(context, lookup)) { - ret = FALSE; - - if ((context->glyph_infos[context->cur].mask & lookup->mask) && - lookup_is_glyph_match(context, context->cur, lookup->flags)) + context->cur = 0; + while (context->cur < context->glyph_count) { - ret = opentype_layout_apply_gsub_lookup(context, lookup); + ret = FALSE; + + if ((context->glyph_infos[context->cur].mask & lookup->mask) && + lookup_is_glyph_match(context, context->cur, lookup->flags)) + { + ret = opentype_layout_apply_gsub_lookup(context, lookup); + } + + if (!ret) + context->cur++; } + } + else + { + context->cur = context->glyph_count - 1; - if (!ret) - context->cur++; + for (;;) + { + if ((context->glyph_infos[context->cur].mask & lookup->mask) && + lookup_is_glyph_match(context, context->cur, lookup->flags)) + { + opentype_layout_apply_gsub_lookup(context, lookup); + } + + if (context->cur == 0) break; + --context->cur; + } } }

1 0

Ziqing Hui : windowscodecs: Implement DdsFrameDecode_Dds_GetFormatInfo().
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: 2e39b43c5dce00472c32a226fe06c12944da3539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e39b43c5dce00472c32a226… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Jun 1 12:59:19 2020 +0800 windowscodecs: Implement DdsFrameDecode_Dds_GetFormatInfo(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 59 +++++++++++++++++++++++++++++++----- dlls/windowscodecs/tests/ddsformat.c | 4 +-- 2 files changed, 53 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 9446c7e8e6..7b0817e738 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -105,6 +105,15 @@ typedef struct dds_info { WICDdsAlphaMode alpha_mode; } dds_info; +typedef struct dds_frame_info { + UINT width; + UINT height; + DXGI_FORMAT format; + UINT bytes_per_block; + UINT block_width; + UINT block_height; +} dds_frame_info; + typedef struct DdsDecoder { IWICBitmapDecoder IWICBitmapDecoder_iface; IWICDdsDecoder IWICDdsDecoder_iface; @@ -121,8 +130,7 @@ typedef struct DdsFrameDecode { IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; IWICDdsFrameDecode IWICDdsFrameDecode_iface; LONG ref; - UINT width; - UINT height; + dds_frame_info info; } DdsFrameDecode; static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *, UINT, UINT, UINT, IWICBitmapFrameDecode **); @@ -231,6 +239,27 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h } } +static UINT get_bytes_per_block(DXGI_FORMAT format) +{ + switch(format) + { + case DXGI_FORMAT_BC1_UNORM: + case DXGI_FORMAT_BC1_TYPELESS: + case DXGI_FORMAT_BC1_UNORM_SRGB: + return 8; + case DXGI_FORMAT_BC2_UNORM: + case DXGI_FORMAT_BC2_TYPELESS: + case DXGI_FORMAT_BC2_UNORM_SRGB: + case DXGI_FORMAT_BC3_UNORM: + case DXGI_FORMAT_BC3_TYPELESS: + case DXGI_FORMAT_BC3_UNORM_SRGB: + return 16; + default: + WARN("DXGI format 0x%x is not supported in DDS decoder\n", format); + return 0; + } +} + static inline DdsDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) { return CONTAINING_RECORD(iface, DdsDecoder, IWICBitmapDecoder_iface); @@ -303,8 +332,8 @@ static HRESULT WINAPI DdsFrameDecode_GetSize(IWICBitmapFrameDecode *iface, if (!puiWidth || !puiHeight) return E_INVALIDARG; - *puiWidth = This->width; - *puiHeight = This->height; + *puiWidth = This->info.width; + *puiHeight = This->info.height; TRACE("(%p) -> (%d,%d)\n", iface, *puiWidth, *puiHeight); @@ -411,9 +440,19 @@ static HRESULT WINAPI DdsFrameDecode_Dds_GetSizeInBlocks(IWICDdsFrameDecode *ifa static HRESULT WINAPI DdsFrameDecode_Dds_GetFormatInfo(IWICDdsFrameDecode *iface, WICDdsFormatInfo *formatInfo) { - FIXME("(%p,%p): stub.\n", iface, formatInfo); + DdsFrameDecode *This = impl_from_IWICDdsFrameDecode(iface); - return E_NOTIMPL; + if (!formatInfo) return E_INVALIDARG; + + formatInfo->DxgiFormat = This->info.format; + formatInfo->BytesPerBlock = This->info.bytes_per_block; + formatInfo->BlockWidth = This->info.block_width; + formatInfo->BlockHeight = This->info.block_height; + + TRACE("(%p,%p) -> (0x%x,%d,%d,%d)\n", iface, formatInfo, + formatInfo->DxgiFormat, formatInfo->BytesPerBlock, formatInfo->BlockWidth, formatInfo->BlockHeight); + + return S_OK; } static HRESULT WINAPI DdsFrameDecode_Dds_CopyBlocks(IWICDdsFrameDecode *iface, @@ -794,8 +833,12 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, hr = DdsFrameDecode_CreateInstance(&frame_decode); if (hr != S_OK) goto end; - frame_decode->width = width; - frame_decode->height = height; + frame_decode->info.width = width; + frame_decode->info.height = height; + frame_decode->info.format = This->info.format; + frame_decode->info.bytes_per_block = get_bytes_per_block(This->info.format); + frame_decode->info.block_width = 4; + frame_decode->info.block_height = 4; *bitmapFrame = &frame_decode->IWICBitmapFrameDecode_iface; hr = S_OK; diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 32ea1e2774..7d001e6338 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -436,9 +436,9 @@ static void test_dds_decoder_frame_properties(IWICBitmapDecoder *decoder, IWICBi /* frame format information tests */ hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, NULL); - todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, &format_info); - todo_wine ok (hr == S_OK, "%d: [frame %d] GetFormatInfo failed, hr=%x\n", i, frame_index, hr); + ok (hr == S_OK, "%d: [frame %d] GetFormatInfo failed, hr=%x\n", i, frame_index, hr); if (hr != S_OK) goto end; ok (format_info.DxgiFormat == test_data[i].expected_parameters.DxgiFormat,

1 0