April 2018 - Wine-commits - list.winehq.org

Matteo Bruni : ddraw: Forbid setting viewport extents larger than the render target in SetViewport ().
by Alexandre Julliard 20 Apr '18

20 Apr '18

Module: wine Branch: master Commit: 700394f5ff748bd949c12120ee6c15150dc8cbb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=700394f5ff748bd949c12120… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 20 00:55:40 2018 +0200 ddraw: Forbid setting viewport extents larger than the render target in SetViewport(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/viewport.c | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 0bc746e..fad079f 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -299,7 +299,10 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE { struct d3d_viewport *viewport = impl_from_IDirect3DViewport3(iface); struct d3d_device *device = viewport->active_device; + struct wined3d_sub_resource_desc rt_desc; + struct wined3d_rendertarget_view *rtv; IDirect3DViewport3 *current_viewport; + struct ddraw_surface *surface; TRACE("iface %p, vp %p.\n", iface, vp); @@ -312,8 +315,33 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE _dump_D3DVIEWPORT(vp); } + if (!device) + { + WARN("Viewport not bound to a device, returning D3DERR_VIEWPORTHASNODEVICE.\n"); + return D3DERR_VIEWPORTHASNODEVICE; + } + wined3d_mutex_lock(); + if (device->version > 1) + { + if (!(rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + { + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + surface = wined3d_rendertarget_view_get_sub_resource_parent(rtv); + wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, surface->sub_resource_idx, &rt_desc); + + if (vp->dwX > rt_desc.width || vp->dwWidth > rt_desc.width - vp->dwX + || vp->dwY > rt_desc.height || vp->dwHeight > rt_desc.height - vp->dwY) + { + WARN("Invalid viewport, returning DDERR_INVALIDPARAMS.\n"); + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; + } + } + viewport->use_vp2 = 0; memset(&viewport->viewports.vp1, 0, sizeof(viewport->viewports.vp1)); memcpy(&viewport->viewports.vp1, vp, vp->dwSize); @@ -323,14 +351,11 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE viewport->viewports.vp1.dvMinZ = 0.0; viewport->viewports.vp1.dvMaxZ = 1.0; - if (device) + if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(&device->IDirect3DDevice3_iface, &current_viewport))) { - if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(&device->IDirect3DDevice3_iface, &current_viewport))) - { - if (current_viewport == iface) - viewport_activate(viewport, FALSE); - IDirect3DViewport3_Release(current_viewport); - } + if (current_viewport == iface) + viewport_activate(viewport, FALSE); + IDirect3DViewport3_Release(current_viewport); } wined3d_mutex_unlock();

1 0

Matteo Bruni : ddraw/tests: Port test_viewport() to ddraw2.
by Alexandre Julliard 20 Apr '18

20 Apr '18

Module: wine Branch: master Commit: f5bd6e4dcd0062dc742047c6220adf454a4b3655 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5bd6e4dcd0062dc742047c6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 20 00:55:41 2018 +0200 ddraw/tests: Port test_viewport() to ddraw2. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 243 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 241 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f5bd6e4dcd0062dc7420…

1 0

Matteo Bruni : ddraw/tests: Port test_viewport() to ddraw1.
by Alexandre Julliard 20 Apr '18

20 Apr '18

