wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Zhiyi Zhang : winex11.drv: Initialize new display device registry display settings.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 2b484b1ac7a5510be54cb5341143d89dc1924b37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b484b1ac7a5510be54cb534… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 17 16:36:33 2020 +0800 winex11.drv: Initialize new display device registry display settings. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 32 ++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrandr.c | 2 ++ 3 files changed, 35 insertions(+) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 2d1fc7220d..c4929e9b58 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -177,6 +177,38 @@ void X11DRV_Settings_Init(void) X11DRV_Settings_SetHandler(&nores_handler); } +/* Initialize registry display settings when new display devices are added */ +void init_registry_display_settings(void) +{ + DEVMODEW dm = {.dmSize = sizeof(dm)}; + DISPLAY_DEVICEW dd = {sizeof(dd)}; + DWORD i = 0; + LONG ret; + + while (EnumDisplayDevicesW(NULL, i++, &dd, 0)) + { + /* Skip if the device already has registry display settings */ + if (EnumDisplaySettingsExW(dd.DeviceName, ENUM_REGISTRY_SETTINGS, &dm, 0)) + continue; + + if (!EnumDisplaySettingsExW(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm, 0)) + { + ERR("Failed to query current display settings for %s.\n", wine_dbgstr_w(dd.DeviceName)); + continue; + } + + TRACE("Device %s current display mode %ux%u %ubits %uHz at %d,%d.\n", + wine_dbgstr_w(dd.DeviceName), dm.dmPelsWidth, dm.dmPelsHeight, dm.dmBitsPerPel, + dm.dmDisplayFrequency, dm.u1.s2.dmPosition.x, dm.u1.s2.dmPosition.y); + + ret = ChangeDisplaySettingsExW(dd.DeviceName, &dm, NULL, + CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL); + if (ret != DISP_CHANGE_SUCCESSFUL) + ERR("Failed to save registry display settings for %s, returned %d.\n", + wine_dbgstr_w(dd.DeviceName), ret); + } +} + static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, unsigned len) { static const WCHAR display[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4a7a0e12d4..233891f7b0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -701,6 +701,7 @@ extern void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *han extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(BOOL) DECLSPEC_HIDDEN; +extern void init_registry_display_settings(void) DECLSPEC_HIDDEN; extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern BOOL is_detached_mode(const DEVMODEW *) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 155bd85d81..faeb4d98d9 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1072,6 +1072,8 @@ static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) * ChangeDisplaySettings(). Otherwise, ChangeDisplaySettings() would send multiple * WM_DISPLAYCHANGE messages instead of just one */ X11DRV_DisplayDevices_Update( FALSE ); + + init_registry_display_settings(); } return FALSE; }

1 0

