May 2019 - Wine-commits - list.winehq.org

Paul Gofman : wined3d: Factor out compute_normal_matrix() function.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 57bb929e8a10a8faef37fa9753406f4075472f73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57bb929e8a10a8faef37fa97… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 15 18:06:52 2019 +0300 wined3d: Factor out compute_normal_matrix() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 289 +--------------------------------------- dlls/wined3d/utils.c | 294 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 5 + 3 files changed, 301 insertions(+), 287 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57bb929e8a10a8faef37…

1 0

Matteo Bruni : wined3d: Add ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE to core_extensions[].
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: cf0b9d4238680fcdc131c72baa0b992ac12fa948 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf0b9d4238680fcdc131c72b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed May 15 23:39:28 2019 +0200 wined3d: Add ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE to core_extensions[]. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index e2cd96f..2837f6e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3343,6 +3343,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_BUFFER_STORAGE, MAKEDWORD_VERSION(4, 4)}, {ARB_CLEAR_TEXTURE, MAKEDWORD_VERSION(4, 4)}, {ARB_QUERY_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 4)}, + {ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, MAKEDWORD_VERSION(4, 4)}, {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_CULL_DISTANCE, MAKEDWORD_VERSION(4, 5)},

1 0

Matteo Bruni : winecfg: Don't mark glu32 as builtin-only.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 1e145b12a745faba3ea9492b060fb14590251ed8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e145b12a745faba3ea9492b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed May 15 23:39:30 2019 +0200 winecfg: Don't mark glu32 as builtin-only. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/libraries.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index ee60978..a8c3e80 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -52,7 +52,6 @@ static const char * const builtin_only[] = "dbghelp", "ddraw", "gdi32", - "glu32", "gphoto2.ds", "icmp", "iphlpapi",

1 0