Module: wine Branch: master Commit: 2ca4c8360f4bcb03e55dc66a06036a32e0eaa87d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ca4c8360f4bcb03e55dc66a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 20 00:55:42 2018 +0200 ddraw/tests: Port test_viewport() to ddraw1. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 223 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 221 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 4c2e703..fb0858f 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -33,6 +33,11 @@ static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); #define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) #endif +struct vec2 +{ + float x, y; +}; + struct vec4 { float x, y, z, w; @@ -263,6 +268,45 @@ static D3DCOLOR get_surface_color(IDirectDrawSurface *surface, UINT x, UINT y) return color; } +static void check_rect(IDirectDrawSurface *surface, RECT r, const char *message) +{ + LONG x_coords[2][2] = + { + {r.left - 1, r.left + 1}, + {r.right + 1, r.right - 1}, + }; + LONG y_coords[2][2] = + { + {r.top - 1, r.top + 1}, + {r.bottom + 1, r.bottom - 1} + }; + unsigned int i, j, x_side, y_side; + DWORD color; + LONG x, y; + + for (i = 0; i < 2; ++i) + { + for (j = 0; j < 2; ++j) + { + for (x_side = 0; x_side < 2; ++x_side) + { + for (y_side = 0; y_side < 2; ++y_side) + { + DWORD expected = (x_side == 1 && y_side == 1) ? 0x00ffffff : 0x00000000; + + x = x_coords[i][x_side]; + y = y_coords[j][y_side]; + if (x < 0 || x >= 640 || y < 0 || y >= 480) + continue; + color = get_surface_color(surface, x, y); + ok(color == expected, "%s: Pixel (%d, %d) has color %08x, expected %08x\n", + message, x, y, color, expected); + } + } + } + } +} + static void emit_process_vertices(void **ptr, DWORD flags, WORD base_idx, DWORD vertex_count) { D3DINSTRUCTION *inst = *ptr; @@ -1165,7 +1209,7 @@ static ULONG get_refcount(IUnknown *test_iface) return IUnknown_Release(test_iface); } -static void test_viewport(void) +static void test_viewport_object(void) { IDirectDraw *ddraw; IDirect3D *d3d; @@ -11371,6 +11415,180 @@ static void test_execute_data(void) DestroyWindow(window); } +static void test_viewport(void) +{ + static struct + { + D3DVIEWPORT7 vp; + RECT expected_rect; + const char *message; + } + tests[] = + { + {{ 0, 0, 640, 480}, { 0, 120, 479, 359}, "(0, 0) - (640, 480) viewport"}, + {{ 0, 0, 320, 240}, { 0, 60, 239, 179}, "(0, 0) - (320, 240) viewport"}, + {{ 0, 0, 1280, 960}, {-10, -10, -1, -1}, "(0, 0) - (1280, 960) viewport"}, + {{ 0, 0, 2000, 1600}, {-10, -10, -1, -1}, "(0, 0) - (2000, 1600) viewport"}, + {{100, 100, 640, 480}, {-10, -10, -1, -1}, "(100, 100) - (640, 480) viewport"}, + {{ 0, 0, 8192, 8192}, {-10, -10, -1, -1}, "(0, 0) - (8192, 8192) viewport"}, + }; + static D3DMATRIX mat = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }; + static D3DLVERTEX quad[] = + { + {{-1.5f}, {-0.5f}, {0.1f}, 0, {0xffffffff}}, + {{-1.5f}, { 0.5f}, {0.1f}, 0, {0xffffffff}}, + {{ 0.5f}, {-0.5f}, {0.1f}, 0, {0xffffffff}}, + {{ 0.5f}, { 0.5f}, {0.1f}, 0, {0xffffffff}}, + }; + D3DMATRIXHANDLE world_handle, view_handle, proj_handle; + IDirect3DViewport *viewport, *full_viewport; + IDirect3DExecuteBuffer *execute_buffer; + IDirect3DMaterial *black_background; + D3DEXECUTEBUFFERDESC exec_desc; + IDirect3DDevice *device; + IDirectDrawSurface *rt; + IDirectDraw *ddraw; + D3DRECT clear_rect; + UINT inst_length; + unsigned int j; + IDirect3D *d3d; + D3DVIEWPORT vp; + ULONG refcount; + HWND window; + HRESULT hr; + void *ptr; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D3 interface, hr %#x.\n", hr); + + black_background = create_diffuse_material(device, 0.0f, 0.0f, 0.0f, 0.0f); + + hr = IDirect3DDevice_CreateMatrix(device, &world_handle); + ok(SUCCEEDED(hr), "Creating a matrix object failed, hr %#x.\n", hr); + hr = IDirect3DDevice_SetMatrix(device, world_handle, &mat); + ok(SUCCEEDED(hr), "Setting a matrix object failed, hr %#x.\n", hr); + hr = IDirect3DDevice_CreateMatrix(device, &view_handle); + ok(SUCCEEDED(hr), "Creating a matrix object failed, hr %#x.\n", hr); + hr = IDirect3DDevice_SetMatrix(device, view_handle, &mat); + ok(SUCCEEDED(hr), "Setting a matrix object failed, hr %#x.\n", hr); + hr = IDirect3DDevice_CreateMatrix(device, &proj_handle); + ok(SUCCEEDED(hr), "Creating a matrix object failed, hr %#x.\n", hr); + hr = IDirect3DDevice_SetMatrix(device, proj_handle, &mat); + ok(SUCCEEDED(hr), "Setting a matrix object failed, hr %#x.\n", hr); + + memset(&exec_desc, 0, sizeof(exec_desc)); + exec_desc.dwSize = sizeof(exec_desc); + exec_desc.dwFlags = D3DDEB_BUFSIZE | D3DDEB_CAPS; + exec_desc.dwBufferSize = 1024; + exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY; + + hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr); + + hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); + ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#x.\n", hr); + + memcpy(exec_desc.lpData, quad, sizeof(quad)); + ptr = ((BYTE *)exec_desc.lpData) + sizeof(quad); + emit_set_ts(&ptr, D3DTRANSFORMSTATE_WORLD, world_handle); + emit_set_ts(&ptr, D3DTRANSFORMSTATE_VIEW, view_handle); + emit_set_ts(&ptr, D3DTRANSFORMSTATE_PROJECTION, proj_handle); + emit_set_rs(&ptr, D3DRENDERSTATE_ZENABLE, FALSE); + emit_set_rs(&ptr, D3DRENDERSTATE_FOGENABLE, FALSE); + emit_set_rs(&ptr, D3DRENDERSTATE_CULLMODE, D3DCULL_NONE); + emit_process_vertices(&ptr, D3DPROCESSVERTICES_TRANSFORM, 0, 4); + emit_tquad(&ptr, 0); + emit_end(&ptr); + inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData; + inst_length -= sizeof(quad); + + hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); + ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); + + full_viewport = create_viewport(device, 0, 0, 640, 480); + viewport_set_background(device, full_viewport, black_background); + + U1(clear_rect).x1 = U2(clear_rect).y1 = 0; + U3(clear_rect).x2 = 640; + U4(clear_rect).y2 = 480; + + for (j = 0; j < ARRAY_SIZE(tests); ++j) + { + hr = IDirect3DViewport_Clear(full_viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x (j %u).\n", hr, j); + + hr = IDirect3D_CreateViewport(d3d, &viewport, NULL); + ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x (j %u).\n", hr, j); + memset(&vp, 0, sizeof(vp)); + vp.dwSize = sizeof(vp); + vp.dwX = tests[j].vp.dwX; + vp.dwY = tests[j].vp.dwY; + vp.dwWidth = tests[j].vp.dwWidth; + vp.dwHeight = tests[j].vp.dwHeight; + vp.dvScaleX = tests[j].vp.dwWidth / 2.0f; + vp.dvScaleY = tests[j].vp.dwHeight / 2.0f; + vp.dvMaxX = 1.0f; + vp.dvMaxY = 1.0f; + vp.dvMinZ = 0.0f; + vp.dvMaxZ = 1.0f; + hr = IDirect3DViewport_SetViewport(viewport, &vp); + ok(hr == D3DERR_VIEWPORTHASNODEVICE, + "Setting viewport data returned unexpected hr %#x (j %u).\n", hr, j); + hr = IDirect3DDevice_AddViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to add viewport, hr %#x (j %u).\n", hr, j); + hr = IDirect3DViewport_SetViewport(viewport, &vp); + ok(SUCCEEDED(hr), "Failed to set viewport data, hr %#x (j %u).\n", hr, j); + + hr = IDirect3DDevice_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x (j %u).\n", hr, j); + + set_execute_data(execute_buffer, 4, sizeof(quad), inst_length); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x (j %u).\n", hr, j); + + hr = IDirect3DDevice_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x (j %u).\n", hr, j); + + check_rect(rt, tests[j].expected_rect, tests[j].message); + + destroy_viewport(device, viewport); + } + + destroy_viewport(device, full_viewport); + IDirectDrawSurface_Release(rt); + + IDirect3DExecuteBuffer_Release(execute_buffer); + IDirect3DDevice_DeleteMatrix(device, world_handle); + IDirect3DDevice_DeleteMatrix(device, view_handle); + IDirect3DDevice_DeleteMatrix(device, proj_handle); + destroy_material(black_background); + refcount = IDirect3DDevice_Release(device); + IDirect3D2_Release(d3d); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -11414,7 +11632,7 @@ START_TEST(ddraw1) test_coop_level_d3d_state(); test_surface_interface_mismatch(); test_coop_level_threaded(); - test_viewport(); + test_viewport_object(); test_zenable(); test_ck_rgba(); test_ck_default(); @@ -11473,4 +11691,5 @@ START_TEST(ddraw1) test_clear(); test_enum_surfaces(); test_execute_data(); + test_viewport(); }