Zhiyi Zhang : winex11.drv: Report a GPU same as the host primary GPU in virtual desktop mode.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: aadae4d1ea173dfa30e09d6cc816bb174e35f90d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aadae4d1ea173dfa30e09d6c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 17 16:36:23 2020 +0800 winex11.drv: Report a GPU same as the host primary GPU in virtual desktop mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49631 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 7 ++++++- dlls/winex11.drv/display.c | 15 +++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 64f61d21e4..b517e44e15 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -212,7 +212,12 @@ static BOOL X11DRV_desktop_get_gpus( struct x11drv_gpu **new_gpus, int *count ) gpu = heap_calloc( 1, sizeof(*gpu) ); if (!gpu) return FALSE; - lstrcpyW( gpu->name, wine_adapterW ); + if (!get_host_primary_gpu( gpu )) + { + WARN( "Failed to get host primary gpu.\n" ); + lstrcpyW( gpu->name, wine_adapterW ); + } + *new_gpus = gpu; *count = 1; return TRUE; diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 27876e02df..3e9e4474d4 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -259,6 +259,21 @@ RECT get_host_primary_monitor_rect(void) return rect; } +BOOL get_host_primary_gpu(struct x11drv_gpu *gpu) +{ + struct x11drv_gpu *gpus; + INT gpu_count; + + if (host_handler.get_gpus(&gpus, &gpu_count) && gpu_count) + { + *gpu = gpus[0]; + host_handler.free_gpus(gpus); + return TRUE; + } + + return FALSE; +} + RECT get_work_area(const RECT *monitor_rect) { Atom type; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 375fd1465f..4a7a0e12d4 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -792,6 +792,7 @@ struct x11drv_display_device_handler }; extern HANDLE get_display_device_init_mutex(void) DECLSPEC_HIDDEN; +extern BOOL get_host_primary_gpu(struct x11drv_gpu *gpu) DECLSPEC_HIDDEN; extern void release_display_device_init_mutex(HANDLE) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : combase: Add CoSetErrorInfo() as an alias for SetErrorInfo().
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 41acd014d8617f4eab54da3e584caacbe0b511ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=41acd014d8617f4eab54da3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 17 10:20:53 2020 +0300 combase: Add CoSetErrorInfo() as an alias for SetErrorInfo(). 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/combase/combase.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 608fe84af8..8a91088ca4 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -155,7 +155,7 @@ @ stdcall CoRevokeInitializeSpy(int64) ole32.CoRevokeInitializeSpy @ stdcall CoRevokeMallocSpy() @ stub CoSetCancelObject -@ stub CoSetErrorInfo +@ stdcall CoSetErrorInfo(long ptr) SetErrorInfo @ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) @ stdcall CoSuspendClassObjects() ole32.CoSuspendClassObjects @ stdcall CoSwitchCallContext(ptr ptr) ole32.CoSwitchCallContext

1 0

Nikolay Sivov : combase: Move SetErrorInfo().
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: f26b1f0392714891bbd8c603de072818cc65e45f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f26b1f0392714891bbd8c603… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 17 10:20:52 2020 +0300 combase: Move SetErrorInfo(). 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/combase/combase.spec | 2 +- dlls/combase/errorinfo.c | 26 ++++++++++++++++ dlls/ole32/Makefile.in | 1 - dlls/ole32/errorinfo.c | 77 ----------------------------------------------- dlls/ole32/ole32.spec | 2 +- 5 files changed, 28 insertions(+), 80 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index cd8ed1c635..608fe84af8 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -317,7 +317,7 @@ @ stdcall RoUninitialize() @ stub RoUnregisterForApartmentShutdown @ stub SetCleanupFlag -@ stdcall SetErrorInfo(long ptr) ole32.SetErrorInfo +@ stdcall SetErrorInfo(long ptr) @ stub SetRestrictedErrorInfo @ stdcall StringFromCLSID(ptr ptr) @ stdcall StringFromGUID2(ptr ptr long) diff --git a/dlls/combase/errorinfo.c b/dlls/combase/errorinfo.c index aac00fd4eb..83e2f0b710 100644 --- a/dlls/combase/errorinfo.c +++ b/dlls/combase/errorinfo.c @@ -384,3 +384,29 @@ HRESULT WINAPI GetErrorInfo(ULONG reserved, IErrorInfo **error_info) return S_OK; } + +/*********************************************************************** + * SetErrorInfo (combase.@) + */ +HRESULT WINAPI SetErrorInfo(ULONG reserved, IErrorInfo *error_info) +{ + struct tlsdata *tlsdata; + HRESULT hr; + + TRACE("%u, %p\n", reserved, error_info); + + if (reserved) + return E_INVALIDARG; + + if (FAILED(hr = com_get_tlsdata(&tlsdata))) + return hr; + + if (tlsdata->errorinfo) + IErrorInfo_Release(tlsdata->errorinfo); + + tlsdata->errorinfo = error_info; + if (error_info) + IErrorInfo_AddRef(error_info); + + return S_OK; +} diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 86f13e188c..a113c7622b 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -17,7 +17,6 @@ C_SRCS = \ datacache.c \ defaulthandler.c \ dictionary.c \ - errorinfo.c \ filelockbytes.c \ filemoniker.c \ ftmarshal.c \ diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c deleted file mode 100644 index d36c6c8c0f..0000000000 --- a/dlls/ole32/errorinfo.c +++ /dev/null @@ -1,77 +0,0 @@ -/* - * ErrorInfo API - * - * Copyright 2000 Patrik Stridvall, Juergen Schmied - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * NOTES: - * - * The errorinfo is a per-thread object. The reference is stored in the - * TEB at offset 0xf80. - */ - -#include <stdarg.h> -#include <string.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "oleauto.h" -#include "winerror.h" - -#include "compobj_private.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ole); - -/*********************************************************************** - * SetErrorInfo (OLE32.@) - * - * Sets the error information object for the current thread. - * - * PARAMS - * dwReserved [I] Reserved. Must be zero. - * perrinfo [I] Error info object. - * - * RETURNS - * Success: S_OK. - * Failure: E_INVALIDARG if dwReserved is not zero. - */ -HRESULT WINAPI SetErrorInfo(ULONG dwReserved, IErrorInfo *perrinfo) -{ - IErrorInfo * pei; - - TRACE("(%d, %p)\n", dwReserved, perrinfo); - - if (dwReserved) - { - ERR("dwReserved (0x%x) != 0\n", dwReserved); - return E_INVALIDARG; - } - - /* release old errorinfo */ - pei = COM_CurrentInfo()->errorinfo; - if (pei) IErrorInfo_Release(pei); - - /* set to new value */ - COM_CurrentInfo()->errorinfo = perrinfo; - if (perrinfo) IErrorInfo_AddRef(perrinfo); - - return S_OK; -} diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index fb78ab8b6f..f21f6429ca 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -262,7 +262,7 @@ @ stdcall STGMEDIUM_UserUnmarshal(ptr ptr ptr) @ stdcall SetConvertStg(ptr long) @ stub SetDocumentBitStg -@ stdcall SetErrorInfo(long ptr) +@ stdcall SetErrorInfo(long ptr) combase.SetErrorInfo @ stdcall StgConvertPropertyToVariant(ptr long ptr ptr) @ stdcall StgConvertVariantToProperty(ptr long ptr ptr long long ptr) @ stdcall StgCreateDocfile(wstr long long ptr)

