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

Fabian Maurer : user32: Set default user preferences to enable animations.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 7b998c266e38e809adabc3fe99727dc185eb056d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b998c266e38e809adabc3fe… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Aug 19 22:37:14 2020 +0200 user32: Set default user preferences to enable animations. This allows games like solitaire, chess titans, etc. to use animations. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 0c0f8fac5d..114ac6adfa 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1432,7 +1432,7 @@ static DWORD_ENTRY( AUDIODESC_LOCALE, 0 ); static PATH_ENTRY( DESKPATTERN ); static PATH_ENTRY( DESKWALLPAPER ); -static BYTE user_prefs[8] = { 0x30, 0x00, 0x00, 0x80, 0x10, 0x00, 0x00, 0x00 }; +static BYTE user_prefs[8] = { 0x30, 0x00, 0x00, 0x80, 0x12, 0x00, 0x00, 0x00 }; static BINARY_ENTRY( USERPREFERENCESMASK, user_prefs ); static FONT_ENTRY( CAPTIONLOGFONT, FW_BOLD );

1 0

Alexandre Julliard : ntdll: Handle page faults happening during a syscall without dispatching the exception.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 0b3db9dfa2877ff36c10f73b04e97af71ab2f845 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b3db9dfa2877ff36c10f73b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 24 11:46:22 2020 +0200 ntdll: Handle page faults happening during a syscall without dispatching the exception. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 59 ++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_arm64.c | 76 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_i386.c | 61 +++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 63 ++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/sync.c | 12 ++----- 5 files changed, 261 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b3db9dfa2877ff36c10…

1 0