1 0

Zebediah Figura : msi: Make MsiViewClose() RPC-compatible.
by Alexandre Julliard 20 Apr '18

20 Apr '18

Module: wine Branch: master Commit: 9ab15d4edea1ab0c80f9d3ea15d9855aba2f4880 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ab15d4edea1ab0c80f9d3ea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 19 23:44:13 2018 -0500 msi: Make MsiViewClose() RPC-compatible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msiquery.c | 16 ++++++++++++++-- dlls/msi/tests/custom.c | 3 +++ dlls/msi/winemsi.idl | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 6eddf7a..682881e 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -440,8 +440,15 @@ UINT WINAPI MsiViewClose(MSIHANDLE hView) TRACE("%d\n", hView ); query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW ); - if( !query ) - return ERROR_INVALID_HANDLE; + if (!query) + { + MSIHANDLE remote; + + if (!(remote = msi_get_remote(hView))) + return ERROR_INVALID_HANDLE; + + return remote_ViewClose(remote); + } ret = MSI_ViewClose( query ); msiobj_release( &query->hdr ); @@ -1055,6 +1062,11 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( return r; } +UINT __cdecl remote_ViewClose(MSIHANDLE view) +{ + return MsiViewClose(view); +} + UINT __cdecl remote_ViewExecute(MSIHANDLE view, struct wire_record *remote_rec) { MSIHANDLE rec = 0; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 479cb93..3d7ebb9 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -316,6 +316,9 @@ static void test_db(MSIHANDLE hinst) ok(hinst, r == ERROR_NO_MORE_ITEMS, "got %u\n", r); ok(hinst, !rec2, "got %u\n", rec2); + r = MsiViewClose(view); + ok(hinst, !r, "got %u\n", r); + r = MsiCloseHandle(view); ok(hinst, !r, "got %u\n", r); diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index b892f34..74b5923 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -56,6 +56,7 @@ struct wire_record { ] interface IWineMsiRemote { + UINT remote_ViewClose( [in] MSIHANDLE view ); UINT remote_ViewExecute( [in] MSIHANDLE view, [in, unique] struct wire_record *record ); UINT remote_ViewFetch( [in] MSIHANDLE view, [out] struct wire_record **record );

1 0

Zebediah Figura : msi: Make MsiViewGetColumnInfo() RPC-compatible.
by Alexandre Julliard 20 Apr '18

20 Apr '18

Module: wine Branch: master Commit: cea37419f1d16798ca24ad14712f14dac136f7d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cea37419f1d16798ca24ad14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 19 23:44:14 2018 -0500 msi: Make MsiViewGetColumnInfo() RPC-compatible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msiquery.c | 30 ++++++++++++++++++++++++++++-- dlls/msi/tests/custom.c | 12 ++++++++++++ dlls/msi/winemsi.idl | 2 ++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 682881e..e73701f 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -603,8 +603,23 @@ UINT WINAPI MsiViewGetColumnInfo(MSIHANDLE hView, MSICOLINFO info, MSIHANDLE *hR return ERROR_INVALID_PARAMETER; query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW ); - if( !query ) - return ERROR_INVALID_HANDLE; + if (!query) + { + struct wire_record *wire_rec = NULL; + MSIHANDLE remote; + + if (!(remote = msi_get_remote(hView))) + return ERROR_INVALID_HANDLE; + + r = remote_ViewGetColumnInfo(remote, info, &wire_rec); + if (!r) + { + r = unmarshal_record(wire_rec, hRec); + free_remote_record(wire_rec); + } + + return r; + } r = MSI_ViewGetColumnInfo( query, info, &rec ); if ( r == ERROR_SUCCESS ) @@ -1091,3 +1106,14 @@ UINT __cdecl remote_ViewFetch(MSIHANDLE view, struct wire_record **rec) MsiCloseHandle(handle); return r; } + +UINT __cdecl remote_ViewGetColumnInfo(MSIHANDLE view, MSICOLINFO info, struct wire_record **rec) +{ + MSIHANDLE handle; + UINT r = MsiViewGetColumnInfo(view, info, &handle); + *rec = NULL; + if (!r) + *rec = marshal_record(handle); + MsiCloseHandle(handle); + return r; +} diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 3d7ebb9..d6b186c 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -263,6 +263,18 @@ static void test_db(MSIHANDLE hinst) r = MsiDatabaseOpenViewA(hdb, "SELECT * FROM `Test`", &view); ok(hinst, !r, "got %u\n", r); + r = MsiViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec2); + ok(hinst, !r, "got %u\n", r); + + sz = sizeof(buffer); + r = MsiRecordGetStringA(rec2, 1, buffer, &sz); + ok(hinst, !r, "got %u\n", r); + ok(hinst, sz == strlen(buffer), "got size %u\n", sz); + ok(hinst, !strcmp(buffer, "Name"), "got '%s'\n", buffer); + + r = MsiCloseHandle(rec2); + ok(hinst, !r, "got %u\n", r); + r = MsiViewExecute(view, 0); ok(hinst, !r, "got %u\n", r); diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 74b5923..628091b 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -27,6 +27,7 @@ typedef int INSTALLMESSAGE; typedef int MSICONDITION; typedef int MSIRUNMODE; typedef int INSTALLSTATE; +typedef int MSICOLINFO; #define MSIFIELD_NULL 0 #define MSIFIELD_INT 1 @@ -59,6 +60,7 @@ interface IWineMsiRemote UINT remote_ViewClose( [in] MSIHANDLE view ); UINT remote_ViewExecute( [in] MSIHANDLE view, [in, unique] struct wire_record *record ); UINT remote_ViewFetch( [in] MSIHANDLE view, [out] struct wire_record **record ); + UINT remote_ViewGetColumnInfo( [in] MSIHANDLE view, [in] MSICOLINFO info, [out] struct wire_record **record ); MSICONDITION remote_DatabaseIsTablePersistent( [in] MSIHANDLE db, [in] LPCWSTR table ); HRESULT remote_DatabaseGetPrimaryKeys( [in] MSIHANDLE db, [in] LPCWSTR table, [out] MSIHANDLE *keys );