1 0

Nikolay Sivov : combase: Add CoGetErrorInfo() as an alias for GetErrorInfo().
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: ed092274c40e448e5b39ec280314d4c67e18d550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed092274c40e448e5b39ec28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 17 10:20:51 2020 +0300 combase: Add CoGetErrorInfo() as an alias for GetErrorInfo(). 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/combase/combase.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index e5ffc21479..cd8ed1c635 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -107,7 +107,7 @@ @ stdcall CoGetCurrentLogicalThreadId(ptr) ole32.CoGetCurrentLogicalThreadId @ stdcall CoGetCurrentProcess() ole32.CoGetCurrentProcess @ stdcall CoGetDefaultContext(long ptr ptr) -@ stub CoGetErrorInfo +@ stdcall CoGetErrorInfo(long ptr) GetErrorInfo @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr)

1 0

Nikolay Sivov : combase: Move GetErrorInfo().
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 826f24cefd6cf0c8b1f8790102421cff7967299a URL: https://source.winehq.org/git/wine.git/?a=commit;h=826f24cefd6cf0c8b1f87901… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 17 10:20:50 2020 +0300 combase: Move GetErrorInfo(). 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/combase/combase.spec | 2 +- dlls/combase/combase_private.h | 10 ++++++++++ dlls/combase/errorinfo.c | 30 +++++++++++++++++++++++++++++ dlls/ole32/errorinfo.c | 43 ------------------------------------------ dlls/ole32/ole32.spec | 2 +- 5 files changed, 42 insertions(+), 45 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 1298fedd9e..e5ffc21479 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -182,7 +182,7 @@ @ stdcall FreePropVariantArray(long ptr) @ stub FreePropVariantArrayWorker @ stub GetCatalogHelper -@ stdcall GetErrorInfo(long ptr) ole32.GetErrorInfo +@ stdcall GetErrorInfo(long ptr) @ stub GetFuncDescs @ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream @ stub GetHookInterface diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 5ba9c84650..bae57e8948 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -14,6 +14,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "winternl.h" + #include "wine/list.h" struct apartment; @@ -40,3 +42,11 @@ struct tlsdata struct list spies; /* Spies installed with CoRegisterInitializeSpy */ DWORD spies_lock; }; + +extern HRESULT WINAPI InternalTlsAllocData(struct tlsdata **data); + +static inline HRESULT com_get_tlsdata(struct tlsdata **data) +{ + *data = NtCurrentTeb()->ReservedForOle; + return *data ? S_OK : InternalTlsAllocData(data); +} diff --git a/dlls/combase/errorinfo.c b/dlls/combase/errorinfo.c index 3fcc65a31e..aac00fd4eb 100644 --- a/dlls/combase/errorinfo.c +++ b/dlls/combase/errorinfo.c @@ -22,6 +22,8 @@ #include "oleauto.h" +#include "combase_private.h" + #include "wine/debug.h" #include "wine/heap.h" @@ -354,3 +356,31 @@ HRESULT WINAPI CreateErrorInfo(ICreateErrorInfo **ret) return S_OK; } + +/*********************************************************************** + * GetErrorInfo (combase.@) + */ +HRESULT WINAPI GetErrorInfo(ULONG reserved, IErrorInfo **error_info) +{ + struct tlsdata *tlsdata; + HRESULT hr; + + TRACE("%u, %p\n", reserved, error_info); + + if (reserved || !error_info) + return E_INVALIDARG; + + if (FAILED(hr = com_get_tlsdata(&tlsdata))) + return hr; + + if (!tlsdata->errorinfo) + { + *error_info = NULL; + return S_FALSE; + } + + *error_info = tlsdata->errorinfo; + tlsdata->errorinfo = NULL; + + return S_OK; +} diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index 45591ba4a1..d36c6c8c0f 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -40,49 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -/*********************************************************************** - * GetErrorInfo (OLE32.@) - * - * Retrieves the error information object for the current thread. - * - * PARAMS - * dwReserved [I]. Reserved. Must be zero. - * pperrinfo [O]. Address where error information object will be stored on return. - * - * RETURNS - * Success: S_OK if an error information object was set for the current thread. - * S_FALSE if otherwise. - * Failure: E_INVALIDARG if dwReserved is not zero. - * - * NOTES - * This function causes the current error info object for the thread to be - * cleared if one was set beforehand. - */ -HRESULT WINAPI GetErrorInfo(ULONG dwReserved, IErrorInfo **pperrinfo) -{ - TRACE("(%d, %p, %p)\n", dwReserved, pperrinfo, COM_CurrentInfo()->errorinfo); - - if (dwReserved) - { - ERR("dwReserved (0x%x) != 0\n", dwReserved); - return E_INVALIDARG; - } - - if(!pperrinfo) return E_INVALIDARG; - - if (!COM_CurrentInfo()->errorinfo) - { - *pperrinfo = NULL; - return S_FALSE; - } - - *pperrinfo = COM_CurrentInfo()->errorinfo; - - /* clear thread error state */ - COM_CurrentInfo()->errorinfo = NULL; - return S_OK; -} - /*********************************************************************** * SetErrorInfo (OLE32.@) * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 7b2c583661..fb78ab8b6f 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -118,7 +118,7 @@ @ stdcall GetClassFile(wstr ptr) @ stdcall GetConvertStg(ptr) @ stub GetDocumentBitStg -@ stdcall GetErrorInfo(long ptr) +@ stdcall GetErrorInfo(long ptr) combase.GetErrorInfo @ stdcall GetHGlobalFromILockBytes(ptr ptr) @ stdcall GetHGlobalFromStream(ptr ptr) @ stub GetHookInterface