Matteo Bruni : wined3d: Always report support for ZBIAS and MIPMAPLODBIAS raster caps in the Vulkan backend.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 0f209a930112ea3a3e3f7fc3292072ac8fab9446 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f209a930112ea3a3e3f7fc3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed May 15 23:39:31 2019 +0200 wined3d: Always report support for ZBIAS and MIPMAPLODBIAS raster caps in the Vulkan backend. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index b8d94a0..57235bb 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -337,11 +337,11 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s | WINED3DPMISCCAPS_INDEPENDENTWRITEMASKS | WINED3DPMISCCAPS_POSTBLENDSRGBCONVERT; + caps->RasterCaps |= WINED3DPRASTERCAPS_ZBIAS | WINED3DPRASTERCAPS_MIPMAPLODBIAS; + if (sampler_anisotropy) { - caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY - | WINED3DPRASTERCAPS_ZBIAS - | WINED3DPRASTERCAPS_MIPMAPLODBIAS; + caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY; caps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC | WINED3DPTFILTERCAPS_MINFANISOTROPIC;

1 0

Matteo Bruni : wined3d: Report WINED3DPRASTERCAPS_MIPMAPLODBIAS only when supported.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 6f38a7443c12d0d8cbfa5d26433cb2a2b7bcd015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f38a7443c12d0d8cbfa5d26… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed May 15 23:39:32 2019 +0200 wined3d: Report WINED3DPRASTERCAPS_MIPMAPLODBIAS only when supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2837f6e..5524f94 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4345,11 +4345,13 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s if (gl_info->supported[ARB_FRAMEBUFFER_SRGB]) caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_POSTBLENDSRGBCONVERT; + if (gl_info->supported[ARB_SAMPLER_OBJECTS] || gl_info->supported[EXT_TEXTURE_LOD_BIAS]) + caps->RasterCaps |= WINED3DPRASTERCAPS_MIPMAPLODBIAS; + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) { caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY - | WINED3DPRASTERCAPS_ZBIAS - | WINED3DPRASTERCAPS_MIPMAPLODBIAS; + | WINED3DPRASTERCAPS_ZBIAS; caps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC | WINED3DPTFILTERCAPS_MINFANISOTROPIC;

1 0

Dmitry Timoshkov : windowscodecs: Correct IWICBitmapScaler::CopyPixels() error for not initialized case.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: b4035288b7e9b5645d37e3c53e60ab1416d74db8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4035288b7e9b5645d37e3c5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 16 10:53:00 2019 +0800 windowscodecs: Correct IWICBitmapScaler::CopyPixels() error for not initialized case. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/scaler.c | 2 +- dlls/windowscodecs/tests/bitmap.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index c6c758d..201cf5f 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -225,7 +225,7 @@ static HRESULT WINAPI BitmapScaler_CopyPixels(IWICBitmapScaler *iface, if (!This->source) { - hr = WINCODEC_ERR_WRONGSTATE; + hr = WINCODEC_ERR_NOTINITIALIZED; goto end; } diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 7480820..278c8a8 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -1163,6 +1163,7 @@ static void test_bitmap_scaler(void) double res_x, res_y; IWICBitmap *bitmap; UINT width, height; + BYTE buf[16]; HRESULT hr; hr = IWICImagingFactory_CreateBitmap(factory, 4, 2, &GUID_WICPixelFormat24bppBGR, WICBitmapCacheOnLoad, &bitmap); @@ -1240,6 +1241,9 @@ static void test_bitmap_scaler(void) hr = IWICBitmapScaler_GetSize(scaler, &width, &height); ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IWICBitmapScaler_CopyPixels(scaler, NULL, 1, sizeof(buf), buf); + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 0, 2, WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);

1 0

Dmitry Timoshkov : windowscodecs: Simplify some IMILBitmapScaler forwarders.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 6ebc9dd42fd25e2a89f33145168d24f1930638f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ebc9dd42fd25e2a89f33145… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 16 10:53:06 2019 +0800 windowscodecs: Simplify some IMILBitmapScaler forwarders. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/scaler.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 201cf5f..d6e56d0 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -416,12 +416,7 @@ static HRESULT WINAPI IMILBitmapScaler_GetSize(IMILBitmapScaler *iface, UINT *width, UINT *height) { BitmapScaler *This = impl_from_IMILBitmapScaler(iface); - TRACE("(%p,%p,%p)\n", iface, width, height); - - if (!This->source) - return WINCODEC_ERR_NOTINITIALIZED; - return IWICBitmapScaler_GetSize(&This->IWICBitmapScaler_iface, width, height); } @@ -452,12 +447,7 @@ static HRESULT WINAPI IMILBitmapScaler_GetResolution(IMILBitmapScaler *iface, double *dpix, double *dpiy) { BitmapScaler *This = impl_from_IMILBitmapScaler(iface); - TRACE("(%p,%p,%p)\n", iface, dpix, dpiy); - - if (!This->source) - return WINCODEC_ERR_NOTINITIALIZED; - return IWICBitmapScaler_GetResolution(&This->IWICBitmapScaler_iface, dpix, dpiy); } @@ -478,12 +468,7 @@ static HRESULT WINAPI IMILBitmapScaler_CopyPixels(IMILBitmapScaler *iface, const WICRect *rc, UINT stride, UINT size, BYTE *buffer) { BitmapScaler *This = impl_from_IMILBitmapScaler(iface); - TRACE("(%p,%p,%u,%u,%p)\n", iface, rc, stride, size, buffer); - - if (!This->source) - return WINCODEC_ERR_NOTINITIALIZED; - return IWICBitmapScaler_CopyPixels(&This->IWICBitmapScaler_iface, rc, stride, size, buffer); }

1 0

Huw Davies : ntdll: Mark monotonic_counter() as inline.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 6b47a72e4a3344665ea4f71b99606e86cb69ed51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b47a72e4a3344665ea4f71b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 16 10:20:31 2019 +0100 ntdll: Mark monotonic_counter() as inline. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 3b28113..20de627 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -103,7 +103,7 @@ static inline BOOL IsLeapYear(int Year) } /* return a monotonic time counter, in Win32 ticks */ -static ULONGLONG monotonic_counter(void) +static inline ULONGLONG monotonic_counter(void) { struct timeval now;

1 0

Zebediah Figura : strmbase: Get rid of BaseRendererImpl_Release().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 17ab5f977d2d20488e67f50f66464084ba8a617b URL: https://source.winehq.org/git/wine.git/?a=commit;h=17ab5f977d2d20488e67f50f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 15 18:17:00 2019 -0500 strmbase: Get rid of BaseRendererImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 11 ----------- include/wine/strmbase.h | 1 - 2 files changed, 12 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index fd6cf52..d263b20 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -301,17 +301,6 @@ void strmbase_renderer_cleanup(BaseRenderer *filter) BaseFilter_Destroy(&filter->filter); } -ULONG WINAPI BaseRendererImpl_Release(IBaseFilter* iface) -{ - BaseRenderer *This = impl_from_IBaseFilter(iface); - ULONG refCount = InterlockedDecrement(&This->filter.refCount); - - if (!refCount) - strmbase_renderer_cleanup(This); - - return refCount; -} - HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSample) { HRESULT hr = S_OK; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b561c76..18336c0 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -608,7 +608,6 @@ typedef struct BaseRendererFuncTable { } BaseRendererFuncTable; HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv); -ULONG WINAPI BaseRendererImpl_Release(IBaseFilter * iface); HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSample); HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface); HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart);

1 0

Zebediah Figura : setupapi: Implement SetupDiGetDeviceInstallParams().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 41701254715b72901aee09595a43698447e29103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41701254715b72901aee0959… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 15 22:56:06 2019 -0500 setupapi: Implement SetupDiGetDeviceInstallParams(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 62 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7440465..8c91960 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -118,6 +118,7 @@ struct device DEVINST devnode; struct list entry; BOOL removed; + SP_DEVINSTALL_PARAMS_W params; }; struct device_iface @@ -730,7 +731,7 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, TRACE("%p, %s, %s, %d\n", set, debugstr_guid(class), debugstr_w(instanceid), phantom); - if (!(device = heap_alloc(sizeof(*device)))) + if (!(device = heap_alloc_zero(sizeof(*device)))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; @@ -752,6 +753,7 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, device->devnode = alloc_devnode(device); device->removed = FALSE; list_add_tail(&set->devices, &device->entry); + device->params.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); if (phantom) RegSetValueExW(device->key, Phantom, 0, REG_DWORD, (const BYTE *)&one, sizeof(one)); @@ -3501,27 +3503,57 @@ BOOL WINAPI SetupDiCallClassInstaller( } /*********************************************************************** - * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) + * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstallParamsW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +BOOL WINAPI SetupDiGetDeviceInstallParamsW(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_W *params) { - FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); - return FALSE; + struct device *device; + + TRACE("devinfo %p, device_data %p, params %p.\n", devinfo, device_data, params); + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_W)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + *params = device->params; + + return TRUE; } /*********************************************************************** - * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) + * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstallParamsA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) +BOOL WINAPI SetupDiGetDeviceInstallParamsA(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_A *params) { - FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); - return FALSE; + SP_DEVINSTALL_PARAMS_W paramsW; + BOOL ret; + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_A)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + paramsW.cbSize = sizeof(paramsW); + ret = SetupDiGetDeviceInstallParamsW(devinfo, device_data, &paramsW); + params->Flags = paramsW.Flags; + params->FlagsEx = paramsW.FlagsEx; + params->hwndParent = paramsW.hwndParent; + params->InstallMsgHandler = paramsW.InstallMsgHandler; + params->InstallMsgHandlerContext = paramsW.InstallMsgHandlerContext; + params->FileQueue = paramsW.FileQueue; + params->ClassInstallReserved = paramsW.ClassInstallReserved; + params->Reserved = paramsW.Reserved; + WideCharToMultiByte(CP_ACP, 0, paramsW.DriverPath, -1, params->DriverPath, sizeof(params->DriverPath), NULL, NULL); + + return ret; } /***********************************************************************

1 0