March 2020 - Wine-Commits - list.winehq.org

Jeff Smith : gdiplus/tests: Add thin-line test to test_widen_cap.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 2d4befd4bc79c11b14d23d4164be272b50796d5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d4befd4bc79c11b14d23d41… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Mar 3 07:21:45 2020 -0600 gdiplus/tests: Add thin-line test to test_widen_cap. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphicspath.c | 40 +++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 8c025a4eca..3495e4d08e 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1364,35 +1364,49 @@ static path_test_t widenline_caparrowanchor_path[] = { {32.679489, 0.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*9*/ }; +static path_test_t widenline_capsquareanchor_thin_path[] = { + {6.414213, 8.585786, PathPointTypeStart, 4, 1}, /*0*/ + {6.414213, 11.414213, PathPointTypeLine, 0, 1}, /*1*/ + {3.585786, 11.414213, PathPointTypeLine, 0, 1}, /*2*/ + {3.585786, 8.585786, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*3*/ + {48.585785, 11.414213, PathPointTypeStart, 0, 1}, /*4*/ + {48.585785, 8.585786, PathPointTypeLine, 0, 1}, /*5*/ + {51.414211, 8.585786, PathPointTypeLine, 0, 1}, /*6*/ + {51.414211, 11.414213, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*7*/ + }; + static void test_widen_cap(void) { struct { LineCap type; + REAL line_width; const path_test_t *expected; INT expected_size; BOOL todo_size; } caps[] = { - { LineCapFlat, widenline_capflat_path, + { LineCapFlat, 10.0, widenline_capflat_path, ARRAY_SIZE(widenline_capflat_path) }, - { LineCapSquare, widenline_capsquare_path, + { LineCapSquare, 10.0, widenline_capsquare_path, ARRAY_SIZE(widenline_capsquare_path) }, - { LineCapRound, widenline_capround_path, + { LineCapRound, 10.0, widenline_capround_path, ARRAY_SIZE(widenline_capround_path) }, - { LineCapTriangle, widenline_captriangle_path, + { LineCapTriangle, 10.0, widenline_captriangle_path, ARRAY_SIZE(widenline_captriangle_path) }, - { LineCapNoAnchor, widenline_capflat_path, + { LineCapNoAnchor, 10.0, widenline_capflat_path, ARRAY_SIZE(widenline_capflat_path) }, - { LineCapSquareAnchor, widenline_capsquareanchor_path, + { LineCapSquareAnchor, 10.0, widenline_capsquareanchor_path, ARRAY_SIZE(widenline_capsquareanchor_path) }, - { LineCapRoundAnchor, widenline_caproundanchor_path, + { LineCapRoundAnchor, 10.0, widenline_caproundanchor_path, ARRAY_SIZE(widenline_caproundanchor_path) }, - { LineCapDiamondAnchor, widenline_capdiamondanchor_path, + { LineCapDiamondAnchor, 10.0, widenline_capdiamondanchor_path, ARRAY_SIZE(widenline_capdiamondanchor_path) }, - { LineCapArrowAnchor, widenline_caparrowanchor_path, + { LineCapArrowAnchor, 10.0, widenline_caparrowanchor_path, ARRAY_SIZE(widenline_caparrowanchor_path), TRUE }, + { LineCapSquareAnchor, 0.0, widenline_capsquareanchor_thin_path, + ARRAY_SIZE(widenline_capsquareanchor_thin_path), TRUE }, }; GpStatus status; GpPath *path; @@ -1401,11 +1415,12 @@ static void test_widen_cap(void) status = GdipCreatePath(FillModeAlternate, &path); expect(Ok, status); - status = GdipCreatePen1(0xffffffff, 10.0, UnitPixel, &pen); - expect(Ok, status); for (i = 0; i < ARRAY_SIZE(caps); i++) { + status = GdipCreatePen1(0xffffffff, caps[i].line_width, UnitPixel, &pen); + expect(Ok, status); + status = GdipResetPath(path); expect(Ok, status); status = GdipAddPathLine(path, 5.0, 10.0, 50.0, 10.0); @@ -1418,9 +1433,10 @@ static void test_widen_cap(void) status = GdipWidenPath(path, pen, NULL, FlatnessDefault); expect(Ok, status); ok_path_fudge(path, caps[i].expected, caps[i].expected_size, caps[i].todo_size, 0.000005); + + GdipDeletePen(pen); } - GdipDeletePen(pen); GdipDeletePath(path); }

1 0

Zhiyi Zhang : wined3d: Introduce wined3d_adapter_get_output_count().
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 2f9037c75d9bc519685244a082deb8eeb98655be URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f9037c75d9bc519685244a0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 3 22:18:00 2020 +0800 wined3d: Introduce wined3d_adapter_get_output_count(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 13 ++++++++++--- dlls/d3d9/directx.c | 13 ++++++++++--- dlls/dxgi/adapter.c | 5 ++++- dlls/dxgi/dxgi_private.h | 1 + dlls/wined3d/directx.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 2 ++ dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 2 ++ 8 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index d1f8872d12..ab3a9e6810 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -93,15 +93,22 @@ static HRESULT WINAPI d3d8_RegisterSoftwareDevice(IDirect3D8 *iface, void *init_ static UINT WINAPI d3d8_GetAdapterCount(IDirect3D8 *iface) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); - UINT count; + struct wined3d_adapter *wined3d_adapter; + unsigned int adapter_idx, adapter_count; + unsigned int output_count = 0; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - count = wined3d_get_adapter_count(d3d8->wined3d); + adapter_count = wined3d_get_adapter_count(d3d8->wined3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_adapter = wined3d_get_adapter(d3d8->wined3d, adapter_idx); + output_count += wined3d_adapter_get_output_count(wined3d_adapter); + } wined3d_mutex_unlock(); - return count; + return output_count; } static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index b552c3b910..effaf3be25 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -108,15 +108,22 @@ static HRESULT WINAPI d3d9_RegisterSoftwareDevice(IDirect3D9Ex *iface, void *ini static UINT WINAPI d3d9_GetAdapterCount(IDirect3D9Ex *iface) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); - UINT ret; + struct wined3d_adapter *wined3d_adapter; + unsigned int adapter_idx, adapter_count; + unsigned int output_count = 0; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - ret = wined3d_get_adapter_count(d3d9->wined3d); + adapter_count = wined3d_get_adapter_count(d3d9->wined3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_adapter = wined3d_get_adapter(d3d9->wined3d, adapter_idx); + output_count += wined3d_adapter_get_output_count(wined3d_adapter); + } wined3d_mutex_unlock(); - return ret; + return output_count; } static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapter, diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 7cdf7bd0d6..ccc37e0980 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -124,6 +124,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac { struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct dxgi_output *output_object; + unsigned int output_count; HRESULT hr; TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output); @@ -131,7 +132,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac if (!output) return E_INVALIDARG; - if (output_idx > 0) + output_count = wined3d_adapter_get_output_count(adapter->wined3d_adapter); + if (output_idx >= output_count) { *output = NULL; return DXGI_ERROR_NOT_FOUND; @@ -450,6 +452,7 @@ static void dxgi_adapter_init(struct dxgi_adapter *adapter, struct dxgi_factory { adapter->IWineDXGIAdapter_iface.lpVtbl = &dxgi_adapter_vtbl; adapter->refcount = 1; + adapter->wined3d_adapter = wined3d_get_adapter(factory->wined3d, ordinal); wined3d_private_store_init(&adapter->private_store); adapter->ordinal = ordinal; adapter->factory = factory; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 5b93449834..56939e2aaa 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -156,6 +156,7 @@ struct dxgi_adapter { IWineDXGIAdapter IWineDXGIAdapter_iface; LONG refcount; + struct wined3d_adapter *wined3d_adapter; struct wined3d_private_store private_store; UINT ordinal; struct dxgi_factory *factory; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f710e85687..95d1caed4d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -883,6 +883,13 @@ UINT CDECL wined3d_get_adapter_count(const struct wined3d *wined3d) return wined3d->adapter_count; } +unsigned int CDECL wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter) +{ + TRACE("adapter %p, reporting %u outputs.\n", adapter, adapter->output_count); + + return adapter->output_count; +} + HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *init_function) { FIXME("wined3d %p, init_function %p stub!\n", wined3d, init_function); @@ -2834,6 +2841,7 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, ERR("Failed to initialise output, hr %#x.\n", hr); return FALSE; } + adapter->output_count = 1; if (!AllocateLocallyUniqueId(&adapter->luid)) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0c30ffeac2..b0eb60327f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -26,6 +26,8 @@ @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) @ cdecl wined3d_unregister_windows(ptr) +@ cdecl wined3d_adapter_get_output_count(ptr) + @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_blend_state_decref(ptr) @ cdecl wined3d_blend_state_get_parent(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f266d2a690..2966a08603 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2914,6 +2914,7 @@ struct wined3d_adapter struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; struct wined3d_output output; + unsigned int output_count; UINT64 vram_bytes_used; GUID driver_uuid; GUID device_uuid; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2841aa2f2e..54af2e4785 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2287,6 +2287,8 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, UINT adapter_idx, const struct wined3d_display_mode *mode); void __cdecl wined3d_unregister_windows(struct wined3d *wined3d); +unsigned int __cdecl wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter); + HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer);

1 0

Zebediah Figura : ddraw: Stop setting the device state in d3d_device7_SetLight() and d3d_device7_LightEnable().
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 194b1234a97e9fa9b6cdc445d2e92bdbc638094c URL: https://source.winehq.org/git/wine.git/?a=commit;h=194b1234a97e9fa9b6cdc445… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 14:18:46 2020 -0600 ddraw: Stop setting the device state in d3d_device7_SetLight() and d3d_device7_LightEnable(). 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/ddraw/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 56debb7175..39626157a5 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5539,8 +5539,6 @@ static HRESULT d3d_device7_SetLight(IDirect3DDevice7 *iface, DWORD light_idx, D3 wined3d_mutex_lock(); /* Note: D3DLIGHT7 is compatible with struct wined3d_light. */ hr = wined3d_stateblock_set_light(device->update_state, light_idx, (const struct wined3d_light *)light); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_light(device->wined3d_device, light_idx, (const struct wined3d_light *)light); wined3d_mutex_unlock(); return hr_ddraw_from_wined3d(hr); @@ -6417,8 +6415,6 @@ static HRESULT d3d_device7_LightEnable(IDirect3DDevice7 *iface, DWORD light_idx, wined3d_mutex_lock(); hr = wined3d_stateblock_set_light_enable(device->update_state, light_idx, enabled); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_light_enable(device->wined3d_device, light_idx, enabled); wined3d_mutex_unlock(); return hr_ddraw_from_wined3d(hr);

1 0

Zebediah Figura : ddraw: Retrieve the viewport from the primary stateblock.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 8ac582762cd764e3891b021f6237b6569b5a11f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ac582762cd764e3891b021f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 14:18:43 2020 -0600 ddraw: Retrieve the viewport from the primary stateblock. 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/ddraw/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 6603835ef0..240f79b432 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3884,7 +3884,7 @@ static HRESULT WINAPI d3d_device7_GetClipStatus(IDirect3DDevice7 *iface, D3DCLIP FIXME("iface %p, clip_status %p stub.\n", iface, clip_status); - wined3d_device_get_viewports(device->wined3d_device, NULL, &vp); + vp = wined3d_stateblock_get_state(device->state)->viewport; clip_status->minx = vp.x; clip_status->maxx = vp.x + vp.width; clip_status->miny = vp.y; @@ -5391,7 +5391,7 @@ static HRESULT d3d_device7_GetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_viewport); + wined3d_viewport = wined3d_stateblock_get_state(device->state)->viewport; wined3d_mutex_unlock(); viewport->dwX = wined3d_viewport.x;

1 0

Zebediah Figura : ddraw: Stop setting the device state in d3d_device7_SetMaterial().
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 356259038364f6f275ea08a8197032f0de1dba47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=356259038364f6f275ea08a8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 14:18:42 2020 -0600 ddraw: Stop setting the device state in d3d_device7_SetMaterial(). 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/ddraw/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index fa79a98777..6603835ef0 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5448,8 +5448,6 @@ static HRESULT d3d_device7_SetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *ma wined3d_mutex_lock(); /* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */ wined3d_stateblock_set_material(device->update_state, (const struct wined3d_material *)material); - if (!device->recording) - wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); wined3d_mutex_unlock(); return D3D_OK;

1 0

Jacek Caban : winegcc: Pass tool by id to build_tool_name.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 9a9f35a4df628e9e748fce3a14ae27eafbd52575 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a9f35a4df628e9e748fce3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:02:18 2020 +0100 winegcc: Pass tool by id to build_tool_name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 6bcd157a26..f2329e492c 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -314,8 +314,30 @@ static char* get_temp_file(const char* prefix, const char* suffix) return tmp; } -static strarray* build_tool_name(struct options *opts, const char* base, const char* deflt) +enum tool { + TOOL_CC, + TOOL_CXX, + TOOL_CPP, + TOOL_LD, +}; + +static const struct +{ + const char *base; + const char *deflt; +} tool_names[] = +{ + { "gcc", CC }, + { "g++", CXX }, + { "cpp", CPP }, + { "ld", LD }, +}; + +static strarray* build_tool_name( struct options *opts, enum tool tool ) +{ + const char *base = tool_names[tool].base; + const char *deflt = tool_names[tool].deflt; const char *path; char* str; @@ -341,24 +363,24 @@ static strarray* build_tool_name(struct options *opts, const char* base, const c static strarray* get_translator(struct options *opts) { - strarray *tool; + enum tool tool; switch(opts->processor) { case proc_cpp: - tool = build_tool_name(opts, "cpp", CPP); + tool = TOOL_CPP; break; case proc_cc: case proc_as: - tool = build_tool_name(opts, "gcc", CC); + tool = TOOL_CC; break; case proc_cxx: - tool = build_tool_name(opts, "g++", CXX); + tool = TOOL_CXX; break; default: assert(0); } - return tool; + return build_tool_name( opts, tool ); } static int try_link( const strarray *prefix, const strarray *link_tool, const char *cflags ) @@ -680,8 +702,8 @@ static void compile(struct options* opts, const char* lang) /* mixing different C and C++ compilers isn't supported in configure anyway */ case proc_cc: case proc_cxx: - gcc = build_tool_name(opts, "gcc", CC); - gpp = build_tool_name(opts, "g++", CXX); + gcc = build_tool_name(opts, TOOL_CC); + gpp = build_tool_name(opts, TOOL_CXX); for ( j = 0; !gcc_defs && j < comp_args->size; j++ ) { const char *cc = comp_args->base[j]; @@ -1161,8 +1183,8 @@ static void build(struct options* opts) /* run winebuild to generate the .spec.o file */ spec_args = get_winebuild_args( opts ); - if ((tool = build_tool_name( opts, "gcc", CC ))) strarray_add( spec_args, strmake( "--cc-cmd=%s", strarray_tostring( tool, " " ))); - if (!is_pe && (tool = build_tool_name( opts, "ld", LD ))) strarray_add( spec_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " ))); + if ((tool = build_tool_name( opts, TOOL_CC ))) strarray_add( spec_args, strmake( "--cc-cmd=%s", strarray_tostring( tool, " " ))); + if (!is_pe && (tool = build_tool_name( opts, TOOL_LD ))) strarray_add( spec_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " ))); spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size)

1 0

Jacek Caban : stdio.h: Fix calling convention of variadic inline functions.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: d34ae79dddd750523304a615c8aaaa2745a19adc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d34ae79dddd750523304a615… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:37:00 2020 +0100 stdio.h: Fix calling convention of variadic inline functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48697 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 2 +- include/msvcrt/stdio.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 3951a1c829..c1779fb81a 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -115,7 +115,7 @@ static inline int __cdecl _vsnwprintf_s(wchar_t *buffer, size_t size, size_t cou return ret < 0 ? -1 : ret; } -static inline int __cdecl _snwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, ...) +static inline int WINAPIV _snwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, ...) { int ret; __ms_va_list args; diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index e184704eb9..f2aef46e6f 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -174,7 +174,7 @@ static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count, return ret < 0 ? -1 : ret; } -static inline int __cdecl _snprintf_s(char *buffer, size_t size, size_t count, const char *format, ...) +static inline int WINAPIV _snprintf_s(char *buffer, size_t size, size_t count, const char *format, ...) { int ret; __ms_va_list args;

1 0

Zebediah Figura : ddraw: Stop setting the device state in d3d_device7_SetViewport().
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 7a085fce7535f7340e0092891d6cb00d06b94780 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a085fce7535f7340e009289… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 14:18:44 2020 -0600 ddraw: Stop setting the device state in d3d_device7_SetViewport(). 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/ddraw/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 240f79b432..9e234fd065 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5356,8 +5356,6 @@ static HRESULT d3d_device7_SetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi vp.max_z = viewport->dvMaxZ; wined3d_stateblock_set_viewport(device->update_state, &vp); - if (!device->recording) - wined3d_device_set_viewports(device->wined3d_device, 1, &vp); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : ddraw: Retrieve lights from the primary stateblock.
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: e7cac8496a75e45d0308fd4a0d4f488b54020413 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7cac8496a75e45d0308fd4a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 14:18:45 2020 -0600 ddraw: Retrieve lights from the primary stateblock. 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/ddraw/device.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9e234fd065..56debb7175 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5579,17 +5579,17 @@ static HRESULT WINAPI d3d_device7_SetLight_FPUPreserve(IDirect3DDevice7 *iface, static HRESULT d3d_device7_GetLight(IDirect3DDevice7 *iface, DWORD light_idx, D3DLIGHT7 *light) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - HRESULT rc; + BOOL enabled; + HRESULT hr; TRACE("iface %p, light_idx %u, light %p.\n", iface, light_idx, light); wined3d_mutex_lock(); /* Note: D3DLIGHT7 is compatible with struct wined3d_light. */ - rc = wined3d_device_get_light(device->wined3d_device, light_idx, (struct wined3d_light *)light); + hr = wined3d_stateblock_get_light(device->state, light_idx, (struct wined3d_light *)light, &enabled); wined3d_mutex_unlock(); - /* Translate the result. WineD3D returns other values than D3D7 */ - return hr_ddraw_from_wined3d(rc); + return hr_ddraw_from_wined3d(hr); } static HRESULT WINAPI d3d_device7_GetLight_FPUSetup(IDirect3DDevice7 *iface, DWORD light_idx, D3DLIGHT7 *light) @@ -6460,6 +6460,7 @@ static HRESULT WINAPI d3d_device7_LightEnable_FPUPreserve(IDirect3DDevice7 *ifac static HRESULT d3d_device7_GetLightEnable(IDirect3DDevice7 *iface, DWORD light_idx, BOOL *enabled) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_light light; HRESULT hr; TRACE("iface %p, light_idx %u, enabled %p.\n", iface, light_idx, enabled); @@ -6468,7 +6469,7 @@ static HRESULT d3d_device7_GetLightEnable(IDirect3DDevice7 *iface, DWORD light_i return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - hr = wined3d_device_get_light_enable(device->wined3d_device, light_idx, enabled); + hr = wined3d_stateblock_get_light(device->state, light_idx, &light, enabled); wined3d_mutex_unlock(); return hr_ddraw_from_wined3d(hr);

1 0

Zhiyi Zhang : wined3d: Introduce wined3d_get_adapter().
by Alexandre Julliard March 3, 2020

March 3, 2020

Module: wine Branch: master Commit: 81caeee85d0aff856780206b126a31de2d9e7d13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81caeee85d0aff856780206b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 3 22:17:46 2020 +0800 wined3d: Introduce wined3d_get_adapter(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 3 +++ 3 files changed, 14 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4d6f63c2ff..f710e85687 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -865,6 +865,16 @@ enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor * return device_id; } +struct wined3d_adapter * CDECL wined3d_get_adapter(const struct wined3d *wined3d, unsigned int idx) +{ + TRACE("wined3d %p, idx %u.\n", wined3d, idx); + + if (idx >= wined3d->adapter_count) + return NULL; + + return wined3d->adapters[idx]; +} + UINT CDECL wined3d_get_adapter_count(const struct wined3d *wined3d) { TRACE("wined3d %p, reporting %u adapters.\n", diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8538b3dcd6..0c30ffeac2 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -11,6 +11,7 @@ @ cdecl wined3d_decref(ptr) @ cdecl wined3d_enum_adapter_modes(ptr long long long long ptr) @ cdecl wined3d_find_closest_matching_adapter_mode(ptr long ptr) +@ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) @ cdecl wined3d_get_adapter_display_mode(ptr long ptr ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 908a1c9266..2841aa2f2e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2178,6 +2178,7 @@ struct wined3d_parent_ops }; struct wined3d; +struct wined3d_adapter; struct wined3d_blend_state; struct wined3d_buffer; struct wined3d_device; @@ -2262,6 +2263,8 @@ HRESULT __cdecl wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT a UINT mode_idx, struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_find_closest_matching_adapter_mode(const struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_display_mode *mode); +struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined3d, + unsigned int idx); UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation);

1 0