1 0

Nikolay Sivov : combase: Add a function to allocate OLE thread data.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 6153eefcbaff492bf08ed19dba5c7e1b4e94c5dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6153eefcbaff492bf08ed19d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 17 10:20:49 2020 +0300 combase: Add a function to allocate OLE thread data. 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/combase/combase.c | 16 ++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/combase/combase_private.h | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/compobj_private.h | 11 +++++------ 4 files changed, 64 insertions(+), 7 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 8d8d83005b..cceb36a593 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -27,6 +27,8 @@ #include "oleauto.h" #include "winternl.h" +#include "combase_private.h" + #include "wine/debug.h" #include "wine/heap.h" @@ -223,6 +225,20 @@ static HRESULT open_key_for_clsid(REFCLSID clsid, const WCHAR *keyname, REGSAM a return S_OK; } +/*********************************************************************** + * InternalTlsAllocData (combase.@) + */ +HRESULT WINAPI InternalTlsAllocData(struct tlsdata **data) +{ + if (!(*data = heap_alloc_zero(sizeof(**data)))) + return E_OUTOFMEMORY; + + list_init(&(*data)->spies); + NtCurrentTeb()->ReservedForOle = *data; + + return S_OK; +} + /*********************************************************************** * FreePropVariantArray (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 0f34dc6918..1298fedd9e 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -274,7 +274,7 @@ @ stub InternalSetAptCallCtrlOnTlsIfRequired @ stub InternalSetOleThunkWowPtr @ stub InternalStubInvoke -@ stub InternalTlsAllocData +@ stdcall InternalTlsAllocData(ptr) @ stub InternalUnmarshalObjRef @ stub IsErrorPropagationEnabled @ stub NdrExtStubInitialize diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h new file mode 100644 index 0000000000..5ba9c84650 --- /dev/null +++ b/dlls/combase/combase_private.h @@ -0,0 +1,42 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/list.h" + +struct apartment; + +/* this is what is stored in TEB->ReservedForOle */ +struct tlsdata +{ + struct apartment *apt; + IErrorInfo *errorinfo; + DWORD thread_seqid;/* returned with CoGetCurrentProcess */ + DWORD apt_mask; /* apartment mask (+0Ch on x86) */ + void *unknown0; + DWORD inits; /* number of times CoInitializeEx called */ + DWORD ole_inits; /* number of times OleInitialize called */ + GUID causality_id; /* unique identifier for each COM call */ + LONG pending_call_count_client; /* number of client calls pending */ + LONG pending_call_count_server; /* number of server calls pending */ + DWORD unknown; + IObjContext *context_token; /* (+38h on x86) */ + IUnknown *call_state; /* current call context (+3Ch on x86) */ + DWORD unknown2[46]; + IUnknown *cancel_object; /* cancel object set by CoSetCancelObject (+F8h on x86) */ + IUnknown *state; /* see CoSetState */ + struct list spies; /* Spies installed with CoRegisterInitializeSpy */ + DWORD spies_lock; +}; diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index b64dfbf4f4..5d7bf50b73 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -269,16 +269,15 @@ APARTMENT *apartment_get_current_or_mta(void) DECLSPEC_HIDDEN; * Per-thread values are stored in the TEB on offset 0xF80 */ +extern HRESULT WINAPI InternalTlsAllocData(struct oletls **tlsdata); + /* will create if necessary */ static inline struct oletls *COM_CurrentInfo(void) { + struct oletls *oletls; + if (!NtCurrentTeb()->ReservedForOle) - { - struct oletls *oletls = heap_alloc_zero(sizeof(*oletls)); - if (oletls) - list_init(&oletls->spies); - NtCurrentTeb()->ReservedForOle = oletls; - } + InternalTlsAllocData(&oletls); return NtCurrentTeb()->ReservedForOle; }