1 0

Zebediah Figura : msi: Make MsiViewModify() RPC-compatible.
by Alexandre Julliard 20 Apr '18

20 Apr '18

Module: wine Branch: master Commit: c79fbc241e3c9a62ab50fb0826e33e85e97ae883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c79fbc241e3c9a62ab50fb08… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 19 23:44:15 2018 -0500 msi: Make MsiViewModify() RPC-compatible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msipriv.h | 1 + dlls/msi/msiquery.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ dlls/msi/record.c | 31 +++++++++++++++++++------------ dlls/msi/tests/custom.c | 29 +++++++++++++++++++++++++++++ dlls/msi/winemsi.idl | 3 +++ 5 files changed, 95 insertions(+), 18 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index f386f90..aede960 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -833,6 +833,7 @@ extern void dump_record(MSIRECORD *) DECLSPEC_HIDDEN; extern UINT unmarshal_record(const struct wire_record *in, MSIHANDLE *out) DECLSPEC_HIDDEN; extern struct wire_record *marshal_record(MSIHANDLE handle) DECLSPEC_HIDDEN; extern void free_remote_record(struct wire_record *rec) DECLSPEC_HIDDEN; +extern UINT copy_remote_record(const struct wire_record *rec, MSIHANDLE handle) DECLSPEC_HIDDEN; /* stream internals */ extern void enum_stream_names( IStorage *stg ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index e73701f..e3bcfd8 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -666,17 +666,36 @@ UINT WINAPI MsiViewModify( MSIHANDLE hView, MSIMODIFY eModifyMode, TRACE("%d %x %d\n", hView, eModifyMode, hRecord); - query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW ); - if( !query ) + rec = msihandle2msiinfo( hRecord, MSIHANDLETYPE_RECORD ); + + if (!rec) return ERROR_INVALID_HANDLE; - rec = msihandle2msiinfo( hRecord, MSIHANDLETYPE_RECORD ); + query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW ); + if (!query) + { + struct wire_record *wire_refreshed = NULL; + MSIHANDLE remote; + + if (!(remote = msi_get_remote(hView))) + return ERROR_INVALID_HANDLE; + + r = remote_ViewModify(remote, eModifyMode, + (struct wire_record *)&rec->count, &wire_refreshed); + if (!r && (eModifyMode == MSIMODIFY_REFRESH || eModifyMode == MSIMODIFY_SEEK)) + { + r = copy_remote_record(wire_refreshed, hRecord); + free_remote_record(wire_refreshed); + } + + msiobj_release(&rec->hdr); + return r; + } + r = MSI_ViewModify( query, eModifyMode, rec ); msiobj_release( &query->hdr ); - if( rec ) - msiobj_release( &rec->hdr ); - + msiobj_release(&rec->hdr); return r; } @@ -1117,3 +1136,21 @@ UINT __cdecl remote_ViewGetColumnInfo(MSIHANDLE view, MSICOLINFO info, struct wi MsiCloseHandle(handle); return r; } + +UINT __cdecl remote_ViewModify(MSIHANDLE view, MSIMODIFY mode, + struct wire_record *remote_rec, struct wire_record **remote_refreshed) +{ + MSIHANDLE handle = 0; + UINT r; + + if ((r = unmarshal_record(remote_rec, &handle))) + return r; + + r = MsiViewModify(view, mode, handle); + *remote_refreshed = NULL; + if (!r && (mode == MSIMODIFY_REFRESH || mode == MSIMODIFY_SEEK)) + *remote_refreshed = marshal_record(handle); + + MsiCloseHandle(handle); + return r; +} diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 91892d7..5804046 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -1055,26 +1055,22 @@ void dump_record(MSIRECORD *rec) TRACE("]\n"); } -UINT unmarshal_record(const struct wire_record *in, MSIHANDLE *out) +UINT copy_remote_record(const struct wire_record *in, MSIHANDLE out) { MSIRECORD *rec; unsigned int i; UINT r; - if (!in) - { - *out = 0; - return ERROR_SUCCESS; - } - - rec = MSI_CreateRecord(in->count); - if (!rec) return ERROR_OUTOFMEMORY; + if (!(rec = msihandle2msiinfo(out, MSIHANDLETYPE_RECORD))) + return ERROR_INVALID_HANDLE; for (i = 0; i <= in->count; i++) { switch (in->fields[i].type) { case MSIFIELD_NULL: + MSI_FreeField(&rec->fields[i]); + rec->fields[i].type = MSIFIELD_NULL; break; case MSIFIELD_INT: r = MSI_RecordSetInteger(rec, i, in->fields[i].u.iVal); @@ -1097,13 +1093,24 @@ UINT unmarshal_record(const struct wire_record *in, MSIHANDLE *out) } } - *out = alloc_msihandle(&rec->hdr); - if (!*out) return ERROR_OUTOFMEMORY; - msiobj_release(&rec->hdr); return ERROR_SUCCESS; } +UINT unmarshal_record(const struct wire_record *in, MSIHANDLE *out) +{ + if (!in) + { + *out = 0; + return ERROR_SUCCESS; + } + + *out = MsiCreateRecord(in->count); + if (!*out) return ERROR_OUTOFMEMORY; + + return copy_remote_record(in, *out); +} + struct wire_record *marshal_record(MSIHANDLE handle) { struct wire_record *ret; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index d6b186c..79d90f0 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -321,6 +321,35 @@ static void test_db(MSIHANDLE hinst) ok(hinst, !r, "got %u\n", r); ok(hinst, !memcmp(buffer, "duo", 3), "wrong data\n"); + r = MsiViewModify(view, MSIMODIFY_REFRESH, 0); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiRecordSetStringA(rec2, 1, "three"); + ok(hinst, !r, "got %u\n", r); + + r = MsiRecordSetInteger(rec2, 2, 3); + ok(hinst, !r, "got %u\n", r); + + r = MsiRecordSetInteger(rec2, 3, 3); + ok(hinst, !r, "got %u\n", r); + + r = MsiViewModify(view, MSIMODIFY_REFRESH, rec2); + ok(hinst, !r, "got %d\n", r); + + sz = sizeof(buffer); + r = MsiRecordGetStringA(rec2, 1, buffer, &sz); + ok(hinst, !r, "got %u\n", r); + ok(hinst, sz == strlen(buffer), "got size %u\n", sz); + ok(hinst, !strcmp(buffer, "two"), "got '%s'\n", buffer); + + r = MsiRecordGetInteger(rec2, 2); + ok(hinst, r == 2, "got %d\n", r); + + sz = sizeof(buffer); + r = MsiRecordReadStream(rec2, 3, buffer, &sz); + ok(hinst, !r, "got %u\n", r); + ok(hinst, !memcmp(buffer, "duo", 3), "wrong data\n"); + r = MsiCloseHandle(rec2); ok(hinst, !r, "got %u\n", r); diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 628091b..3fbd6d2 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -28,6 +28,7 @@ typedef int MSICONDITION; typedef int MSIRUNMODE; typedef int INSTALLSTATE; typedef int MSICOLINFO; +typedef int MSIMODIFY; #define MSIFIELD_NULL 0 #define MSIFIELD_INT 1 @@ -61,6 +62,8 @@ interface IWineMsiRemote UINT remote_ViewExecute( [in] MSIHANDLE view, [in, unique] struct wire_record *record ); UINT remote_ViewFetch( [in] MSIHANDLE view, [out] struct wire_record **record ); UINT remote_ViewGetColumnInfo( [in] MSIHANDLE view, [in] MSICOLINFO info, [out] struct wire_record **record ); + UINT remote_ViewModify( [in] MSIHANDLE view, [in] MSIMODIFY mode, + [in] struct wire_record *record, [out] struct wire_record **refreshed ); MSICONDITION remote_DatabaseIsTablePersistent( [in] MSIHANDLE db, [in] LPCWSTR table ); HRESULT remote_DatabaseGetPrimaryKeys( [in] MSIHANDLE db, [in] LPCWSTR table, [out] MSIHANDLE *keys );

1 0

Zebediah Figura : msi/tests: Add tests for MsiDatabaseGetPrimaryKeys().
by Alexandre Julliard 20 Apr '18

20 Apr '18

Module: wine Branch: master Commit: 3a1d9bb915952fd69f16c32cbea29983d9a5a5fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a1d9bb915952fd69f16c32c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 19 23:44:16 2018 -0500 msi/tests: Add tests for MsiDatabaseGetPrimaryKeys(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/db.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 3cbb9b3..e2328ab 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -9701,6 +9701,46 @@ static void test_select_column_names(void) ok(r == ERROR_SUCCESS , "failed to close database: %u\n", r); } +static void test_primary_keys(void) +{ + MSIHANDLE hdb, keys; + UINT r; + + hdb = create_db(); + + r = MsiDatabaseGetPrimaryKeysA(hdb, "T", &keys); + ok(r == ERROR_INVALID_TABLE, "got %u\n", r); + + r = run_query(hdb, 0, "CREATE TABLE `T` (`A` SHORT, `B` SHORT, `C` SHORT PRIMARY KEY `A`)"); + ok(!r, "got %u\n", r); + + r = MsiDatabaseGetPrimaryKeysA(hdb, "T", &keys); + ok(!r, "got %u\n", r); + + r = MsiRecordGetFieldCount(keys); + ok(r == 1, "got %d\n", r); + ok(check_record(keys, 0, "T"), "expected 'T'"); + ok(check_record(keys, 1, "A"), "expected 'A'"); + + MsiCloseHandle(keys); + + r = run_query(hdb, 0, "CREATE TABLE `U` (`A` SHORT, `B` SHORT, `C` SHORT PRIMARY KEY `B`, `C`)"); + ok(!r, "got %u\n", r); + + r = MsiDatabaseGetPrimaryKeysA(hdb, "U", &keys); + ok(!r, "got %u\n", r); + + r = MsiRecordGetFieldCount(keys); + ok(r == 2, "got %d\n", r); + ok(check_record(keys, 0, "U"), "expected 'U'"); + ok(check_record(keys, 1, "B"), "expected 'B'"); + ok(check_record(keys, 2, "C"), "expected 'C'"); + + MsiCloseHandle(keys); + MsiCloseHandle(hdb); + DeleteFileA(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -9756,4 +9796,5 @@ START_TEST(db) test_collation(); test_embedded_nulls(); test_select_column_names(); + test_primary_keys(); }

1 0

Zebediah Figura : msi: Make MsiDatabaseGetPrimaryKeys() RPC-compatible.
by Alexandre Julliard 20 Apr '18

20 Apr '18

Module: wine Branch: master Commit: ed0a8dd3bfb5dbe6899cd1315c366d9fd833f060 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed0a8dd3bfb5dbe6899cd131… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 19 23:44:17 2018 -0500 msi: Make MsiDatabaseGetPrimaryKeys() RPC-compatible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/database.c | 11 ++++++++--- dlls/msi/msiquery.c | 15 ++++++--------- dlls/msi/tests/custom.c | 22 ++++++++++++++++++++++ dlls/msi/winemsi.idl | 2 +- 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index c1cf493..7c0c4a9 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1911,10 +1911,15 @@ MSICONDITION __cdecl remote_DatabaseIsTablePersistent(MSIHANDLE db, LPCWSTR tabl return MsiDatabaseIsTablePersistentW(db, table); } -HRESULT __cdecl remote_DatabaseGetPrimaryKeys(MSIHANDLE db, LPCWSTR table, MSIHANDLE *keys) +UINT __cdecl remote_DatabaseGetPrimaryKeys(MSIHANDLE db, LPCWSTR table, struct wire_record **rec) { - UINT r = MsiDatabaseGetPrimaryKeysW(db, table, keys); - return HRESULT_FROM_WIN32(r); + MSIHANDLE handle; + UINT r = MsiDatabaseGetPrimaryKeysW(db, table, &handle); + *rec = NULL; + if (!r) + *rec = marshal_record(handle); + MsiCloseHandle(handle); + return r; } HRESULT __cdecl remote_DatabaseGetSummaryInformation(MSIHANDLE db, UINT updatecount, MSIHANDLE *suminfo) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index e3bcfd8..42ee8c7 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -998,23 +998,20 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysW( MSIHANDLE hdb, db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); if( !db ) { + struct wire_record *wire_rec = NULL; MSIHANDLE remote; - HRESULT hr; if (!(remote = msi_get_remote(hdb))) return ERROR_INVALID_HANDLE; - hr = remote_DatabaseGetPrimaryKeys(remote, table, phRec); - - if (FAILED(hr)) + r = remote_DatabaseGetPrimaryKeys(remote, table, &wire_rec); + if (!r) { - if (HRESULT_FACILITY(hr) == FACILITY_WIN32) - return HRESULT_CODE(hr); - - return ERROR_FUNCTION_FAILED; + r = unmarshal_record(wire_rec, phRec); + free_remote_record(wire_rec); } - return ERROR_SUCCESS; + return r; } r = MSI_DatabaseGetPrimaryKeys( db, table, &rec ); diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 79d90f0..cdefefd 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -391,6 +391,28 @@ static void test_db(MSIHANDLE hinst) r = MsiCloseHandle(view); ok(hinst, !r, "got %u\n", r); + /* test MsiDatabaseGetPrimaryKeys() */ + r = MsiDatabaseGetPrimaryKeysA(hdb, "Test", &rec); + ok(hinst, !r, "got %u\n", r); + + r = MsiRecordGetFieldCount(rec); + ok(hinst, r == 1, "got %d\n", r); + + sz = sizeof(buffer); + r = MsiRecordGetStringA(rec, 0, buffer, &sz); + ok(hinst, !r, "got %u\n", r); + ok(hinst, sz == strlen(buffer), "got size %u\n", sz); + ok(hinst, !strcmp(buffer, "Test"), "got '%s'\n", buffer); + + sz = sizeof(buffer); + r = MsiRecordGetStringA(rec, 1, buffer, &sz); + ok(hinst, !r, "got %u\n", r); + ok(hinst, sz == strlen(buffer), "got size %u\n", sz); + ok(hinst, !strcmp(buffer, "Name"), "got '%s'\n", buffer); + + r = MsiCloseHandle(rec); + ok(hinst, !r, "got %u\n", r); + r = MsiCloseHandle(hdb); ok(hinst, !r, "got %u\n", r); } diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 3fbd6d2..28c3ab1 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -66,7 +66,7 @@ interface IWineMsiRemote [in] struct wire_record *record, [out] struct wire_record **refreshed ); MSICONDITION remote_DatabaseIsTablePersistent( [in] MSIHANDLE db, [in] LPCWSTR table ); - HRESULT remote_DatabaseGetPrimaryKeys( [in] MSIHANDLE db, [in] LPCWSTR table, [out] MSIHANDLE *keys ); + UINT remote_DatabaseGetPrimaryKeys( [in] MSIHANDLE db, [in, string] LPCWSTR table, [out] struct wire_record **keys ); HRESULT remote_DatabaseGetSummaryInformation( [in] MSIHANDLE db, [in] UINT updatecount, [out] MSIHANDLE *suminfo ); UINT remote_DatabaseOpenView( [in] MSIHANDLE db, [in, string] LPCWSTR query, [out] MSIHANDLE *view );