Alexandre Julliard : ntdll: Stop resolving imports for the Unix library.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 6844ff8a0bda7c0511c3c328f459cc4286bf3c5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6844ff8a0bda7c0511c3c328… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 24 13:25:26 2020 +0200 ntdll: Stop resolving imports for the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 72 +++++------------------------------------------- 1 file changed, 7 insertions(+), 65 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 1424bf3cc6..69ea69ad53 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -92,8 +92,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); -extern IMAGE_NT_HEADERS __wine_spec_nt_header; - void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) = NULL; NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) = NULL; void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) = NULL; @@ -126,7 +124,6 @@ const char *build_dir = NULL; const char *config_dir = NULL; const char **dll_paths = NULL; const char *user_name = NULL; -static HMODULE ntdll_module; struct file_id { @@ -160,11 +157,6 @@ static NTSTATUS add_builtin_module( void *module, void *handle, const struct sta return STATUS_SUCCESS; } -static inline void *get_rva( const IMAGE_NT_HEADERS *nt, ULONG_PTR addr ) -{ - return (BYTE *)nt + addr; -} - /* adjust an array of pointers to make them into RVAs */ static inline void fixup_rva_ptrs( void *array, BYTE *base, unsigned int count ) { @@ -780,63 +772,15 @@ static ULONG_PTR find_named_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY return 0; } -static ULONG_PTR find_pe_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, - const IMAGE_IMPORT_BY_NAME *name ) -{ - const WORD *ordinals = (const WORD *)((BYTE *)module + exports->AddressOfNameOrdinals); - const DWORD *names = (const DWORD *)((BYTE *)module + exports->AddressOfNames); - - if (name->Hint < exports->NumberOfNames) - { - char *ename = (char *)module + names[name->Hint]; - if (!strcmp( ename, (char *)name->Name )) - return find_ordinal_export( module, exports, ordinals[name->Hint] ); - } - return find_named_export( module, exports, (char *)name->Name ); -} - -static void fixup_ntdll_imports( const IMAGE_NT_HEADERS *nt ) +static void load_ntdll_functions( HMODULE module ) { - const IMAGE_EXPORT_DIRECTORY *ntdll_exports = get_export_dir( ntdll_module ); - const IMAGE_IMPORT_DESCRIPTOR *descr; - const IMAGE_THUNK_DATA *import_list; - IMAGE_THUNK_DATA *thunk_list; + const IMAGE_EXPORT_DIRECTORY *ntdll_exports = get_export_dir( module ); void **ptr; assert( ntdll_exports ); - descr = get_rva( nt, nt->OptionalHeader.DataDirectory[IMAGE_FILE_IMPORT_DIRECTORY].VirtualAddress ); - - /* ntdll must be the only import */ - assert( !strcmp( get_rva( nt, descr->Name ), "ntdll.dll" )); - assert( !descr[1].Name ); - - thunk_list = get_rva( nt, (DWORD)descr->FirstThunk ); - if (descr->u.OriginalFirstThunk) - import_list = get_rva( nt, (DWORD)descr->u.OriginalFirstThunk ); - else - import_list = thunk_list; - - while (import_list->u1.Ordinal) - { - if (IMAGE_SNAP_BY_ORDINAL( import_list->u1.Ordinal )) - { - int ordinal = IMAGE_ORDINAL( import_list->u1.Ordinal ) - ntdll_exports->Base; - thunk_list->u1.Function = find_ordinal_export( ntdll_module, ntdll_exports, ordinal ); - if (!thunk_list->u1.Function) ERR( "ordinal %u not found\n", ordinal ); - } - else /* import by name */ - { - IMAGE_IMPORT_BY_NAME *pe_name = get_rva( nt, import_list->u1.AddressOfData ); - thunk_list->u1.Function = find_pe_export( ntdll_module, ntdll_exports, pe_name ); - if (!thunk_list->u1.Function) ERR( "%s not found\n", pe_name->Name ); - } - import_list++; - thunk_list++; - } - #define GET_FUNC(name) \ - if (!(p##name = (void *)find_named_export( ntdll_module, ntdll_exports, #name ))) \ + if (!(p##name = (void *)find_named_export( module, ntdll_exports, #name ))) \ ERR( "%s not found\n", #name ) GET_FUNC( DbgUiRemoteBreakin ); @@ -848,7 +792,7 @@ static void fixup_ntdll_imports( const IMAGE_NT_HEADERS *nt ) GET_FUNC( __wine_set_unix_funcs ); #undef GET_FUNC #define SET_PTR(name,val) \ - if ((ptr = (void *)find_named_export( ntdll_module, ntdll_exports, #name ))) *ptr = val; \ + if ((ptr = (void *)find_named_export( module, ntdll_exports, #name ))) *ptr = val; \ else ERR( "%s not found\n", #name ) SET_PTR( __wine_syscall_dispatcher, __wine_syscall_dispatcher ); @@ -1294,7 +1238,7 @@ found: /*********************************************************************** * load_ntdll */ -static HMODULE load_ntdll(void) +static void load_ntdll(void) { NTSTATUS status; void *module; @@ -1317,7 +1261,7 @@ static HMODULE load_ntdll(void) } if (status) fatal_error( "failed to load %s error %x\n", name, status ); free( name ); - return module; + load_ntdll_functions( module ); } @@ -1705,9 +1649,7 @@ void __wine_main( int argc, char *argv[], char *envp[] ) #endif virtual_init(); - - ntdll_module = load_ntdll(); - fixup_ntdll_imports( &__wine_spec_nt_header ); + load_ntdll(); init_environment( argc, argv, envp ); wine_dll_set_callback( load_builtin_callback );

1 0

Alexandre Julliard : ntdll: Avoid referencing winecrt0 exception handlers from the Unix library.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 97847eeee8aaaad9b141e14d4468838960ea3093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97847eeee8aaaad9b141e14d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 24 13:30:19 2020 +0200 ntdll: Avoid referencing winecrt0 exception handlers from the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 10 ++++++---- include/wine/exception.h | 17 ++++------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index fa46ec0966..e3f2820de5 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -92,6 +92,8 @@ struct file_view unsigned int protect; /* protection for all pages at allocation time and SEC_* flags */ }; +#define __EXCEPT_SYSCALL __EXCEPT_HANDLER(0) + /* per-page protection flags */ #define VPROT_READ 0x01 #define VPROT_WRITE 0x02 @@ -3142,7 +3144,7 @@ BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) dummy = p[0]; dummy = p[count - 1]; } - __EXCEPT_PAGE_FAULT + __EXCEPT_SYSCALL { return FALSE; } @@ -3175,7 +3177,7 @@ BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ) p[0] |= 0; p[count - 1] |= 0; } - __EXCEPT_PAGE_FAULT + __EXCEPT_SYSCALL { return FALSE; } @@ -3197,7 +3199,7 @@ BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) volatile const char *p = str; while (p != str + max) if (!*p++) break; } - __EXCEPT_PAGE_FAULT + __EXCEPT_SYSCALL { return TRUE; } @@ -3219,7 +3221,7 @@ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) volatile const WCHAR *p = str; while (p != str + max) if (!*p++) break; } - __EXCEPT_PAGE_FAULT + __EXCEPT_SYSCALL { return TRUE; } diff --git a/include/wine/exception.h b/include/wine/exception.h index a6ada7af21..a2b0bb08dc 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -163,27 +163,18 @@ extern DWORD __cdecl __wine_finally_ctx_handler( EXCEPTION_RECORD *record, const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { -/* convenience handler for page fault exceptions */ -#define __EXCEPT_PAGE_FAULT \ +#define __EXCEPT_HANDLER(handler) \ } while(0); \ __wine_pop_frame( &__f.frame ); \ break; \ } else { \ - __f.frame.Handler = __wine_exception_handler_page_fault; \ + __f.frame.Handler = (handler); \ if (__wine_setjmpex( &__f.jmp, &__f.frame )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { -/* convenience handler for all exceptions */ -#define __EXCEPT_ALL \ - } while(0); \ - __wine_pop_frame( &__f.frame ); \ - break; \ - } else { \ - __f.frame.Handler = __wine_exception_handler_all; \ - if (__wine_setjmpex( &__f.jmp, &__f.frame )) { \ - const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ - do { +#define __EXCEPT_PAGE_FAULT __EXCEPT_HANDLER(__wine_exception_handler_page_fault) +#define __EXCEPT_ALL __EXCEPT_HANDLER(__wine_exception_handler_all) #define __ENDTRY \ } while (0); \