1 0

Ziqing Hui : windowscodecs/tests: Add tests for decoding BC1 format.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 6b5579b65fdb678715fd0760ba9c74c06e39b46b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b5579b65fdb678715fd0760… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Aug 17 10:24:13 2020 +0800 windowscodecs/tests: Add tests for decoding BC1 format. 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/tests/ddsformat.c | 104 +++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 2d5afa8e6e..989f4317c0 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -24,6 +24,12 @@ #include "wincodec.h" #include "wine/test.h" +#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)) + /* 1x1 uncompressed(Alpha) DDS image */ static BYTE test_dds_alpha[] = { 'D', 'D', 'S', ' ', 0x7C, 0x00, 0x00, 0x00, 0x07, 0x10, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, @@ -529,6 +535,81 @@ end: return bpp; } +static DWORD rgb565_to_argb(WORD color, BOOL has_alpha) +{ + return (has_alpha && !color) ? 0: MAKE_ARGB(0xFF, (GET_RGB565_R(color) * 0xFF + 0x0F) / 0x1F, + (GET_RGB565_G(color) * 0xFF + 0x1F) / 0x3F, + (GET_RGB565_B(color) * 0xFF + 0x0F) / 0x1F); +} + +static void decode_bc1(const BYTE *blocks, UINT block_count, UINT width, UINT height, DWORD *buffer) +{ + static const UINT BLOCK_SIZE = 8; + + UINT stride = (width + 3) / 4 * 4; + int i, j, color_index, pixel_index = 0; + const BYTE *block, *color_indices; + DWORD *pixel = buffer; + BOOL has_alpha; + WORD color[4]; + + for (i = 0; i < block_count; i++) + { + block = blocks + i * BLOCK_SIZE; + color[0] = *((WORD *)block); + color[1] = *((WORD *)block + 1); + has_alpha = color[0] <= color[1]; + if (has_alpha) { + 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; + } else { + 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)); + } + + color_indices = blocks + 4; + for (j = 0; j < 16; j++, pixel_index++) + { + if ((pixel_index % stride >= width) || + (pixel_index / stride >= height)) continue; + + color_index = (color_indices[j / 4] >> ((j % 4) * 2)) & 0x3; + *pixel = rgb565_to_argb(color[color_index], has_alpha); + pixel++; + } + } +} + +static BOOL color_match(DWORD color_a, DWORD color_b) +{ + static const int tolerance = 8; + + const int da = abs((int)((color_a & 0xFF000000) >> 24) - (int)((color_b & 0xFF000000) >> 24)); + const int dr = abs((int)((color_a & 0x00FF0000) >> 16) - (int)((color_b & 0x00FF0000) >> 16)); + const int dg = abs((int)((color_a & 0x0000FF00) >> 8) - (int)((color_b & 0x0000FF00) >> 8)); + const int db = abs((int)((color_a & 0x000000FF) >> 0) - (int)((color_b & 0x000000FF) >> 0)); + + return (da <= tolerance && dr <= tolerance && dg <= tolerance && db <= tolerance); +} + +static BOOL color_buffer_match(DWORD *color_buffer_a, DWORD *color_buffer_b, UINT color_count) +{ + UINT i; + + for (i = 0; i < color_count; i++) + { + if (!color_match(color_buffer_a[i], color_buffer_b[i])) return FALSE; + } + + return TRUE; +} + static void test_dds_decoder_initialize(void) { int i; @@ -799,6 +880,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra 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]; 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; @@ -909,6 +991,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra bpp = get_pixel_format_bpp(&pixel_format); stride = rect.Width * bpp / 8; frame_stride = frame_width * bpp / 8; + frame_size = frame_stride * frame_height; hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, 0, 0, NULL); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); @@ -952,6 +1035,27 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), NULL); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); + + if (format_info.DxgiFormat == DXGI_FORMAT_BC1_UNORM) { + decode_bc1(test_data[i].data + block_offset, width_in_blocks * height_in_blocks, frame_width, frame_height, pixels); + + 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); + } + + + 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); + } + } } static void test_dds_decoder_frame(IWICBitmapDecoder *decoder, int i)

