January 2020 - Wine-Commits

Nikolay Sivov : mfplat: Add support for local MFT registration.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 97f646edabea52e136713830612eb737df3689dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=97f646edabea52e136713830… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 15:36:21 2020 +0300 mfplat: Add support for local MFT registration. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 214 ++++++++++++++++++++++++++++++++++++++------- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 104 ++++++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 288 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=97f646edabea52e13671…

1 0

Sven Baars : d3dx9/tests: Get rid of redundant handling for D3DXCreateFontA() failures.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: da62db437aca4a434ab88297ac78cbcd83f6152e URL: https://source.winehq.org/git/wine.git/?a=commit;h=da62db437aca4a434ab88297… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Jan 29 14:38:46 2020 +0100 d3dx9/tests: Get rid of redundant handling for D3DXCreateFontA() failures. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/core.c | 337 +++++++++++++++++++++++---------------------- 1 file changed, 173 insertions(+), 164 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da62db437aca4a434ab8…

1 0

Piotr Caban : msvcrt: Reimplement _set_new_mode function.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 6113a251ef3955f2ac3436d90a523faf4c03bc0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6113a251ef3955f2ac3436d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 14:27:35 2020 +0100 msvcrt: Reimplement _set_new_mode function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 52f800e824..31153fa5b1 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -226,12 +226,8 @@ MSVCRT_new_handler_func CDECL MSVCRT_set_new_handler(void *func) */ int CDECL MSVCRT__set_new_mode(int mode) { - int old_mode; - LOCK_HEAP; - old_mode = MSVCRT_new_mode; - MSVCRT_new_mode = mode; - UNLOCK_HEAP; - return old_mode; + if(!MSVCRT_CHECK_PMT(mode == 0 || mode == 1)) return -1; + return InterlockedExchange(&MSVCRT_new_mode, mode); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't duplicate _wsearchenv_s code in _wsearchenv.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 1b5a551324e113afefd247e703cc59c03ad80a9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b5a551324e113afefd247e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 13:42:23 2020 +0100 msvcrt: Don't duplicate _wsearchenv_s code in _wsearchenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 66 +++++++------------------------------------------------ 1 file changed, 8 insertions(+), 58 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 5bd8fb1b15..5e84e38a00 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1733,64 +1733,6 @@ void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) MSVCRT__searchenv_s(file, env, buf, MAX_PATH); } -/********************************************************************* - * _wsearchenv (MSVCRT.@) - * - * Unicode version of _searchenv - */ -void CDECL MSVCRT__wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env, MSVCRT_wchar_t *buf) -{ - MSVCRT_wchar_t *envVal, *penv, *end; - MSVCRT_wchar_t path[MAX_PATH]; - MSVCRT_size_t path_len, fname_len = strlenW(file); - - *buf = '\0'; - - /* Try CWD first */ - if (GetFileAttributesW( file ) != INVALID_FILE_ATTRIBUTES) - { - GetFullPathNameW( file, MAX_PATH, buf, NULL ); - return; - } - - /* Search given environment variable */ - envVal = MSVCRT__wgetenv(env); - if (!envVal) - { - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; - } - - penv = envVal; - TRACE(":searching for %s in paths %s\n", debugstr_w(file), debugstr_w(envVal)); - - for(; *penv; penv = (*end ? end + 1 : end)) - { - end = penv; - while(*end && *end != ';') end++; /* Find end of next path */ - path_len = end - penv; - if (!path_len || path_len >= MAX_PATH) - continue; - - memcpy(path, penv, path_len * sizeof(MSVCRT_wchar_t)); - if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') - path[path_len++] = '\\'; - if (path_len + fname_len >= MAX_PATH) - continue; - - memcpy(path + path_len, file, (fname_len + 1) * sizeof(MSVCRT_wchar_t)); - TRACE("Checking for file %s\n", debugstr_w(path)); - if (GetFileAttributesW( path ) != INVALID_FILE_ATTRIBUTES) - { - memcpy(buf, path, (path_len + fname_len + 1) * sizeof(MSVCRT_wchar_t)); - return; - } - } - - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; -} - /********************************************************************* * _wsearchenv_s (MSVCRT.@) */ @@ -1876,3 +1818,11 @@ int CDECL MSVCRT__wsearchenv_s(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* *MSVCRT__errno() = MSVCRT_ENOENT; return MSVCRT_ENOENT; } + +/********************************************************************* + * _wsearchenv (MSVCRT.@) + */ +void CDECL MSVCRT__wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env, MSVCRT_wchar_t *buf) +{ + MSVCRT__wsearchenv_s(file, env, buf, MAX_PATH); +}

1 0

Piotr Caban : msvcrt: Add support for quoted paths in _wsearchenv_s.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: f05549b7f71740362ae5ef6dc8d5e846f8c41f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f05549b7f71740362ae5ef6d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 13:42:19 2020 +0100 msvcrt: Add support for quoted paths in _wsearchenv_s. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 83aff8bcb5..5bd8fb1b15 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1833,12 +1833,27 @@ int CDECL MSVCRT__wsearchenv_s(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* for(; *penv; penv = (*end ? end + 1 : end)) { end = penv; - while(*end && *end != ';') end++; /* Find end of next path */ - path_len = end - penv; + path_len = 0; + while(*end && *end != ';' && path_len < MAX_PATH) + { + if (*end == '"') + { + end++; + while(*end && *end != '"' && path_len < MAX_PATH) + { + path[path_len++] = *end; + end++; + } + if (*end == '"') end++; + continue; + } + + path[path_len++] = *end; + end++; + } if (!path_len || path_len >= MAX_PATH) continue; - memcpy(path, penv, path_len * sizeof(MSVCRT_wchar_t)); if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') path[path_len++] = '\\'; if (path_len + fname_len >= MAX_PATH)

1 0

Nikolay Sivov : mfplat: Add MFCreateTransformActivate().
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: be45be2de750c4a97c8180490fba8a8832e50b64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be45be2de750c4a97c818049… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 29 15:36:20 2020 +0300 mfplat: Add MFCreateTransformActivate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 416 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 25 +++ include/mftransform.idl | 2 + 4 files changed, 444 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be45be2de750c4a97c81…

1 0

Jacek Caban : include: Use dllimport attribute for string.h functions.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 3a67291af47bf5b3727d7d1a6cd3f3ddc81c8282 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a67291af47bf5b3727d7d1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 29 13:40:04 2020 +0100 include: Use dllimport attribute for string.h functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 12 ++++ include/msvcrt/string.h | 180 +++++++++++++++++++++++------------------------ 2 files changed, 102 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a67291af47bf5b3727d…

1 0

Chip Davis : gdi32: Add D3DKMTSetQueuedLimit() stub.
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 012d996b83251e005cc70be809dc5ac60e459cd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=012d996b83251e005cc70be8… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Jan 29 01:34:01 2020 -0600 gdi32: Add D3DKMTSetQueuedLimit() stub. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- .../ext-ms-win-gdi-font-l1-1-1.spec | 6 +++--- dlls/gdi32/driver.c | 9 ++++++++ dlls/gdi32/gdi32.spec | 1 + include/ddk/d3dkmthk.h | 24 +++++++++++++++++++++- 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index d2fcc8fe45..609f24fcfd 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -80,7 +80,7 @@ @ stub D3DKMTSetDisplayPrivateDriverFormat @ stub D3DKMTSetGammaRamp @ stub D3DKMTSetProcessSchedulingPriorityClass -@ stub D3DKMTSetQueuedLimit +@ stdcall D3DKMTSetQueuedLimit(ptr) gdi32.D3DKMTSetQueuedLimit @ stub D3DKMTSetStereoEnabled @ stdcall D3DKMTSetVidPnSourceOwner(ptr) gdi32.D3DKMTSetVidPnSourceOwner @ stub D3DKMTShareObjects diff --git a/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec b/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec index c1b0679883..3d67056c84 100644 --- a/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec +++ b/dlls/ext-ms-win-gdi-font-l1-1-1/ext-ms-win-gdi-font-l1-1-1.spec @@ -6,9 +6,9 @@ @ stdcall ExtTextOutA(long long long long ptr str long ptr) gdi32.ExtTextOutA @ stdcall ExtTextOutW(long long long long ptr wstr long ptr) gdi32.ExtTextOutW @ stdcall GetCharABCWidthsW(long long long ptr) gdi32.GetCharABCWidthsW -@ stdcall GetCharWidth32A(long long long long) gdi32.GetCharWidth32A -@ stdcall GetCharWidthA(long long long long) gdi32.GetCharWidthA -@ stdcall GetCharWidthW(long long long long) gdi32.GetCharWidthW +@ stdcall GetCharWidth32A(long long long ptr) gdi32.GetCharWidth32A +@ stdcall GetCharWidthA(long long long ptr) gdi32.GetCharWidthA +@ stdcall GetCharWidthW(long long long ptr) gdi32.GetCharWidthW @ stdcall GetFontData(long long long ptr long) gdi32.GetFontData @ stdcall GetFontFileData(long long int64 ptr long) gdi32.GetFontFileData @ stdcall GetFontFileInfo(long long ptr long ptr) gdi32.GetFontFileInfo diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d84584da86..90977383a5 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1470,6 +1470,15 @@ NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats) return STATUS_SUCCESS; } +/****************************************************************************** + * D3DKMTSetQueuedLimit [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTSetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ) +{ + FIXME( "(%p): stub\n", desc ); + return STATUS_NOT_IMPLEMENTED; +} + /****************************************************************************** * D3DKMTSetVidPnSourceOwner [GDI32.@] */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 8faa2978f4..725afebb8e 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -90,6 +90,7 @@ @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) @ stdcall D3DKMTQueryStatistics(ptr) +@ stdcall D3DKMTSetQueuedLimit(ptr) @ stdcall D3DKMTSetVidPnSourceOwner(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 6d6a1d68cd..dc53ea343c 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -594,9 +594,30 @@ typedef struct _D3DKMT_QUERYSTATISTICS D3DKMT_QUERYSTATISTICS_QUERY_NODE QueryProcessNode; D3DKMT_QUERYSTATISTICS_QUERY_VIDPNSOURCE QueryVidPnSource; D3DKMT_QUERYSTATISTICS_QUERY_VIDPNSOURCE QueryProcessVidPnSource; - }; + } DUMMYUNIONNAME; } D3DKMT_QUERYSTATISTICS; +typedef enum _D3DKMT_QUEUEDLIMIT_TYPE +{ + D3DKMT_SET_QUEUEDLIMIT_PRESENT = 1, + D3DKMT_GET_QUEUEDLIMIT_PRESENT +} D3DKMT_QUEUEDLIMIT_TYPE; + +typedef struct _D3DKMT_SETQUEUEDLIMIT +{ + D3DKMT_HANDLE hDevice; + D3DKMT_QUEUEDLIMIT_TYPE Type; + union + { + UINT QueuedPresentLimit; + struct + { + D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId; + UINT QueuedPendingFlipLimit; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; +} D3DKMT_SETQUEUEDLIMIT; + #ifdef __cplusplus extern "C" { @@ -610,6 +631,7 @@ NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats); +NTSTATUS WINAPI D3DKMTSetQueuedLimit(D3DKMT_SETQUEUEDLIMIT *desc); NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner(const D3DKMT_SETVIDPNSOURCEOWNER *desc); #ifdef __cplusplus

1 0

Zebediah Figura : d3d8: Handle multisample depth resolve in d3d8_device_SetRenderState().
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 18c863e0ae4279403f14757e257936f6114f65b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18c863e0ae4279403f14757e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 22:45:11 2020 -0600 d3d8: Handle multisample depth resolve in d3d8_device_SetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 3 +++ dlls/d3d8/device.c | 30 ++++++++++++++++++++++++++++++ dlls/d3d8/directx.c | 13 +++++++++++-- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index f262d12fc7..26451255c0 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -42,6 +42,9 @@ #define D3D8_MAX_VERTEX_SHADER_CONSTANTF 256 #define D3D8_MAX_STREAMS 16 +#define D3DFMT_RESZ MAKEFOURCC('R','E','S','Z') +#define D3D8_RESZ_CODE 0x7fa05000 + /* CreateVertexShader can return > 0xFFFF */ #define VS_HIGHESTFIXEDFXF 0xF0000000 diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0721d2a501..4c2c350ec2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1846,6 +1846,34 @@ static HRESULT WINAPI d3d8_device_GetClipPlane(IDirect3DDevice8 *iface, DWORD in return hr; } +static void resolve_depth_buffer(struct d3d8_device *device) +{ + const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); + struct wined3d_rendertarget_view *wined3d_dsv; + struct wined3d_resource *dst_resource; + struct wined3d_texture *dst_texture; + struct wined3d_resource_desc desc; + struct d3d8_surface *d3d8_dsv; + + if (!(dst_texture = state->textures[0])) + return; + dst_resource = wined3d_texture_get_resource(dst_texture); + wined3d_resource_get_desc(dst_resource, &desc); + if (desc.format != WINED3DFMT_D24_UNORM_S8_UINT + && desc.format != WINED3DFMT_X8D24_UNORM + && desc.format != WINED3DFMT_DF16 + && desc.format != WINED3DFMT_DF24 + && desc.format != WINED3DFMT_INTZ) + return; + + if (!(wined3d_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device))) + return; + d3d8_dsv = wined3d_rendertarget_view_get_sub_resource_parent(wined3d_dsv); + + wined3d_device_resolve_sub_resource(device->wined3d_device, dst_resource, 0, + wined3d_rendertarget_view_get_resource(wined3d_dsv), d3d8_dsv->sub_resource_idx, desc.format); +} + static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, D3DRENDERSTATETYPE state, DWORD value) { @@ -1859,6 +1887,8 @@ static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, wined3d_stateblock_set_render_state(device->update_state, state, value); if (!device->recording) wined3d_device_set_render_state(device->wined3d_device, state, value); + if (state == D3DRS_POINTSIZE && value == D3D8_RESZ_CODE) + resolve_depth_buffer(device); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 9a9abeccca..d1f8872d12 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -266,8 +266,17 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 } wined3d_mutex_lock(); - hr = wined3d_check_device_format(d3d8->wined3d, adapter, device_type, wined3dformat_from_d3dformat(adapter_format), - usage, bind_flags, wined3d_rtype, wined3dformat_from_d3dformat(format)); + if (format == D3DFMT_RESZ && resource_type == D3DRTYPE_SURFACE && usage == D3DUSAGE_RENDERTARGET) + { + DWORD levels; + hr = wined3d_check_device_multisample_type(d3d8->wined3d, adapter, device_type, + WINED3DFMT_D24_UNORM_S8_UINT, FALSE, WINED3D_MULTISAMPLE_NON_MASKABLE, &levels); + if (SUCCEEDED(hr) && !levels) + hr = D3DERR_NOTAVAILABLE; + } + else + hr = wined3d_check_device_format(d3d8->wined3d, adapter, device_type, wined3dformat_from_d3dformat(adapter_format), + usage, bind_flags, wined3d_rtype, wined3dformat_from_d3dformat(format)); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetRenderState().
by Alexandre Julliard Jan. 29, 2020

Jan. 29, 2020

Module: wine Branch: master Commit: 5e9c139c5fd1a8eb7fdda12db86113241ee854c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e9c139c5fd1a8eb7fdda12d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 22:45:12 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4c2c350ec2..b0a0491890 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1885,8 +1885,6 @@ static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, if (state == D3DRS_ZBIAS) state = WINED3D_RS_DEPTHBIAS; wined3d_stateblock_set_render_state(device->update_state, state, value); - if (!device->recording) - wined3d_device_set_render_state(device->wined3d_device, state, value); if (state == D3DRS_POINTSIZE && value == D3D8_RESZ_CODE) resolve_depth_buffer(device); wined3d_mutex_unlock();

1 0