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

Michael Stefaniuc : dinput: Support IUnknown in the IDirectInputEffect COM object.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 48bf99ea8904d187438646b04fea3bd29e79b48d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48bf99ea8904d187438646b04… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 15 12:06:08 2016 +0100 dinput: Support IUnknown in the IDirectInputEffect COM object. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_osx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 6a8926d..c9c30fd 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1474,7 +1474,7 @@ static HRESULT WINAPI effect_QueryInterface(IDirectInputEffect *iface, TRACE("%p %s %p\n", This, debugstr_guid(guid), out); - if(IsEqualIID(guid, &IID_IDirectInputEffect)){ + if(IsEqualIID(guid, &IID_IUnknown) || IsEqualIID(guid, &IID_IDirectInputEffect)){ *out = iface; IDirectInputEffect_AddRef(iface); return S_OK;

1 0

Paul Gofman : d3dx9: Fix D3DXIntersectTri function.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: fda55a3fdfdfc41b4a1ea35a9f69fcf630001b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda55a3fdfdfc41b4a1ea35a9… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 11 15:35:32 2016 +0300 d3dx9: Fix D3DXIntersectTri function. 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/mesh.c | 7 +++++-- dlls/d3dx9_36/tests/mesh.c | 37 +++++++++++++++++++++++++++++++------ 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index f7bd1a3..b2dbd27 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2380,12 +2380,15 @@ BOOL WINAPI D3DXIntersectTri(const D3DXVECTOR3 *p0, const D3DXVECTOR3 *p1, const D3DXMATRIX m; D3DXVECTOR4 vec; + TRACE("p0 %p, p1 %p, p2 %p, praypos %p, praydir %p, pu %p, pv %p, pdist %p.\n", + p0, p1, p2, praypos, praydir, pu, pv, pdist); + m.u.m[0][0] = p1->x - p0->x; m.u.m[1][0] = p2->x - p0->x; m.u.m[2][0] = -praydir->x; m.u.m[3][0] = 0.0f; - m.u.m[0][1] = p1->y - p0->z; - m.u.m[1][1] = p2->y - p0->z; + m.u.m[0][1] = p1->y - p0->y; + m.u.m[1][1] = p2->y - p0->y; m.u.m[2][1] = -praydir->y; m.u.m[3][1] = 0.0f; m.u.m[0][2] = p1->z - p0->z; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index d193d1b..4a75e47 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1103,14 +1103,39 @@ static void D3DXIntersectTriTest(void) exp_res = TRUE; exp_u = 0.5f; exp_v = 0.25f; exp_dist = 8.0f; - got_res = D3DXIntersectTri(&vertex[0],&vertex[1],&vertex[2],&position,&ray,&got_u,&got_v,&got_dist); - ok( got_res == exp_res, "Expected result = %d, got %d\n",exp_res,got_res); - ok( compare(exp_u,got_u), "Expected u = %f, got %f\n",exp_u,got_u); - ok( compare(exp_v,got_v), "Expected v = %f, got %f\n",exp_v,got_v); - ok( compare(exp_dist,got_dist), "Expected distance = %f, got %f\n",exp_dist,got_dist); + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, &got_u, &got_v, &got_dist); + ok(got_res == exp_res, "Expected result %d, got %d.\n", exp_res, got_res); + ok(compare(exp_u, got_u), "Expected u %f, got %f.\n", exp_u, got_u); + ok(compare(exp_v, got_v), "Expected v %f, got %f.\n", exp_v, got_v); + ok(compare(exp_dist, got_dist), "Expected distance %f, got %f.\n", exp_dist, got_dist); got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, NULL, NULL, NULL); - ok(got_res == exp_res, "Expected result = %d, got %d\n", exp_res, got_res); + ok(got_res == exp_res, "Expected result %d, got %d.\n", exp_res, got_res); + + vertex[2].x = 1.0f; vertex[2].y = 0.0f; vertex[2].z = 0.0f; + vertex[1].x = 2.0f; vertex[1].y = 0.0f; vertex[1].z = 0.0f; + vertex[0].x = 1.0f; vertex[0].y = 1.0f; vertex[0].z = 0.0f; + + got_u = got_v = got_dist = 0.0f; + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, &got_u, &got_v, &got_dist); + ok(got_res == exp_res, "Expected result %d, got %d.\n", exp_res, got_res); + ok(compare(exp_u, got_u), "Expected u %f, got %f.\n", exp_u, got_u); + ok(compare(exp_v, got_v), "Expected v %f, got %f.\n", exp_v, got_v); + ok(compare(exp_dist, got_dist), "Expected distance %f, got %f.\n", exp_dist, got_dist); + + vertex[2].x = 1.0f; vertex[2].y = 0.0f; vertex[2].z = 0.0f; + vertex[1].x = 2.0f; vertex[1].y = 0.0f; vertex[1].z = -0.5f; + vertex[0].x = 1.0f; vertex[0].y = 1.0f; vertex[0].z = -1.0f; + exp_u = 0.375f; + exp_v = 0.5625f; + exp_dist = 7.9375f; + got_u = got_v = got_dist = 0.0f; + got_res = D3DXIntersectTri(&vertex[0], &vertex[1], &vertex[2], &position, &ray, &got_u, &got_v, &got_dist); + ok(got_res == exp_res, "Expected result %d, got %d.\n", exp_res, got_res); + ok(compare(exp_u, got_u), "Expected u %f, got %f.\n", exp_u, got_u); + ok(compare(exp_v, got_v), "Expected v %f, got %f.\n", exp_v, got_v); + ok(compare(exp_dist, got_dist), "Expected distance %f, got %f.\n", exp_dist, got_dist); + /*Only positive ray is taken in account*/

1 0

Miklós Máté : wined3d: Warn only once about unsupported wrap state.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: e29aaca0185c71461ebd708c542a0e1afdef7201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e29aaca0185c71461ebd708c5… Author: Miklós Máté <mtmkls(a)gmail.com> Date: Mon Mar 14 13:40:57 2016 +0100 wined3d: Warn only once about unsupported wrap state. Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a819244..55e91c5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1571,7 +1571,9 @@ void state_pointsprite(struct wined3d_context *context, const struct wined3d_sta static void state_wrap(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - if (state->render_states[WINED3D_RS_WRAP0] + static unsigned int once; + + if ((state->render_states[WINED3D_RS_WRAP0] || state->render_states[WINED3D_RS_WRAP1] || state->render_states[WINED3D_RS_WRAP2] || state->render_states[WINED3D_RS_WRAP3] @@ -1587,6 +1589,7 @@ static void state_wrap(struct wined3d_context *context, const struct wined3d_sta || state->render_states[WINED3D_RS_WRAP13] || state->render_states[WINED3D_RS_WRAP14] || state->render_states[WINED3D_RS_WRAP15]) + && !once++) FIXME("(WINED3D_RS_WRAP0) Texture wrapping not yet supported.\n"); }

1 0

Nikolay Sivov : xmllite/writer: Implement WriteComment().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 41fcd1042e099e9de64a2d2dca2b4778c44678ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=41fcd1042e099e9de64a2d2dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 14 23:27:17 2016 +0300 xmllite/writer: Implement WriteComment(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 46 +++++++++++++++++++++++++++++++--- 2 files changed, 103 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 577b330..a55957e 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -755,6 +755,65 @@ static void test_writeenddocument(void) IStream_Release(stream); } +static void test_WriteComment(void) +{ + static const WCHAR closeW[] = {'-','-','>',0}; + static const WCHAR aW[] = {'a',0}; + static const WCHAR bW[] = {'b',0}; + IXmlWriter *writer; + IStream *stream; + HGLOBAL hglobal; + HRESULT hr; + char *ptr; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteComment(writer, aW); + ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteComment(writer, aW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteComment(writer, aW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteComment(writer, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteComment(writer, closeW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(ptr != NULL, "got %p\n", ptr); + ok(!strncmp(ptr, "<b>", 37), "got %s\n", ptr); + GlobalUnlock(hglobal); + + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { if (!init_pointers()) @@ -769,4 +828,5 @@ START_TEST(writer) test_omitxmldeclaration(); test_bom(); test_writeenddocument(); + test_WriteComment(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index fa01553..766d335 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -43,6 +43,7 @@ static const WCHAR closeelementW[] = {'<','/'}; static const WCHAR closepiW[] = {'?','>'}; static const WCHAR ltW[] = {'<'}; static const WCHAR gtW[] = {'>'}; +static const WCHAR spaceW[] = {' '}; struct output_buffer { @@ -578,9 +579,49 @@ static HRESULT WINAPI xmlwriter_WriteChars(IXmlWriter *iface, const WCHAR *pwch, return E_NOTIMPL; } -static HRESULT WINAPI xmlwriter_WriteComment(IXmlWriter *iface, LPCWSTR pwszComment) +static HRESULT WINAPI xmlwriter_WriteComment(IXmlWriter *iface, LPCWSTR comment) { - return E_NOTIMPL; + static const WCHAR copenW[] = {'<','!','-','-'}; + static const WCHAR ccloseW[] = {'-','-','>'}; + xmlwriter *This = impl_from_IXmlWriter(iface); + + TRACE("%p %s\n", This, debugstr_w(comment)); + + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_ElemStarted: + writer_close_starttag(This); + break; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + + write_output_buffer(This->output, copenW, ARRAY_SIZE(copenW)); + if (comment) { + int len = strlenW(comment), i; + + /* Make sure there's no two hyphen sequences in a string, space is used as a separator to produce compliant + comment string */ + if (len > 1) { + for (i = 0; i < len; i++) { + write_output_buffer(This->output, comment + i, 1); + if (comment[i] == '-' && (i + 1 < len) && comment[i+1] == '-') + write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); + } + } + else + write_output_buffer(This->output, comment, len); + + if (len && comment[len-1] == '-') + write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); + } + write_output_buffer(This->output, ccloseW, ARRAY_SIZE(ccloseW)); + + return S_OK; } static HRESULT WINAPI xmlwriter_WriteDocType(IXmlWriter *iface, LPCWSTR pwszName, LPCWSTR pwszPublicId, @@ -763,7 +804,6 @@ static HRESULT WINAPI xmlwriter_WriteProcessingInstruction(IXmlWriter *iface, LP xmlwriter *This = impl_from_IXmlWriter(iface); static const WCHAR xmlW[] = {'x','m','l',0}; static const WCHAR openpiW[] = {'<','?'}; - static const WCHAR spaceW[] = {' '}; TRACE("(%p)->(%s %s)\n", This, wine_dbgstr_w(name), wine_dbgstr_w(text));

1 0

Nikolay Sivov : comctl32/monthcal: Always reset range flags and date limits on MCM_SETRANGE.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 68701440227f3230a18aad98217b771d22866bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=68701440227f3230a18aad982… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 14 20:19:25 2016 +0300 comctl32/monthcal: Always reset range flags and date limits on MCM_SETRANGE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 3 +++ dlls/comctl32/tests/datetime.c | 4 +--- dlls/comctl32/tests/monthcal.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index c68a073..6cdcfca 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1452,6 +1452,9 @@ MONTHCAL_SetRange(MONTHCAL_INFO *infoPtr, SHORT limits, SYSTEMTIME *range) (limits & GDTR_MAX && !MONTHCAL_ValidateDate(&range[1]))) return FALSE; + infoPtr->rangeValid = 0; + infoPtr->minDate = infoPtr->maxDate = st_null; + if (limits & GDTR_MIN) { if (!MONTHCAL_ValidateTime(&range[0])) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 195c719..61ecfb5 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -360,9 +360,7 @@ static void test_dtm_set_and_get_range(void) r = SendMessageA(hWnd, DTM_SETRANGE, GDTR_MAX, (LPARAM)st); expect(1, r); r = SendMessageA(hWnd, DTM_GETRANGE, 0, (LPARAM)getSt); - todo_wine { - ok(r == GDTR_MAX, "Expected %x, not %x(GDTR_MIN) or %x(GDTR_MIN | GDTR_MAX), got %lx\n", GDTR_MAX, GDTR_MIN, GDTR_MIN | GDTR_MAX, r); - } + ok(r == GDTR_MAX, "Expected %x, not %x(GDTR_MIN) or %x(GDTR_MIN | GDTR_MAX), got %lx\n", GDTR_MAX, GDTR_MIN, GDTR_MIN | GDTR_MAX, r); expect_systime(&st[1], &getSt[1]); r = SendMessageA(hWnd, DTM_SETRANGE, GDTR_MIN, (LPARAM)st); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 792f66e..24dcdfc 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -262,6 +262,7 @@ static void test_monthcal(void) SYSTEMTIME st[2], st1[2], today; int res, month_range; DWORD limits; + BOOL r; hwnd = CreateWindowA(MONTHCAL_CLASSA, "MonthCal", WS_POPUP | WS_VISIBLE, CW_USEDEFAULT, 0, 300, 300, 0, 0, NULL, NULL); @@ -453,6 +454,40 @@ static void test_monthcal(void) expect(0, st1[1].wSecond); expect(0, st1[1].wMilliseconds); + /* 0 limit flags */ + limits = SendMessageA(hwnd, MCM_GETRANGE, 0, (LPARAM)st1); + ok(limits == GDTR_MIN, "got 0x%08x\n", limits); + + GetSystemTime(st); + st[1] = st[0]; + st[1].wYear++; + r = SendMessageA(hwnd, MCM_SETRANGE, 0, (LPARAM)st); + ok(r, "got %d\n", r); + + limits = SendMessageA(hwnd, MCM_GETRANGE, 0, (LPARAM)st); + ok(limits == 0, "got 0x%08x\n", limits); + ok(st[0].wYear == 0 && st[1].wYear == 0, "got %u, %u\n", st[0].wYear, st[1].wYear); + + /* flags are 0, set min limit */ + GetSystemTime(st); + st[1] = st[0]; + st[1].wYear++; + + r = SendMessageA(hwnd, MCM_SETRANGE, GDTR_MIN, (LPARAM)st); + ok(r, "got %d\n", r); + + limits = SendMessageA(hwnd, MCM_GETRANGE, 0, (LPARAM)st1); + ok(limits == GDTR_MIN, "got 0x%08x\n", limits); + ok(st1[1].wYear == 0, "got %u\n", st1[1].wYear); + + /* now set max limit, check flags */ + r = SendMessageA(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st); + ok(r, "got %d\n", r); + + limits = SendMessageA(hwnd, MCM_GETRANGE, 0, (LPARAM)st1); + ok(limits == GDTR_MAX, "got 0x%08x\n", limits); + ok(st1[0].wYear == 0, "got %u\n", st1[0].wYear); + DestroyWindow(hwnd); }

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_convert_depth_to_float().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: ef8162751eb03ef6a4abb54bd908fa9893025a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef8162751eb03ef6a4abb54bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 17:02:16 2016 +0100 wined3d: Get resource info from the texture in surface_convert_depth_to_float(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3f90592..d06f1eb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -884,7 +884,7 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined static BOOL surface_convert_depth_to_float(const struct wined3d_surface *surface, DWORD depth, float *float_depth) { - const struct wined3d_format *format = surface->resource.format; + const struct wined3d_format *format = surface->container->resource.format; switch (format->id) {

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_blt_fbo().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: f04448500d0c019f07cae48ae6a5d52e0649e235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f04448500d0c019f07cae48ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 17:02:15 2016 +0100 wined3d: Get resource info from the texture in surface_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 110344c..3f90592 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -745,7 +745,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, /* Resolve the source surface first if needed. */ if (src_location == WINED3D_LOCATION_RB_MULTISAMPLE - && (src_surface->resource.format->id != dst_surface->resource.format->id + && (src_surface->container->resource.format->id != dst_surface->container->resource.format->id || abs(src_rect.bottom - src_rect.top) != abs(dst_rect.bottom - dst_rect.top) || abs(src_rect.right - src_rect.left) != abs(dst_rect.right - dst_rect.left))) src_location = WINED3D_LOCATION_RB_RESOLVED;

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_depth_blt_fbo().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 77aa34099cfca74c11441909d074d1a01795db49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77aa34099cfca74c11441909d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 17:02:14 2016 +0100 wined3d: Get resource info from the texture in surface_depth_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 99a2649..110344c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -633,15 +633,15 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, if (src_mask != dst_mask) { ERR("Incompatible formats %s and %s.\n", - debug_d3dformat(src_surface->resource.format->id), - debug_d3dformat(dst_surface->resource.format->id)); + debug_d3dformat(src_surface->container->resource.format->id), + debug_d3dformat(dst_surface->container->resource.format->id)); return; } if (!src_mask) { ERR("Not a depth / stencil format: %s.\n", - debug_d3dformat(src_surface->resource.format->id)); + debug_d3dformat(src_surface->container->resource.format->id)); return; }

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_create_dib_section().
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: fc868cb908125d94e00f47162070437ac5b2ad60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc868cb908125d94e00f47162… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 17:02:12 2016 +0100 wined3d: Get resource info from the texture in surface_create_dib_section(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a19098f..090bbb1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -351,8 +351,9 @@ static void get_color_masks(const struct wined3d_format *format, DWORD *masks) HRESULT surface_create_dib_section(struct wined3d_surface *surface) { - const struct wined3d_format *format = surface->resource.format; - unsigned int format_flags = surface->container->resource.format_flags; + struct wined3d_texture *texture = surface->container; + const struct wined3d_format *format = texture->resource.format; + unsigned int format_flags = texture->resource.format_flags; unsigned int row_pitch, slice_pitch; BITMAPINFO *b_info; DWORD *masks; @@ -388,7 +389,7 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) return E_OUTOFMEMORY; b_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - wined3d_texture_get_pitch(surface->container, surface->texture_level, &row_pitch, &slice_pitch); + wined3d_texture_get_pitch(texture, surface->texture_level, &row_pitch, &slice_pitch); b_info->bmiHeader.biWidth = row_pitch / format->byte_count; b_info->bmiHeader.biHeight = 0 - surface->resource.height; b_info->bmiHeader.biSizeImage = slice_pitch; @@ -402,7 +403,7 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) /* Get the bit masks */ masks = (DWORD *)b_info->bmiColors; - switch (surface->resource.format->id) + switch (format->id) { case WINED3DFMT_B8G8R8_UNORM: b_info->bmiHeader.biCompression = BI_RGB;

1 0

Austin English : user32: Add QueryDisplayConfig stub.
by Alexandre Julliard March 15, 2016

March 15, 2016

Module: wine Branch: master Commit: 2b740588ba9b9fa7097e94326a70b8598bb727ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b740588ba9b9fa7097e94326… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 22 22:27:53 2016 -0600 user32: Add QueryDisplayConfig stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 12 ++++ dlls/user32/user32.spec | 1 + include/wingdi.h | 182 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 4497621..071230e 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -474,6 +474,18 @@ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPA return USER_Driver->pEnumDisplayMonitors( hdc, rect, proc, lp ); } + +/*********************************************************************** + * QueryDisplayConfig (USER32.@) + */ +LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCONFIG_PATH_INFO *pathinfo, + UINT32 *numinfoelements, DISPLAYCONFIG_MODE_INFO *modeinfo, + DISPLAYCONFIG_TOPOLOGY_ID *topologyid) +{ + FIXME("(%08x %p %p %p %p %p)\n", flags, numpathelements, pathinfo, numinfoelements, modeinfo, topologyid); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /*********************************************************************** * RegisterSystemThread (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 9ff5525..5c19634 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -550,6 +550,7 @@ # @ stub PrivateSetDbgTag # @ stub PrivateSetRipFlags @ stdcall PtInRect(ptr int64) +@ stdcall QueryDisplayConfig(long ptr ptr ptr ptr ptr) @ stub QuerySendMessage # @ stub QueryUserCounters @ stdcall RealChildWindowFromPoint(long int64) diff --git a/include/wingdi.h b/include/wingdi.h index dbe12cd..c1acd25 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3325,6 +3325,188 @@ DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE) #define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 #define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 +typedef struct DISPLAYCONFIG_DESKTOP_IMAGE_INFO +{ + POINTL PathSourceSize; + RECTL DesktopImageRegion; + RECTL DesktopImageClip; +} DISPLAYCONFIG_DESKTOP_IMAGE_INFO; + +typedef enum +{ + DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE = 1, + DISPLAYCONFIG_MODE_INFO_TYPE_TARGET = 2, + DISPLAYCONFIG_MODE_INFO_TYPE_DESKTOP_IMAGE = 3, + DISPLAYCONFIG_MODE_INFO_TYPE_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_MODE_INFO_TYPE; + +typedef enum +{ + DISPLAYCONFIG_PIXELFORMAT_8BPP = 1, + DISPLAYCONFIG_PIXELFORMAT_16BPP = 2, + DISPLAYCONFIG_PIXELFORMAT_24BPP = 3, + DISPLAYCONFIG_PIXELFORMAT_32BPP = 4, + DISPLAYCONFIG_PIXELFORMAT_NONGDI = 5, + DISPLAYCONFIG_PIXELFORMAT_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_PIXELFORMAT; + +typedef enum +{ + DISPLAYCONFIG_ROTATION_IDENTITY = 1, + DISPLAYCONFIG_ROTATION_ROTATE90 = 2, + DISPLAYCONFIG_ROTATION_ROTATE180 = 3, + DISPLAYCONFIG_ROTATION_ROTATE270 = 4, + DISPLAYCONFIG_ROTATION_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_ROTATION; + +typedef enum +{ + DISPLAYCONFIG_SCALING_IDENTITY = 1, + DISPLAYCONFIG_SCALING_CENTERED = 2, + DISPLAYCONFIG_SCALING_STRETCHED = 3, + DISPLAYCONFIG_SCALING_ASPECTRATIOCENTEREDMAX = 4, + DISPLAYCONFIG_SCALING_CUSTOM = 5, + DISPLAYCONFIG_SCALING_PREFERRED = 128, + DISPLAYCONFIG_SCALING_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_SCALING; + +typedef enum +{ + DISPLAYCONFIG_SCANLINE_ORDERING_UNSPECIFIED = 0, + DISPLAYCONFIG_SCANLINE_ORDERING_PROGRESSIVE = 1, + DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED = 2, + DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED_UPPERFIELDFIRST = DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED, + DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED_LOWERFIELDFIRST = 3, + DISPLAYCONFIG_SCANLINE_ORDERING_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_SCANLINE_ORDERING; + +typedef enum +{ + DISPLAYCONFIG_TOPOLOGY_INTERNAL = 0x00000001, + DISPLAYCONFIG_TOPOLOGY_CLONE = 0x00000002, + DISPLAYCONFIG_TOPOLOGY_EXTEND = 0x00000004, + DISPLAYCONFIG_TOPOLOGY_EXTERNAL = 0x00000008, + DISPLAYCONFIG_TOPOLOGY_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_TOPOLOGY_ID; + +typedef enum +{ + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER = -1, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HD15 = 0, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SVIDEO = 1, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPOSITE_VIDEO = 2, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPONENT_VIDEO = 3, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DVI = 4, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HDMI = 5, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_LVDS = 6, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_D_JPN = 8, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDI = 9, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL = 10, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EMBEDDED = 11, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EXTERNAL = 12, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EMBEDDED = 13, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDTVDONGLE = 14, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_MIRACAST = 15, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL = 0x80000000, + DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY; + +typedef struct DISPLAYCONFIG_2DREGION +{ + UINT32 cx; + UINT32 cy; +} DISPLAYCONFIG_2DREGION; + +typedef struct DISPLAYCONFIG_RATIONAL +{ + UINT32 Numerator; + UINT32 Denominator; +} DISPLAYCONFIG_RATIONAL; + +typedef struct DISPLAYCONFIG_PATH_SOURCE_INFO +{ + LUID adapterId; + UINT32 id; + union { + UINT32 modeInfoIdx; + struct { + UINT32 cloneGroupId :16; + UINT32 sourceModeInfoIdx :16; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + UINT32 statusFlags; +} DISPLAYCONFIG_PATH_SOURCE_INFO; + +typedef struct DISPLAYCONFIG_SOURCE_MODE +{ + UINT32 width; + UINT32 height; + DISPLAYCONFIG_PIXELFORMAT pixelFormat; + POINTL position; +} DISPLAYCONFIG_SOURCE_MODE; + +typedef struct DISPLAYCONFIG_VIDEO_SIGNAL_INFO +{ + UINT64 pixelRate; + DISPLAYCONFIG_RATIONAL hSyncFreq; + DISPLAYCONFIG_RATIONAL vSyncFreq; + DISPLAYCONFIG_2DREGION activeSize; + DISPLAYCONFIG_2DREGION totalSize; + union { + struct { + UINT32 videoStandard :16; + UINT32 vSyncFreqDivider :6; + UINT32 reserved :10; + } AdditionalSignalInfo; + UINT32 videoStandard; + } DUMMYUNIONNAME; + DISPLAYCONFIG_SCANLINE_ORDERING scanLineOrdering; +} DISPLAYCONFIG_VIDEO_SIGNAL_INFO; + +typedef struct DISPLAYCONFIG_PATH_TARGET_INFO +{ + LUID adapterId; + UINT32 id; + union { + UINT32 modeInfoIdx; + struct { + UINT32 desktopModeInfoIdx :16; + UINT32 targetModeInfoIdx :16; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY outputTechnology; + DISPLAYCONFIG_ROTATION rotation; + DISPLAYCONFIG_SCALING scaling; + DISPLAYCONFIG_RATIONAL refreshRate; + DISPLAYCONFIG_SCANLINE_ORDERING scanLineOrdering; + BOOL targetAvailable; + UINT32 statusFlags; +} DISPLAYCONFIG_PATH_TARGET_INFO; + +typedef struct DISPLAYCONFIG_TARGET_MODE +{ + DISPLAYCONFIG_VIDEO_SIGNAL_INFO targetVideoSignalInfo; +} DISPLAYCONFIG_TARGET_MODE; + +typedef struct DISPLAYCONFIG_PATH_INFO +{ + DISPLAYCONFIG_PATH_SOURCE_INFO sourceInfo; + DISPLAYCONFIG_PATH_TARGET_INFO targetInfo; + UINT32 flags; +} DISPLAYCONFIG_PATH_INFO; + +typedef struct DISPLAYCONFIG_MODE_INFO +{ + DISPLAYCONFIG_MODE_INFO_TYPE infoType; + UINT32 id; + LUID adapterId; + union { + DISPLAYCONFIG_TARGET_MODE targetMode; + DISPLAYCONFIG_SOURCE_MODE sourceMode; + DISPLAYCONFIG_DESKTOP_IMAGE_INFO desktopImageInfo; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_MODE_INFO; + /* For GetDisplayConfigBufferSizes */ #define QDC_ALL_PATHS 0x00000001 #define QDC_ONLY_ACTIVE_PATHS 0x00000002

1 0