1 0

Ziqing Hui : windowscodecs: Add tests and initial implementation for DdsFrameDecode_CopyPixels().
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: f178907850baae416be5bfcedb0c043ae109eede URL: https://source.winehq.org/git/wine.git/?a=commit;h=f178907850baae416be5bfce… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Aug 17 10:23:47 2020 +0800 windowscodecs: Add tests and initial implementation 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 | 31 +++++++++++- dlls/windowscodecs/tests/ddsformat.c | 91 ++++++++++++++++++++++++++++++++++-- 2 files changed, 115 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 9f6aab4e91..12b6c42f64 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -589,9 +589,36 @@ static HRESULT WINAPI DdsFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, static HRESULT WINAPI DdsFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - FIXME("(%p,%s,%u,%u,%p): stub.\n", iface, debug_wic_rect(prc), cbStride, cbBufferSize, pbBuffer); + DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); + UINT bpp, frame_stride, frame_size; + INT x, y, width, height; - return E_NOTIMPL; + TRACE("(%p,%s,%u,%u,%p)\n", iface, debug_wic_rect(prc), cbStride, cbBufferSize, pbBuffer); + + if (!pbBuffer) return E_INVALIDARG; + + bpp = This->info.pixel_format_bpp; + frame_stride = This->info.width * bpp / 8; + frame_size = frame_stride * This->info.height; + 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; + } + if (cbStride < width * bpp / 8) return E_INVALIDARG; + if (cbBufferSize < cbStride * height) return WINCODEC_ERR_INSUFFICIENTBUFFER; + + return S_OK; } static HRESULT WINAPI DdsFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 49de7e566e..2d5afa8e6e 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -506,6 +506,29 @@ static BOOL has_extended_header(const BYTE *data) return data[84] == 'D' && data[85] == 'X' && data[86] == '1' && data[87] == '0'; } +static UINT get_pixel_format_bpp(GUID *pixel_format) +{ + HRESULT hr; + UINT bpp = 0; + IWICComponentInfo *info = NULL; + IWICPixelFormatInfo* format_info = NULL; + + hr = IWICImagingFactory_CreateComponentInfo(factory, pixel_format, &info); + ok(hr == S_OK, "CreateComponentInfo failed, hr %#x\n", hr); + if (hr != S_OK) goto end; + hr = IWICComponentInfo_QueryInterface(info, &IID_IWICPixelFormatInfo, (void **)&format_info); + ok(hr == S_OK, "QueryInterface failed, hr %#x\n", hr); + if (hr != S_OK) goto end; + hr = IWICPixelFormatInfo_GetBitsPerPixel(format_info, &bpp); + ok(hr == S_OK, "GetBitsPerPixel failed, hr %#x\n", hr); + +end: + if (format_info) IWICPixelFormatInfo_Release(format_info); + if (info) IWICComponentInfo_Release(info); + + return bpp; +} + static void test_dds_decoder_initialize(void) { int i; @@ -767,19 +790,26 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod i, frame_index, debugstr_guid(test_data[i].expected_pixel_format), debugstr_guid(&pixel_format)); } -static void test_dds_decoder_frame_data(IWICDdsFrameDecode *dds_frame, UINT frame_count, WICDdsParameters *params, - int i, int frame_index) +static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFrameDecode *dds_frame, UINT frame_count, + WICDdsParameters *params, int i, int frame_index) { HRESULT hr; + GUID pixel_format; 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[256]; - UINT stride, frame_stride, frame_size, width_in_blocks, height_in_blocks; + BYTE buffer[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; int slice_index; + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &pixel_format); + ok(hr == S_OK, "Test %u, frame %u: GetPixelFormat failed, hr %#x\n", i, frame_index, hr); + if (hr != S_OK) return; + hr = IWICBitmapFrameDecode_GetSize(frame, &frame_width, &frame_height); + ok(hr == S_OK, "Test %u, frame %u: GetSize failed, hr %#x\n", i, frame_index, hr); + if (hr != S_OK) return; hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, &format_info); ok(hr == S_OK, "Test %u, frame %u: GetFormatInfo failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; @@ -790,6 +820,8 @@ static void test_dds_decoder_frame_data(IWICDdsFrameDecode *dds_frame, UINT fram frame_stride = width_in_blocks * format_info.BytesPerBlock; frame_size = frame_stride * height_in_blocks; + /* CopyBlocks tests */ + hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, 0, 0, NULL); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); @@ -871,6 +903,55 @@ static void test_dds_decoder_frame_data(IWICDdsFrameDecode *dds_frame, UINT fram if (hr != S_OK) return; ok(!strncmp((const char *)test_data[i].data + block_offset, (const char *)buffer, frame_size), "Test %u, frame %u: Block data mismatch\n", i, frame_index); + + /* CopyPixels tests */ + + bpp = get_pixel_format_bpp(&pixel_format); + stride = rect.Width * bpp / 8; + frame_stride = frame_width * bpp / 8; + + hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, 0, 0, NULL); + ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect_test_a, stride, sizeof(buffer), buffer); + ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect_test_b, stride, sizeof(buffer), buffer); + ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect_test_c, stride, sizeof(buffer), buffer); + ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect_test_d, stride, sizeof(buffer), buffer); + ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + + hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, frame_stride - 1, sizeof(buffer), buffer); + ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, frame_stride * 2, sizeof(buffer), buffer); + ok(hr == S_OK, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, frame_stride, sizeof(buffer), buffer); + ok(hr == S_OK, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, frame_stride, frame_stride * frame_height - 1, buffer); + ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, frame_stride, frame_stride * frame_height, buffer); + ok(hr == S_OK, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, 0, sizeof(buffer), buffer); + ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride - 1, sizeof(buffer), buffer); + ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride * 2, sizeof(buffer), buffer); + ok(hr == S_OK, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, 0, buffer); + ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, 1, buffer); + ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER || (hr == S_OK && test_data[i].expected_bytes_per_block == 1), + "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, stride * rect.Height - 1, buffer); + ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, stride * rect.Height, buffer); + ok(hr == S_OK, "Test %u, frame %u: CopyPixels got unexpected hr %#x\n", i, frame_index, hr); + + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), NULL); + ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); } static void test_dds_decoder_frame(IWICBitmapDecoder *decoder, int i) @@ -905,7 +986,7 @@ static void test_dds_decoder_frame(IWICBitmapDecoder *decoder, int i) if (hr != S_OK) goto next; test_dds_decoder_frame_properties(frame_decode, dds_frame, frame_count, &params, i, j); - test_dds_decoder_frame_data(dds_frame, frame_count, &params, i, j); + test_dds_decoder_frame_data(frame_decode, dds_frame, frame_count, &params, i, j); next: if (frame_decode) IWICBitmapFrameDecode_Release(frame_decode);

1 0

Ziqing Hui : windowscodecs: Introduce get_pixel_format_bpp().
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: bec58b5e9c250cd337fc6c694e1c14531bdaa372 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bec58b5e9c250cd337fc6c69… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Aug 17 10:23:14 2020 +0800 windowscodecs: Introduce 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 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 87cbf4df91..9f6aab4e91 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -131,6 +131,7 @@ typedef struct dds_frame_info { UINT width_in_blocks; UINT height_in_blocks; const GUID *pixel_format; + UINT pixel_format_bpp; } dds_frame_info; typedef struct DdsDecoder { @@ -446,6 +447,27 @@ 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 inline DdsDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) { return CONTAINING_RECORD(iface, DdsDecoder, IWICBitmapDecoder_iface); @@ -1090,6 +1112,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->data = HeapAlloc(GetProcessHeap(), 0, frame_size); hr = IStream_Seek(This->stream, seek, SEEK_SET, NULL); if (hr != S_OK) goto end;

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
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