1 0

Henri Verbeet : wined3d: Handle "namedArraysLoaded" in context_unload_vertex_data().
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 8dc789fe3bd261a9dfca421eb651ccb2e72f2357 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dc789fe3bd261a9dfca421e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 16:08:13 2018 +0430 wined3d: Handle "namedArraysLoaded" in context_unload_vertex_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d3e6e41..6ec498d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5058,18 +5058,20 @@ void context_load_tex_coords(const struct wined3d_context *context, const struct checkGLcall("loadTexCoords"); } -/* This should match any arrays loaded in context_load_vertex_data(). - * TODO: Only load/unload arrays if we have to. */ -static void context_unload_vertex_data(const struct wined3d_context *context) +/* This should match any arrays loaded in context_load_vertex_data(). */ +static void context_unload_vertex_data(struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; + if (!context->namedArraysLoaded) + return; gl_info->gl_ops.gl.p_glDisableClientState(GL_VERTEX_ARRAY); gl_info->gl_ops.gl.p_glDisableClientState(GL_NORMAL_ARRAY); gl_info->gl_ops.gl.p_glDisableClientState(GL_COLOR_ARRAY); if (gl_info->supported[EXT_SECONDARY_COLOR]) gl_info->gl_ops.gl.p_glDisableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); context_unload_tex_coords(context); + context->namedArraysLoaded = FALSE; } static void context_load_vertex_data(struct wined3d_context *context, @@ -5489,10 +5491,9 @@ void context_update_stream_sources(struct wined3d_context *context, const struct context_unload_numbered_arrays(context); context->numbered_array_mask = 0; } - else if (context->namedArraysLoaded) + else { context_unload_vertex_data(context); - context->namedArraysLoaded = FALSE; } if (load_numbered)

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in context_unload_numbered_arrays().
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: e93e943ba40c5170a3d4c1bb15d636c8f33a4e86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e93e943ba40c5170a3d4c1bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 16:08:14 2018 +0430 wined3d: Use wined3d_bit_scan() in context_unload_numbered_arrays(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6ec498d..d2bcedc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5273,15 +5273,13 @@ static void context_unload_numbered_array(struct wined3d_context *context, unsig context->numbered_array_mask &= ~(1u << i); } -/* This should match any arrays loaded in loadNumberedArrays. - * TODO: Only load / unload arrays if we have to. */ static void context_unload_numbered_arrays(struct wined3d_context *context) { unsigned int i; - /* Disable any attributes. */ - for (i = 0; i < context->gl_info->limits.vertex_attribs; ++i) + while (context->numbered_array_mask) { + i = wined3d_bit_scan(&context->numbered_array_mask); context_unload_numbered_array(context, i); } }

1 0