1 0

Alexandre Julliard : winecrt0: Move setjmpex/longjmp implementation to a separate file.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 33be7790e57b8f24933929e514e30bad2708d675 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33be7790e57b8f24933929e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 24 13:31:04 2020 +0200 winecrt0: Move setjmpex/longjmp implementation to a separate file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/exception.c | 196 ----------------------------------------- dlls/winecrt0/setjmp.c | 218 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 219 insertions(+), 196 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33be7790e57b8f249339…

1 0

Alexandre Julliard : makefiles: Don't implicitly import the module itself when -nodefaultlibs is used.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 7571fa87df453e404d8b6ca58e2da95340156849 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7571fa87df453e404d8b6ca5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 24 13:30:12 2020 +0200 makefiles: Don't implicitly import the module itself when -nodefaultlibs is used. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 825458156f..4bd20d469d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2212,7 +2212,11 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra const char *lib = NULL; /* skip module's own importlib, its object files will be linked directly */ - if (make->importlib && !is_unix && !strcmp( make->importlib, imports.str[i] )) continue; + if (make->importlib && !strcmp( make->importlib, imports.str[i] )) + { + if (!is_unix) continue; + if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) continue; + } for (j = 0; j < top_makefile->subdirs.count; j++) {

1 0

Ziqing Hui : windowscodecs: Add a lock for DdsFrameDecode.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: ba913316adafdafedd13f403d064bf6b536fd051 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba913316adafdafedd13f403… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Aug 24 12:09:27 2020 +0800 windowscodecs: Add a lock for DdsFrameDecode. 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 12b6c42f64..c179a38935 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -150,6 +150,7 @@ typedef struct DdsFrameDecode { IWICDdsFrameDecode IWICDdsFrameDecode_iface; LONG ref; BYTE *data; + CRITICAL_SECTION lock; dds_frame_info info; } DdsFrameDecode; @@ -777,6 +778,8 @@ static HRESULT DdsFrameDecode_CreateInstance(DdsFrameDecode **frame_decode) result->IWICBitmapFrameDecode_iface.lpVtbl = &DdsFrameDecode_Vtbl; result->IWICDdsFrameDecode_iface.lpVtbl = &DdsFrameDecode_Dds_Vtbl; result->ref = 1; + InitializeCriticalSection(&result->lock); + result->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DdsFrameDecode.lock"); *frame_decode = result; return S_OK;

1 0

Ziqing Hui : windowscodecs: In struct DdsFrameDecode, add a new member "pixel_data" and rename member "data" to "block_data".
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 1b4318b14c7f7b9394babafa84dbb917c0bbcc50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b4318b14c7f7b9394babafa… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Aug 24 12:10:18 2020 +0800 windowscodecs: In struct DdsFrameDecode, add a new member "pixel_data" and rename member "data" to "block_data". 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 | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index c179a38935..ccd83ace55 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -149,7 +149,8 @@ typedef struct DdsFrameDecode { IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; IWICDdsFrameDecode IWICDdsFrameDecode_iface; LONG ref; - BYTE *data; + BYTE *block_data; + BYTE *pixel_data; CRITICAL_SECTION lock; dds_frame_info info; } DdsFrameDecode; @@ -535,7 +536,8 @@ static ULONG WINAPI DdsFrameDecode_Release(IWICBitmapFrameDecode *iface) TRACE("(%p) refcount=%u\n", iface, ref); if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This->data); + HeapFree(GetProcessHeap(), 0, This->pixel_data); + HeapFree(GetProcessHeap(), 0, This->block_data); HeapFree(GetProcessHeap(), 0, This); } @@ -593,6 +595,7 @@ static HRESULT WINAPI DdsFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); UINT bpp, frame_stride, frame_size; INT x, y, width, height; + HRESULT hr = S_OK; TRACE("(%p,%s,%u,%u,%p)\n", iface, debug_wic_rect(prc), cbStride, cbBufferSize, pbBuffer); @@ -619,7 +622,20 @@ static HRESULT WINAPI DdsFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, if (cbStride < width * bpp / 8) return E_INVALIDARG; if (cbBufferSize < cbStride * height) return WINCODEC_ERR_INSUFFICIENTBUFFER; - return S_OK; + EnterCriticalSection(&This->lock); + + if (!This->pixel_data) { + This->pixel_data = HeapAlloc(GetProcessHeap(), 0, frame_size); + if (!This->pixel_data) { + hr = E_OUTOFMEMORY; + goto end; + } + } + +end: + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI DdsFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, @@ -731,7 +747,7 @@ static HRESULT WINAPI DdsFrameDecode_Dds_CopyBlocks(IWICDdsFrameDecode *iface, if (!boundsInBlocks) { if (stride < frame_stride) return E_INVALIDARG; if (bufferSize < frame_size) return E_INVALIDARG; - memcpy(buffer, This->data, frame_size); + memcpy(buffer, This->block_data, frame_size); return S_OK; } @@ -747,7 +763,7 @@ static HRESULT WINAPI DdsFrameDecode_Dds_CopyBlocks(IWICDdsFrameDecode *iface, if (stride < width * bytes_per_block) return E_INVALIDARG; if (bufferSize < stride * height) return E_INVALIDARG; - data = This->data + (x + y * This->info.width_in_blocks) * bytes_per_block; + data = This->block_data + (x + y * This->info.width_in_blocks) * bytes_per_block; dst_buffer = buffer; for (i = 0; i < height; i++) { @@ -1143,10 +1159,11 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, 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->data = HeapAlloc(GetProcessHeap(), 0, frame_size); + frame_decode->block_data = HeapAlloc(GetProcessHeap(), 0, frame_size); + frame_decode->pixel_data = NULL; hr = IStream_Seek(This->stream, seek, SEEK_SET, NULL); if (hr != S_OK) goto end; - hr = IStream_Read(This->stream, frame_decode->data, frame_size, &bytesread); + hr = IStream_Read(This->stream, frame_decode->block_data, frame_size, &bytesread); if (hr != S_OK || bytesread != frame_size) { hr = WINCODEC_ERR_STREAMREAD; goto end;

1 0

Ziqing Hui : windowscodecs: More complete implementation of DdsFrameDecode_CopyPixels().
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 3f082762f81708f00eec599b70c2db94c49b59f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f082762f81708f00eec599b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Aug 24 12:11:01 2020 +0800 windowscodecs: More complete implementation of DdsFrameDecode_CopyPixels(). 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 | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index ccd83ace55..ed105a2642 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -607,20 +607,19 @@ static HRESULT WINAPI DdsFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, if (!prc) { if (cbStride < frame_stride) return E_INVALIDARG; if (cbBufferSize < frame_size) return WINCODEC_ERR_INSUFFICIENTBUFFER; - return S_OK; - } - - x = prc->X; - y = prc->Y; - width = prc->Width; - height = prc->Height; - if (x < 0 || y < 0 || width <= 0 || height <= 0 || - x + width > This->info.width || - y + height > This->info.height) { - return E_INVALIDARG; + } else { + x = prc->X; + y = prc->Y; + width = prc->Width; + height = prc->Height; + if (x < 0 || y < 0 || width <= 0 || height <= 0 || + x + width > This->info.width || + y + height > This->info.height) { + return E_INVALIDARG; + } + if (cbStride < width * bpp / 8) return E_INVALIDARG; + if (cbBufferSize < cbStride * height) return WINCODEC_ERR_INSUFFICIENTBUFFER; } - if (cbStride < width * bpp / 8) return E_INVALIDARG; - if (cbBufferSize < cbStride * height) return WINCODEC_ERR_INSUFFICIENTBUFFER; EnterCriticalSection(&This->lock); @@ -632,6 +631,9 @@ static HRESULT WINAPI DdsFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, } } + hr = copy_pixels(bpp, This->pixel_data, This->info.width, This->info.height, frame_stride, + prc, cbStride, cbBufferSize, pbBuffer); + end: LeaveCriticalSection(&This->lock);

1 0

Ziqing Hui : windowscodecs: Introduce decode_block() for DdsFrameDecode_CopyPixels().
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 60f1fe59a9a2083b7e9ea22baa0efb75a1ce5dd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60f1fe59a9a2083b7e9ea22b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Aug 24 12:11:25 2020 +0800 windowscodecs: Introduce decode_block() for DdsFrameDecode_CopyPixels(). 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 | 126 +++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/ddsformat.c | 2 - 2 files changed, 126 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index ed105a2642..fae7cd8e75 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -50,6 +50,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) #endif +#define GET_RGB565_R(color) ((BYTE)(((color) >> 11) & 0x1F)) +#define GET_RGB565_G(color) ((BYTE)(((color) >> 5) & 0x3F)) +#define GET_RGB565_B(color) ((BYTE)(((color) >> 0) & 0x1F)) +#define MAKE_RGB565(r, g, b) ((WORD)(((BYTE)(r) << 11) | ((BYTE)(g) << 5) | (BYTE)(b))) +#define MAKE_ARGB(a, r, g, b) (((DWORD)(a) << 24) | ((DWORD)(r) << 16) | ((DWORD)(g) << 8) | (DWORD)(b)) + #define DDPF_ALPHAPIXELS 0x00000001 #define DDPF_ALPHA 0x00000002 #define DDPF_FOURCC 0x00000004 @@ -211,6 +217,13 @@ static DXGI_FORMAT compressed_formats[] = { static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *, UINT, UINT, UINT, IWICBitmapFrameDecode **); +static DWORD rgb565_to_argb(WORD color, BYTE alpha) +{ + return MAKE_ARGB(alpha, (GET_RGB565_R(color) * 0xFF + 0x0F) / 0x1F, + (GET_RGB565_G(color) * 0xFF + 0x1F) / 0x3F, + (GET_RGB565_B(color) * 0xFF + 0x0F) / 0x1F); +} + static inline BOOL has_extended_header(DDS_HEADER *header) { return (header->ddspf.flags & DDPF_FOURCC) && @@ -470,6 +483,117 @@ end: return bpp; } +static void decode_block(const BYTE *block_data, UINT block_count, DXGI_FORMAT format, + UINT width, UINT height, DWORD *buffer) +{ + const BYTE *block, *color_indices, *alpha_indices, *alpha_table; + int i, j, x, y, block_x, block_y, color_index, alpha_index; + int block_size, color_offset, color_indices_offset; + WORD color[4], color_value = 0; + BYTE alpha[8], alpha_value = 0; + + if (format == DXGI_FORMAT_BC1_UNORM) { + block_size = 8; + color_offset = 0; + color_indices_offset = 4; + } else { + block_size = 16; + color_offset = 8; + color_indices_offset = 12; + } + block_x = 0; + block_y = 0; + + for (i = 0; i < block_count; i++) + { + block = block_data + i * block_size; + + color[0] = *((WORD *)(block + color_offset)); + color[1] = *((WORD *)(block + color_offset + 2)); + color[2] = MAKE_RGB565(((GET_RGB565_R(color[0]) * 2 + GET_RGB565_R(color[1]) + 1) / 3), + ((GET_RGB565_G(color[0]) * 2 + GET_RGB565_G(color[1]) + 1) / 3), + ((GET_RGB565_B(color[0]) * 2 + GET_RGB565_B(color[1]) + 1) / 3)); + color[3] = MAKE_RGB565(((GET_RGB565_R(color[0]) + GET_RGB565_R(color[1]) * 2 + 1) / 3), + ((GET_RGB565_G(color[0]) + GET_RGB565_G(color[1]) * 2 + 1) / 3), + ((GET_RGB565_B(color[0]) + GET_RGB565_B(color[1]) * 2 + 1) / 3)); + + switch (format) + { + case DXGI_FORMAT_BC1_UNORM: + if (color[0] <= color[1]) { + color[2] = MAKE_RGB565(((GET_RGB565_R(color[0]) + GET_RGB565_R(color[1]) + 1) / 2), + ((GET_RGB565_G(color[0]) + GET_RGB565_G(color[1]) + 1) / 2), + ((GET_RGB565_B(color[0]) + GET_RGB565_B(color[1]) + 1) / 2)); + color[3] = 0; + } + break; + case DXGI_FORMAT_BC2_UNORM: + alpha_table = block; + break; + case DXGI_FORMAT_BC3_UNORM: + alpha[0] = *block; + alpha[1] = *(block + 1); + if (alpha[0] > alpha[1]) { + for (j = 2; j < 8; j++) + { + alpha[j] = (BYTE)((alpha[0] * (8 - j) + alpha[1] * (j - 1) + 3) / 7); + } + } else { + for (j = 2; j < 6; j++) + { + alpha[j] = (BYTE)((alpha[0] * (6 - j) + alpha[1] * (j - 1) + 2) / 5); + } + alpha[6] = 0; + alpha[7] = 0xFF; + } + alpha_indices = block + 2; + break; + default: + break; + } + + color_indices = block + color_indices_offset; + for (j = 0; j < 16; j++) + { + x = block_x + j % 4; + y = block_y + j / 4; + if (x >= width || y >= height) continue; + + color_index = (color_indices[j / 4] >> ((j % 4) * 2)) & 0x3; + color_value = color[color_index]; + + switch (format) + { + case DXGI_FORMAT_BC1_UNORM: + if ((color[0] <= color[1]) && !color_value) { + color_value = 0; + alpha_value = 0; + } else { + alpha_value = 0xFF; + } + break; + case DXGI_FORMAT_BC2_UNORM: + alpha_value = (alpha_table[j / 2] >> (j % 2) * 4) & 0xF; + alpha_value = (BYTE)((alpha_value * 0xFF + 0x7)/ 0xF); + break; + case DXGI_FORMAT_BC3_UNORM: + alpha_index = (*((DWORD *)(alpha_indices + (j / 8) * 3)) >> ((j % 8) * 3)) & 0x7; + alpha_value = alpha[alpha_index]; + break; + default: + break; + } + buffer[x + y * width] = rgb565_to_argb(color_value, alpha_value); + } + + block_x += DDS_BLOCK_WIDTH; + if (block_x >= width) { + block_x = 0; + block_y += DDS_BLOCK_HEIGHT; + } + } +} + static inline DdsDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) { return CONTAINING_RECORD(iface, DdsDecoder, IWICBitmapDecoder_iface); @@ -629,6 +753,8 @@ static HRESULT WINAPI DdsFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, hr = E_OUTOFMEMORY; goto end; } + decode_block(This->block_data, This->info.width_in_blocks * This->info.height_in_blocks, This->info.format, + This->info.width, This->info.height, (DWORD *)This->pixel_data); } hr = copy_pixels(bpp, This->pixel_data, This->info.width, This->info.height, frame_stride, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 790c28315a..43f266d392 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1116,7 +1116,6 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra 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) { - todo_wine ok(color_buffer_match((DWORD *)pixels, (DWORD *)buffer, 1), "Test %u, frame %u: Pixels mismatch\n", i, frame_index); } @@ -1124,7 +1123,6 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra 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) { - todo_wine ok(color_buffer_match((DWORD *)pixels, (DWORD *)buffer, frame_size / (bpp / 8)), "Test %u, frame %u: Pixels mismatch\n", i, frame_index); }

1 0