October 2019 - Wine-Commits

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetClipPlane().
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: ebc33e2a75e718fa3892c3f9fa48ca76a98bcde9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebc33e2a75e718fa3892c3f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 29 20:57:43 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetClipPlane(). 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/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index aa742c8c1f..7b9be1fc46 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2246,7 +2246,9 @@ static HRESULT WINAPI d3d9_device_SetClipPlane(IDirect3DDevice9Ex *iface, DWORD index = min(index, device->max_user_clip_planes - 1); wined3d_mutex_lock(); - hr = wined3d_device_set_clip_plane(device->wined3d_device, index, (const struct wined3d_vec4 *)plane); + hr = wined3d_stateblock_set_clip_plane(device->update_state, index, (const struct wined3d_vec4 *)plane); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_clip_plane(device->wined3d_device, index, (const struct wined3d_vec4 *)plane); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_clip_plane().
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: 2aadf095c272e9382c80ab3576ad20de47655700 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aadf095c272e9382c80ab35… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 29 20:57:42 2019 -0500 wined3d: Introduce wined3d_stateblock_set_clip_plane(). 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/wined3d/stateblock.c | 16 ++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 19 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 41c97b5020..98986c735b 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1521,6 +1521,22 @@ void CDECL wined3d_stateblock_set_transform(struct wined3d_stateblock *statebloc stateblock->changed.transform[d3dts >> 5] |= 1u << (d3dts & 0x1f); } +HRESULT CDECL wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *stateblock, + UINT plane_idx, const struct wined3d_vec4 *plane) +{ + TRACE("stateblock %p, plane_idx %u, plane %p.\n", stateblock, plane_idx, plane); + + if (plane_idx >= stateblock->device->adapter->d3d_info.limits.max_clip_distances) + { + TRACE("Application has requested clipplane this device doesn't support.\n"); + return WINED3DERR_INVALIDCALL; + } + + stateblock->stateblock_state.clip_planes[plane_idx] = *plane; + stateblock->changed.clipplane |= 1u << plane_idx; + return S_OK; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 297d3a0410..2b5b6c7667 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -260,6 +260,7 @@ @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_reset(ptr) @ cdecl wined3d_stateblock_set_blend_factor(ptr ptr) +@ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) @ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 298cb3b270..cedbb09eba 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2663,6 +2663,8 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_reset(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock, const struct wined3d_color *blend_factor); +HRESULT __cdecl wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *stateblock, + UINT plane_idx, const struct wined3d_vec4 *plane); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const BOOL *constants);

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetClipPlane().
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: c7de24e997e066bf938f9623880c9c2be1d9ad37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7de24e997e066bf938f9623… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 29 20:57:44 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetClipPlane(). 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 90bcfae498..680c75cb0f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1803,7 +1803,9 @@ static HRESULT WINAPI d3d8_device_SetClipPlane(IDirect3DDevice8 *iface, DWORD in TRACE("iface %p, index %u, plane %p.\n", iface, index, plane); wined3d_mutex_lock(); - hr = wined3d_device_set_clip_plane(device->wined3d_device, index, (const struct wined3d_vec4 *)plane); + hr = wined3d_stateblock_set_clip_plane(device->update_state, index, (const struct wined3d_vec4 *)plane); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_clip_plane(device->wined3d_device, index, (const struct wined3d_vec4 *)plane); wined3d_mutex_unlock(); return hr;

1 0

Paul Gofman : ddraw: Fix vertex buffer offset in d3d_execute_buffer_execute().
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: 2e4b8eaf626f88031a7e81a0e625ecd0ea318072 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e4b8eaf626f88031a7e81a0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Oct 29 16:19:06 2019 +0300 ddraw: Fix vertex buffer offset in d3d_execute_buffer_execute(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34666 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/ddraw/executebuffer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 80dbdfd88b..9f0fdb85e5 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -107,7 +107,6 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d } index_count = count * primitive_size; - if (buffer->index_size < index_count) { unsigned int new_size = max(buffer->index_size * 2, index_count); @@ -302,7 +301,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d case D3DPROCESSVERTICES_TRANSFORMLIGHT: case D3DPROCESSVERTICES_TRANSFORM: wined3d_device_set_stream_source(device->wined3d_device, 0, - buffer->src_vertex_buffer, buffer->src_vertex_pos, sizeof(D3DVERTEX)); + buffer->src_vertex_buffer, buffer->src_vertex_pos * sizeof(D3DVERTEX), sizeof(D3DVERTEX)); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_LIGHTING, op == D3DPROCESSVERTICES_TRANSFORMLIGHT && !!device->material); wined3d_device_set_vertex_declaration(device->wined3d_device,

1 0

Nikolay Sivov : ole32: Use interface redirection section too when looking for modules in CoGetClassObject().
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: 32088c0c09046faf8ad52e276d9e7b37ec17326e URL: https://source.winehq.org/git/wine.git/?a=commit;h=32088c0c09046faf8ad52e27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 29 16:36:06 2019 +0300 ole32: Use interface redirection section too when looking for modules in CoGetClassObject(). 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/ole32/compobj.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/ole32/tests/compobj.c | 1 - 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4e48f6add6..0dc0d39c22 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3138,7 +3138,9 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( if (CLSCTX_INPROC & dwClsContext) { + ASSEMBLY_FILE_DETAILED_INFORMATION *file_info = NULL; ACTCTX_SECTION_KEYED_DATA data; + const CLSID *clsid = NULL; data.cbSize = sizeof(data); /* search activation context first */ @@ -3151,11 +3153,46 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( clsreg.u.actctx.module_name = (WCHAR *)((BYTE *)data.lpSectionBase + comclass->name_offset); clsreg.u.actctx.hactctx = data.hActCtx; clsreg.u.actctx.threading_model = comclass->model; + clsid = &comclass->clsid; + } + else if (FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, + ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION, rclsid, &data)) + { + ACTIVATION_CONTEXT_QUERY_INDEX query_index; + SIZE_T required_len = 0; + + query_index.ulAssemblyIndex = data.ulAssemblyRosterIndex - 1; + query_index.ulFileIndexInAssembly = 0; + + QueryActCtxW(0, data.hActCtx, &query_index, FileInformationInAssemblyOfAssemblyInActivationContext, + NULL, 0, &required_len); + if (required_len) + { + file_info = heap_alloc(required_len); + if (file_info) + { + if (QueryActCtxW(0, data.hActCtx, &query_index, FileInformationInAssemblyOfAssemblyInActivationContext, + file_info, required_len, &required_len)) + { + clsreg.u.actctx.module_name = file_info->lpFileName; + clsreg.u.actctx.hactctx = data.hActCtx; + clsreg.u.actctx.threading_model = ThreadingModel_Both; + clsid = rclsid; + } + else + heap_free(file_info); + } + } + } + + if (clsreg.u.actctx.hactctx) + { clsreg.origin = CLASS_REG_ACTCTX; - hres = get_inproc_class_object(apt, &clsreg, &comclass->clsid, iid, !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); - ReleaseActCtx(data.hActCtx); + hres = get_inproc_class_object(apt, &clsreg, clsid, iid, !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); + ReleaseActCtx(clsreg.u.actctx.hactctx); apartment_release(apt); + heap_free(file_info); return hres; } } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 4252f88369..6361f5f0da 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -757,7 +757,6 @@ static void test_CoGetClassObject(void) IUnknown_Release(pUnk); hr = CoGetClassObject(&IID_Testiface7, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); - todo_wine ok(hr == 0x80001235, "Unexpected hr %#x.\n", hr); hr = CoGetClassObject(&IID_Testiface8, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk);

1 0

Nikolay Sivov : ole32: Do not pass around untyped context section pointers.
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: ce15bc1f02b2e4d647b860c017c7091e3f7c9236 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce15bc1f02b2e4d647b860c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 29 16:36:05 2019 +0300 ole32: Do not pass around untyped context section pointers. 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/ole32/compobj.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index c5a36059b9..4e48f6add6 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -145,19 +145,25 @@ struct progidredirect_data ULONG clsid_offset; }; +enum class_reg_data_origin +{ + CLASS_REG_ACTCTX, + CLASS_REG_REGISTRY, +}; + struct class_reg_data { + enum class_reg_data_origin origin; union { struct { - struct comclassredirect_data *data; - void *section; + const WCHAR *module_name; + DWORD threading_model; HANDLE hactctx; } actctx; HKEY hkey; } u; - BOOL hkey; }; struct registered_psclsid @@ -1408,7 +1414,7 @@ static BOOL get_object_dll_path(const struct class_reg_data *regdata, WCHAR *dst { DWORD ret; - if (regdata->hkey) + if (regdata->origin == CLASS_REG_REGISTRY) { DWORD keytype; WCHAR src[MAX_PATH]; @@ -1437,12 +1443,10 @@ static BOOL get_object_dll_path(const struct class_reg_data *regdata, WCHAR *dst { static const WCHAR dllW[] = {'.','d','l','l',0}; ULONG_PTR cookie; - WCHAR *nameW; *dst = 0; - nameW = (WCHAR*)((BYTE*)regdata->u.actctx.section + regdata->u.actctx.data->name_offset); ActivateActCtx(regdata->u.actctx.hactctx, &cookie); - ret = SearchPathW(NULL, nameW, dllW, dstlen, dst, NULL); + ret = SearchPathW(NULL, regdata->u.actctx.module_name, dllW, dstlen, dst, NULL); DeactivateActCtx(0, cookie); return *dst != 0; } @@ -2990,7 +2994,7 @@ HRESULT WINAPI CoRegisterClassObject( static enum comclass_threadingmodel get_threading_model(const struct class_reg_data *data) { - if (data->hkey) + if (data->origin == CLASS_REG_REGISTRY) { static const WCHAR wszThreadingModel[] = {'T','h','r','e','a','d','i','n','g','M','o','d','e','l',0}; static const WCHAR wszApartment[] = {'A','p','a','r','t','m','e','n','t',0}; @@ -3014,7 +3018,7 @@ static enum comclass_threadingmodel get_threading_model(const struct class_reg_d return ThreadingModel_No; } else - return data->u.actctx.data->model; + return data->u.actctx.threading_model; } static HRESULT get_inproc_class_object(APARTMENT *apt, const struct class_reg_data *regdata, @@ -3098,7 +3102,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, REFIID iid, LPVOID *ppv) { - struct class_reg_data clsreg; + struct class_reg_data clsreg = { 0 }; IUnknown *regClassObject; HRESULT hres = E_UNEXPECTED; APARTMENT *apt; @@ -3144,10 +3148,10 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( { struct comclassredirect_data *comclass = (struct comclassredirect_data*)data.lpData; + clsreg.u.actctx.module_name = (WCHAR *)((BYTE *)data.lpSectionBase + comclass->name_offset); clsreg.u.actctx.hactctx = data.hActCtx; - clsreg.u.actctx.data = data.lpData; - clsreg.u.actctx.section = data.lpSectionBase; - clsreg.hkey = FALSE; + clsreg.u.actctx.threading_model = comclass->model; + clsreg.origin = CLASS_REG_ACTCTX; hres = get_inproc_class_object(apt, &clsreg, &comclass->clsid, iid, !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); ReleaseActCtx(data.hActCtx); @@ -3197,7 +3201,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( if (SUCCEEDED(hres)) { clsreg.u.hkey = hkey; - clsreg.hkey = TRUE; + clsreg.origin = CLASS_REG_REGISTRY; hres = get_inproc_class_object(apt, &clsreg, rclsid, iid, !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); RegCloseKey(hkey); @@ -3233,7 +3237,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( if (SUCCEEDED(hres)) { clsreg.u.hkey = hkey; - clsreg.hkey = TRUE; + clsreg.origin = CLASS_REG_REGISTRY; hres = get_inproc_class_object(apt, &clsreg, rclsid, iid, !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); RegCloseKey(hkey); @@ -5171,7 +5175,7 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) WCHAR dllpath[MAX_PATH+1]; regdata.u.hkey = hkey; - regdata.hkey = TRUE; + regdata.origin = CLASS_REG_REGISTRY; if (get_object_dll_path(&regdata, dllpath, ARRAY_SIZE(dllpath))) {

1 0

Michael Stefaniuc : t2embed: Use a wchar string literal instead of a temp variable.
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: 85925f69071efa02cf5fe4ecba32959369c72adf URL: https://source.winehq.org/git/wine.git/?a=commit;h=85925f69071efa02cf5fe4ec… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 30 00:41:35 2019 +0100 t2embed: Use a wchar string literal instead of a temp variable. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index e47884611c..1200564028 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -107,8 +107,6 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) { - static const WCHAR exclusionlistW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'S','h','a','r','e','d',' ','T','o','o','l','s','\\','t','2','e','m','b','e','d',0}; DWORD index; HKEY hkey; LONG ret; @@ -122,7 +120,7 @@ LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) return E_PBENABLEDINVALID; *enabled = TRUE; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, exclusionlistW, 0, GENERIC_READ, &hkey)) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Shared Tools\\t2embed", 0, GENERIC_READ, &hkey)) goto out; *enabled = TRUE;

1 0

Paul Gofman : d3dx9: Use check_texture_requirements() in D3DXCheckCubeTextureRequirements() with correct resource type.
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: e50873f504b4693c9efcf7113afcb633155babbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e50873f504b4693c9efcf711… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Oct 25 20:30:57 2019 +0300 d3dx9: Use check_texture_requirements() in D3DXCheckCubeTextureRequirements() with correct resource type. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 57326f406a..9cd91789b1 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -450,7 +450,7 @@ HRESULT WINAPI D3DXCheckCubeTextureRequirements(struct IDirect3DDevice9 *device, if ((caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2) && (!is_pow2(s))) s = make_pow2(s); - hr = D3DXCheckTextureRequirements(device, &s, &s, miplevels, usage, format, pool); + hr = check_texture_requirements(device, &s, &s, miplevels, usage, format, pool, D3DRTYPE_CUBETEXTURE); if (!(caps.TextureCaps & D3DPTEXTURECAPS_MIPCUBEMAP)) {

1 0

Paul Gofman : d3dx9: Use check_texture_requirements() in D3DXCheckVolumeTextureRequirements() with correct resource type.
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: 0b03d21c8f89b3f9dbd68ac849f9923197095eb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b03d21c8f89b3f9dbd68ac8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Oct 25 20:30:58 2019 +0300 d3dx9: Use check_texture_requirements() in D3DXCheckVolumeTextureRequirements() with correct resource type. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 17 +++++++++++++++++ dlls/d3dx9_36/texture.c | 3 +-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 3e4d5e5df9..2688559c2c 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2125,6 +2125,22 @@ static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *devic ok(ref == 0, "Invalid reference count. Got %u, expected 0.\n", ref); } +static void test_D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *device) +{ + IDirect3DVolumeTexture9 *volume_texture; + HRESULT hr; + + hr = D3DXCreateVolumeTextureFromFileInMemoryEx(device, dds_volume_map, sizeof(dds_volume_map), D3DX_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 1, D3DUSAGE_RENDERTARGET, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, + D3DX_DEFAULT, 0, NULL, NULL, &volume_texture); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateVolumeTextureFromFileInMemoryEx(device, dds_volume_map, sizeof(dds_volume_map), D3DX_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 1, D3DUSAGE_DEPTHSTENCIL, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, + D3DX_DEFAULT, 0, NULL, NULL, &volume_texture); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); +} + /* fills positive x face with red color */ static void WINAPI fill_cube_positive_x(D3DXVECTOR4 *out, const D3DXVECTOR3 *tex_coord, const D3DXVECTOR3 *texel_size, void *data) { @@ -2599,6 +2615,7 @@ START_TEST(texture) test_D3DXCreateCubeTextureFromFileInMemory(device); test_D3DXCreateCubeTextureFromFileInMemoryEx(device); test_D3DXCreateVolumeTextureFromFileInMemory(device); + test_D3DXCreateVolumeTextureFromFileInMemoryEx(device); test_D3DXSaveTextureToFileInMemory(device); ref = IDirect3DDevice9_Release(device); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 9cd91789b1..576635245a 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -482,7 +482,7 @@ HRESULT WINAPI D3DXCheckVolumeTextureRequirements(struct IDirect3DDevice9 *devic if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) return D3DERR_NOTAVAILABLE; - hr = D3DXCheckTextureRequirements(device, &w, &h, NULL, usage, format, pool); + hr = check_texture_requirements(device, &w, &h, NULL, usage, format, pool, D3DRTYPE_VOLUMETEXTURE); if (d == D3DX_DEFAULT) d = 1; @@ -1246,7 +1246,6 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic hr = D3DXCreateVolumeTexture(device, width, height, depth, mip_levels, usage, format, pool, &tex); buftex = NULL; } - if (FAILED(hr)) return hr; hr = load_volume_texture_from_dds(tex, data, palette, filter, color_key, &image_info);

1 0

Matteo Bruni : d3dx9: Turn unimplemented interface ERR into a WARN.
by Alexandre Julliard Oct. 30, 2019

Oct. 30, 2019

Module: wine Branch: master Commit: 5b66442bc95e42bcef2ca385168fc3d594182e4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b66442bc95e42bcef2ca385… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 30 10:24:44 2019 +0100 d3dx9: Turn unimplemented interface ERR into a WARN. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7d686a435d..63c931e172 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4214,41 +4214,43 @@ static HRESULT WINAPI ID3DXEffectCompilerImpl_QueryInterface(ID3DXEffectCompiler { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_ID3DXEffectCompiler)) + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_ID3DXEffectCompiler)) { iface->lpVtbl->AddRef(iface); *object = iface; return S_OK; } - ERR("Interface %s not found\n", debugstr_guid(riid)); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *object = NULL; return E_NOINTERFACE; } static ULONG WINAPI ID3DXEffectCompilerImpl_AddRef(ID3DXEffectCompiler *iface) { - struct ID3DXEffectCompilerImpl *This = impl_from_ID3DXEffectCompiler(iface); + struct ID3DXEffectCompilerImpl *compiler = impl_from_ID3DXEffectCompiler(iface); + ULONG refcount = InterlockedIncrement(&compiler->ref); - TRACE("iface %p: AddRef from %u\n", iface, This->ref); + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return InterlockedIncrement(&This->ref); + return refcount; } static ULONG WINAPI ID3DXEffectCompilerImpl_Release(ID3DXEffectCompiler *iface) { - struct ID3DXEffectCompilerImpl *This = impl_from_ID3DXEffectCompiler(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct ID3DXEffectCompilerImpl *compiler = impl_from_ID3DXEffectCompiler(iface); + ULONG refcount = InterlockedDecrement(&compiler->ref); - TRACE("iface %p: Release from %u\n", iface, ref + 1); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (!ref) + if (!refcount) { - HeapFree(GetProcessHeap(), 0, This); + heap_free(compiler); } - return ref; + return refcount; } /*** ID3DXBaseEffect methods ***/

1 0