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

Paul Gofman : d3d9/tests: Test specular lighting with zero shininess.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: a0854362d684ccce2ba24f68e9f7707d4ba3559c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0854362d684ccce2ba24f68… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 29 13:56:37 2019 +0300 d3d9/tests: Test specular lighting with zero shininess. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0ce9948..8be58bf 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -800,7 +800,68 @@ static void test_specular_lighting(void) {160, 360, 0x00000000}, {320, 360, 0x00000000}, {480, 360, 0x00000000}, + }, + expected_directional_0[] = + { + {160, 120, 0x00ffffff}, + {320, 120, 0x00ffffff}, + {480, 120, 0x00ffffff}, + {160, 240, 0x00ffffff}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00ffffff}, + {160, 360, 0x00ffffff}, + {320, 360, 0x00ffffff}, + {480, 360, 0x00ffffff}, + }, + expected_directional_local_0[] = + { + {160, 120, 0x00ffffff}, + {320, 120, 0x00ffffff}, + {480, 120, 0x00ffffff}, + {160, 240, 0x00ffffff}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00ffffff}, + {160, 360, 0x00ffffff}, + {320, 360, 0x00ffffff}, + {480, 360, 0x00ffffff}, + }, + expected_point_0[] = + { + {160, 120, 0x00aaaaaa}, + {320, 120, 0x00cccccc}, + {480, 120, 0x00aaaaaa}, + {160, 240, 0x00cccccc}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00cccccc}, + {160, 360, 0x00aaaaaa}, + {320, 360, 0x00cccccc}, + {480, 360, 0x00aaaaaa}, + }, + expected_spot_0[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x002e2e2e}, + {480, 120, 0x00000000}, + {160, 240, 0x002e2e2e}, + {320, 240, 0x00ffffff}, + {480, 240, 0x002e2e2e}, + {160, 360, 0x00000000}, + {320, 360, 0x002e2e2e}, + {480, 360, 0x00000000}, + }, + expected_point_range_0[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00cccccc}, + {480, 120, 0x00000000}, + {160, 240, 0x00cccccc}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00cccccc}, + {160, 360, 0x00000000}, + {320, 360, 0x00cccccc}, + {480, 360, 0x00000000}, }; + static const struct { const D3DLIGHT9 *light; @@ -819,6 +880,13 @@ static void test_specular_lighting(void) {&spot, TRUE, 30.0f, expected_spot_local, ARRAY_SIZE(expected_spot_local)}, {&point_range, FALSE, 30.0f, expected_point_range, ARRAY_SIZE(expected_point_range)}, {&point_side, TRUE, 0.0f, expected_point_side, ARRAY_SIZE(expected_point_side)}, + {&directional, FALSE, 0.0f, expected_directional_0, ARRAY_SIZE(expected_directional_0)}, + {&directional, TRUE, 0.0f, expected_directional_local_0, ARRAY_SIZE(expected_directional_local_0)}, + {&point, FALSE, 0.0f, expected_point_0, ARRAY_SIZE(expected_point_0)}, + {&point, TRUE, 0.0f, expected_point_0, ARRAY_SIZE(expected_point_0)}, + {&spot, FALSE, 0.0f, expected_spot_0, ARRAY_SIZE(expected_spot_0)}, + {&spot, TRUE, 0.0f, expected_spot_0, ARRAY_SIZE(expected_spot_0)}, + {&point_range, FALSE, 0.0f, expected_point_range_0, ARRAY_SIZE(expected_point_range_0)}, }; IDirect3DDevice9 *device; D3DMATERIAL9 material;

1 0

Paul Gofman : wined3d: Treat zero shininess as no specular lighting in legacy lighting mode.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: 826b67e395cdc62da03277e234d2a20172beb158 URL: https://source.winehq.org/git/wine.git/?a=commit;h=826b67e395cdc62da03277e2… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 29 13:56:36 2019 +0300 wined3d: Treat zero shininess as no specular lighting in legacy lighting mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42572 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5844b0c..6c9ed16 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8998,7 +8998,7 @@ static const char *shader_glsl_ffp_mcs(enum wined3d_material_color_source mcs, c } static void shader_glsl_ffp_vertex_lighting_footer(struct wined3d_string_buffer *buffer, - const struct wined3d_ffp_vs_settings *settings, unsigned int idx) + const struct wined3d_ffp_vs_settings *settings, unsigned int idx, BOOL legacy_lighting) { shader_addline(buffer, "diffuse += clamp(dot(dir, normal), 0.0, 1.0)" " * ffp_light[%u].diffuse.xyz * att;\n", idx); @@ -9006,8 +9006,9 @@ static void shader_glsl_ffp_vertex_lighting_footer(struct wined3d_string_buffer shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); else shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); - shader_addline(buffer, "if (dot(dir, normal) > 0.0 && t > 0.0) specular +=" - " pow(t, ffp_material.shininess) * ffp_light[%u].specular * att;\n", idx); + shader_addline(buffer, "if (dot(dir, normal) > 0.0 && t > 0.0%s) specular +=" + " pow(t, ffp_material.shininess) * ffp_light[%u].specular * att;\n", + legacy_lighting ? " && ffp_material.shininess > 0.0" : "", idx); } static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer, @@ -9062,7 +9063,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer continue; } shader_addline(buffer, "dir = normalize(dir);\n"); - shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx); + shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx, legacy_lighting); shader_addline(buffer, "}\n"); } @@ -9103,7 +9104,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "}\n"); continue; } - shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx); + shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx, legacy_lighting); shader_addline(buffer, "}\n"); } @@ -9114,7 +9115,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer continue; shader_addline(buffer, "att = 1.0;\n"); shader_addline(buffer, "dir = normalize(ffp_light[%u].direction.xyz);\n", idx); - shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx); + shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx, legacy_lighting); } for (i = 0; i < settings->parallel_point_light_count; ++i, ++idx) @@ -9124,7 +9125,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer continue; shader_addline(buffer, "att = 1.0;\n"); shader_addline(buffer, "dir = normalize(ffp_light[%u].position.xyz);\n", idx); - shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx); + shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx, legacy_lighting); } shader_addline(buffer, "ffp_varying_diffuse.xyz = %s.xyz * ambient + %s.xyz * diffuse + %s.xyz;\n",

1 0

Paul Gofman : ddraw: Do not set ambient light component for d3d[1-4].
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: fa56881595c86e6fe623332e7a3c7a7a0893398b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa56881595c86e6fe623332e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 29 13:56:34 2019 +0300 ddraw: Do not set ambient light component for d3d[1-4]. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/light.c | 2 +- dlls/ddraw/tests/ddraw4.c | 48 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 9d0bb60..f99b144 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -182,7 +182,7 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) light7->dcvSpecular = zero_value; else light7->dcvSpecular = data->dcvColor; - light7->dcvAmbient = data->dcvColor; + light7->dcvAmbient = zero_value; light7->dvPosition = data->dvPosition; light7->dvDirection = data->dvDirection; light7->dvRange = data->dvRange; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 56ff8a6..f60d606 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -492,6 +492,26 @@ static IDirect3DMaterial3 *create_diffuse_material(IDirect3DDevice3 *device, flo return create_material(device, &mat); } +static IDirect3DMaterial3 *create_diffuse_and_ambient_material(IDirect3DDevice3 *device, + float r, float g, float b, float a) +{ + D3DMATERIAL mat; + + memset(&mat, 0, sizeof(mat)); + mat.dwSize = sizeof(mat); + U1(U(mat).diffuse).r = r; + U2(U(mat).diffuse).g = g; + U3(U(mat).diffuse).b = b; + U4(U(mat).diffuse).a = a; + + U1(U(mat).ambient).r = r; + U2(U(mat).ambient).g = g; + U3(U(mat).ambient).b = b; + U4(U(mat).ambient).a = a; + + return create_material(device, &mat); +} + static IDirect3DMaterial3 *create_specular_material(IDirect3DDevice3 *device, float r, float g, float b, float a, float power) { @@ -4045,10 +4065,10 @@ static void test_lighting(void) } tests[] = { - {&mat, nquad, 0x000000ff, "Lit quad with light"}, - {&mat_singular, nquad, 0x000000b4, "Lit quad with singular world matrix"}, - {&mat_transf, rotatedquad, 0x000000ff, "Lit quad with transformation matrix"}, - {&mat_nonaffine, translatedquad, 0x000000ff, "Lit quad with non-affine matrix"}, + {&mat, nquad, 0x000080ff, "Lit quad with light"}, + {&mat_singular, nquad, 0x000080b4, "Lit quad with singular world matrix"}, + {&mat_transf, rotatedquad, 0x000080ff, "Lit quad with transformation matrix"}, + {&mat_nonaffine, translatedquad, 0x000080ff, "Lit quad with non-affine matrix"}, }; DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; @@ -4143,14 +4163,16 @@ static void test_lighting(void) color = get_surface_color(rt, 480, 120); ok(color == 0x00ffff00, "Lit quad with normals has color 0x%08x.\n", color); - material = create_diffuse_material(device, 0.0f, 1.0f, 0.0f, 0.0f); + material = create_diffuse_and_ambient_material(device, 0.0f, 1.0f, 1.0f, 0.0f); hr = IDirect3DMaterial3_GetHandle(material, device, &mat_handle); - ok(SUCCEEDED(hr), "Failed to set material state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_SetLightState(device, D3DLIGHTSTATE_MATERIAL, mat_handle); - ok(SUCCEEDED(hr), "Failed to set material state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_SetLightState(device, D3DLIGHTSTATE_AMBIENT, 0xff008000); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3D3_CreateLight(d3d, &light, NULL); - ok(SUCCEEDED(hr), "Failed to create a light object, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memset(&light_desc, 0, sizeof(light_desc)); light_desc.dwSize = sizeof(light_desc); light_desc.dltType = D3DLIGHT_DIRECTIONAL; @@ -4172,20 +4194,20 @@ static void test_lighting(void) IDirect3DViewport3_Release(viewport2); hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, nfvf, nquad, 4, indices, 6, 0); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(color == 0x00000000, "Lit quad with no light has color 0x%08x.\n", color); + ok(color == 0x00008000, "Lit quad with no light has color 0x%08x.\n", color); light_desc.dwFlags = D3DLIGHT_ACTIVE; hr = IDirect3DLight_SetLight(light, (D3DLIGHT *)&light_desc);

1 0

Paul Gofman : ddraw/tests: Test lighting with ambient light and material in ddraw2.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: 26b8581f2fbca33b9ea4d60e8c3edc56764108cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=26b8581f2fbca33b9ea4d60e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 29 13:56:35 2019 +0300 ddraw/tests: Test lighting with ambient light and material in ddraw2. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 56 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index fd74d75..4fbb6f0 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -505,6 +505,26 @@ static IDirect3DMaterial2 *create_diffuse_material(IDirect3DDevice2 *device, flo return create_material(device, &mat); } +static IDirect3DMaterial2 *create_diffuse_and_ambient_material(IDirect3DDevice2 *device, + float r, float g, float b, float a) +{ + D3DMATERIAL mat; + + memset(&mat, 0, sizeof(mat)); + mat.dwSize = sizeof(mat); + U1(U(mat).diffuse).r = r; + U2(U(mat).diffuse).g = g; + U3(U(mat).diffuse).b = b; + U4(U(mat).diffuse).a = a; + + U1(U(mat).ambient).r = r; + U2(U(mat).ambient).g = g; + U3(U(mat).ambient).b = b; + U4(U(mat).ambient).a = a; + + return create_material(device, &mat); +} + static IDirect3DMaterial2 *create_specular_material(IDirect3DDevice2 *device, float r, float g, float b, float a, float power) { @@ -7042,10 +7062,10 @@ static void test_lighting(void) } tests[] = { - {&mat, nquad, 0x000000ff, "Lit quad with light"}, - {&mat_singular, nquad, 0x000000b4, "Lit quad with singular world matrix"}, - {&mat_transf, rotatedquad, 0x000000ff, "Lit quad with transformation matrix"}, - {&mat_nonaffine, translatedquad, 0x000000ff, "Lit quad with non-affine matrix"}, + {&mat, nquad, 0x000060ff, "Lit quad with light"}, + {&mat_singular, nquad, 0x00004db4, "Lit quad with singular world matrix"}, + {&mat_transf, rotatedquad, 0x000060ff, "Lit quad with transformation matrix"}, + {&mat_nonaffine, translatedquad, 0x000060ff, "Lit quad with non-affine matrix"}, }; IDirect3DViewport2 *viewport, *viewport2; @@ -7074,16 +7094,16 @@ static void test_lighting(void) } hr = IDirect3DDevice2_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get D3D interface, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); viewport = create_viewport(device, 0, 0, 640, 480); hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); - ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - material = create_diffuse_material(device, 1.0f, 1.0f, 1.0f, 1.0f); + material = create_diffuse_and_ambient_material(device, 1.0f, 1.0f, 1.0f, 1.0f); viewport_set_background(device, viewport, material); hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); @@ -7143,17 +7163,19 @@ static void test_lighting(void) ok(color == 0x00ffffff, "Lit quad with normals has color 0x%08x.\n", color); hr = IDirect3DMaterial2_GetHandle(material, device, &mat_handle); - ok(SUCCEEDED(hr), "Failed to get material handle, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_SetLightState(device, D3DLIGHTSTATE_MATERIAL, mat_handle); - ok(SUCCEEDED(hr), "Failed to set material state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice2_SetLightState(device, D3DLIGHTSTATE_AMBIENT, 0xff002000); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3D2_CreateLight(d3d, &light, NULL); - ok(SUCCEEDED(hr), "Failed to create a light object, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memset(&light_desc, 0, sizeof(light_desc)); light_desc.dwSize = sizeof(light_desc); light_desc.dltType = D3DLIGHT_DIRECTIONAL; U1(light_desc.dcvColor).r = 0.0f; - U2(light_desc.dcvColor).g = 0.0f; + U2(light_desc.dcvColor).g = 0.25f; U3(light_desc.dcvColor).b = 1.0f; U4(light_desc.dcvColor).a = 1.0f; U3(light_desc.dvDirection).z = 1.0f; @@ -7170,20 +7192,20 @@ static void test_lighting(void) destroy_viewport(device, viewport2); hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); - ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, D3DVT_VERTEX, nquad, 4, indices, 6, 0); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(color == 0x00000000, "Lit quad with no light has color 0x%08x.\n", color); + ok(color == 0x00002000, "Lit quad with no light has color 0x%08x.\n", color); light_desc.dwFlags = D3DLIGHT_ACTIVE; hr = IDirect3DLight_SetLight(light, (D3DLIGHT *)&light_desc);

1 0

Alexandre Julliard : Revert "libwine: Move string functions to libwine_port."
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: a02b23e4181eb4539db9f60ed5601e609dd9476c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a02b23e4181eb4539db9f60e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 29 21:07:59 2019 +0100 Revert "libwine: Move string functions to libwine_port." This reverts commit 47242d25f5b2964c9a61956345d1fe0ad39b96d2. It breaks in modules that import msvcrt because it uses libc functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 3 ++- libs/wine/port.c | 3 --- libs/{port => wine}/string.c | 3 ++- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 18cbf79..ef3b23f 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -101,7 +101,6 @@ C_SRCS = \ sortkey.c \ spawn.c \ statvfs.c \ - string.c \ strnlen.c \ symlink.c \ usleep.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 6525a53..bd8a937 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -6,7 +6,8 @@ C_SRCS = \ ldt.c \ loader.c \ mmap.c \ - port.c + port.c \ + string.c EXTRA_OBJS = version.o diff --git a/libs/wine/port.c b/libs/wine/port.c index e954e5b..666c4ca 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -25,7 +25,6 @@ #include <string.h> #include <sys/types.h> -#define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h" #include "wine/library.h" @@ -34,8 +33,6 @@ #ifndef __ANDROID__ const void *libwine_port_functions[] = { - strtolW, - vsnprintfW, wine_compare_string, wine_cp_enum_table, wine_cp_get_table, diff --git a/libs/port/string.c b/libs/wine/string.c similarity index 99% rename from libs/port/string.c rename to libs/wine/string.c index c3388bc..7aa981f 100644 --- a/libs/port/string.c +++ b/libs/wine/string.c @@ -23,6 +23,7 @@ #include <limits.h> #include <stdio.h> +#define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h" int strcmpiW( const WCHAR *str1, const WCHAR *str2 ) @@ -472,7 +473,7 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) *fmta = '\0'; if (*iter == 'a' || *iter == 'A' || *iter == 'e' || *iter == 'E' || - *iter == 'f' || *iter == 'F' || + *iter == 'f' || *iter == 'F' || *iter == 'g' || *iter == 'G') sprintf(bufaiter, fmtbufa, va_arg(valist, double)); else

1 0

Gijs Vermeulen : scrrun: Implement Clone() for drive collection.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: b7afaec818c64ec9a398e93503ae9a7770ca7a67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7afaec818c64ec9a398e935… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Mar 28 18:52:34 2019 +0100 scrrun: Implement Clone() for drive collection. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 5 +++-- dlls/scrrun/tests/filesystem.c | 9 ++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index aa16600..c736eb4 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -197,6 +197,7 @@ static HRESULT create_folder(const WCHAR*, IFolder**); static HRESULT create_file(BSTR, IFile**); static HRESULT create_foldercoll_enum(struct foldercollection*, IUnknown**); static HRESULT create_filecoll_enum(struct filecollection*, IUnknown**); +static HRESULT create_drivecoll_enum(struct drivecollection*, IUnknown**); static inline BOOL is_dir_data(const WIN32_FIND_DATAW *data) { @@ -1555,8 +1556,8 @@ static HRESULT WINAPI drivecoll_enumvariant_Reset(IEnumVARIANT *iface) static HRESULT WINAPI drivecoll_enumvariant_Clone(IEnumVARIANT *iface, IEnumVARIANT **pclone) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%p): stub\n", This, pclone); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pclone); + return create_drivecoll_enum(This->data.u.drivecoll.coll, (IUnknown**)pclone); } static const IEnumVARIANTVtbl drivecollenumvariantvtbl = { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 54363f0..566f6f9 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1361,7 +1361,7 @@ static void test_FileCollection(void) static void test_DriveCollection(void) { IDriveCollection *drives; - IEnumVARIANT *enumvar, *clone; + IEnumVARIANT *enumvar; ULONG fetched; VARIANT var; HRESULT hr; @@ -1398,12 +1398,7 @@ static void test_DriveCollection(void) hr = IEnumVARIANT_Skip(enumvar, 1); ok(hr == S_FALSE, "got 0x%08x\n", hr); - hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IEnumVARIANT_Clone(enumvar, &clone); - if(hr == S_OK) - test_clone(enumvar, TRUE); + test_clone(enumvar, TRUE); while (IEnumVARIANT_Next(enumvar, 1, &var, &fetched) == S_OK) { IDrive *drive = (IDrive*)V_DISPATCH(&var);

1 0

Detlef Riekenberg : secur32: Handle a new, undefined SECPKG_FLAG value.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: bd678b0b209aac7fa10dac69f64ace99a6f8e06f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd678b0b209aac7fa10dac69… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Mar 27 19:03:15 2019 +0100 secur32: Handle a new, undefined SECPKG_FLAG value. Recent Windows versions (current 8.1 and win 10 v1709 or older) started using a new SECPKG_FLAG with the value 0x02000000, but there is no definition in any SDK or online documentation. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/secur32.c | 4 +++- include/sspi.h | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 2d2c2a6..8fd421c 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -440,7 +440,9 @@ static void test_kerberos(void) | SECPKG_FLAG_READONLY_WITH_CHECKSUM; static const ULONG optional_mask = SECPKG_FLAG_RESTRICTED_TOKENS - | SECPKG_FLAG_APPCONTAINER_CHECKS; + | SECPKG_FLAG_APPCONTAINER_CHECKS + | 0x02000000; /* not defined in the SDK */ + status = QuerySecurityPackageInfoA(provider, &info); ok(status == SEC_E_OK, "Kerberos package not installed, skipping test\n"); diff --git a/include/sspi.h b/include/sspi.h index 0e248fb..ad423ee 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -171,8 +171,9 @@ SECURITY_STATUS WINAPI AddSecurityPackageW(LPWSTR,SECURITY_PACKAGE_OPTIONS*); #define SECPKG_FLAG_RESTRICTED_TOKENS 0x00080000 #define SECPKG_FLAG_NEGO_EXTENDER 0x00100000 #define SECPKG_FLAG_NEGOTIABLE2 0x00200000 -#define SECPKG_FLAG_APPCONTAINER_PASSTHROUGH 0x00400000 -#define SECPKG_FLAG_APPCONTAINER_CHECKS 0x00800000 +#define SECPKG_FLAG_APPCONTAINER_PASSTHROUGH 0x00400000 +#define SECPKG_FLAG_APPCONTAINER_CHECKS 0x00800000 +#define SECPKG_FLAG_CREDENTIAL_ISOLATION_ENABLED 0x01000000 #define SECPKG_ID_NONE 0xffff

1 0

Gijs Vermeulen : scrrun/tests: Add more Clone() tests.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: 0c4acb6104d5dc7eece9c53382351842769c3239 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c4acb6104d5dc7eece9c533… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Mar 28 18:52:33 2019 +0100 scrrun/tests: Add more Clone() tests. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 75 +++++++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 20 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 29ee73f..54363f0 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -973,6 +973,52 @@ static void test_GetFolder(void) IFolder_Release(folder); } +static void test_clone(IEnumVARIANT *enumvar, BOOL position_inherited) +{ + HRESULT hr; + IEnumVARIANT *clone; + ULONG fetched; + VARIANT var, var2; + + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "got 0x%08x\n", hr); + + VariantInit(&var); + fetched = -1; + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fetched == 1, "got %d\n", fetched); + + /* clone enumerator */ + hr = IEnumVARIANT_Clone(enumvar, &clone); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(clone != enumvar, "got %p, %p\n", enumvar, clone); + + /* check if clone inherits position */ + VariantInit(&var2); + fetched = -1; + hr = IEnumVARIANT_Next(clone, 1, &var2, &fetched); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fetched == 1, "got %d\n", fetched); + if (!position_inherited) + todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "values don't match\n"); + else + { + fetched = -1; + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fetched == 1, "got %d\n", fetched); + todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "values don't match\n"); + } + + VariantClear(&var2); + VariantClear(&var); + IEnumVARIANT_Release(clone); + + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "got 0x%08x\n", hr); +} + /* Please keep the tests for IFolderCollection and IFileCollection in sync */ static void test_FolderCollection(void) { @@ -982,7 +1028,7 @@ static void test_FolderCollection(void) static const WCHAR cW[] = {'\\','c',0}; IFolderCollection *folders; WCHAR buffW[MAX_PATH], pathW[MAX_PATH]; - IEnumVARIANT *enumvar, *clone; + IEnumVARIANT *enumvar; LONG count, ref, ref2, i; IUnknown *unk, *unk2; IFolder *folder; @@ -1068,14 +1114,7 @@ static void test_FolderCollection(void) ref2 = GET_REFCOUNT(folders); ok(ref2 == ref, "got %d, %d\n", ref2, ref); - /* clone enumerator */ - hr = IEnumVARIANT_Clone(enumvar, &clone); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(clone != enumvar, "got %p, %p\n", enumvar, clone); - IEnumVARIANT_Release(clone); - - hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + test_clone(enumvar, FALSE); for (i = 0; i < 3; i++) { @@ -1165,7 +1204,7 @@ static void test_FileCollection(void) IFolder *folder; IFileCollection *files; IFile *file; - IEnumVARIANT *enumvar, *clone; + IEnumVARIANT *enumvar; LONG count, ref, ref2, i; IUnknown *unk, *unk2; ULONG fetched; @@ -1245,14 +1284,7 @@ static void test_FileCollection(void) ref2 = GET_REFCOUNT(files); ok(ref2 == ref, "got %d, %d\n", ref2, ref); - /* clone enumerator */ - hr = IEnumVARIANT_Clone(enumvar, &clone); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(clone != enumvar, "got %p, %p\n", enumvar, clone); - IEnumVARIANT_Release(clone); - - hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + test_clone(enumvar, FALSE); for (i = 0; i < 3; i++) { @@ -1329,7 +1361,7 @@ static void test_FileCollection(void) static void test_DriveCollection(void) { IDriveCollection *drives; - IEnumVARIANT *enumvar; + IEnumVARIANT *enumvar, *clone; ULONG fetched; VARIANT var; HRESULT hr; @@ -1366,10 +1398,13 @@ static void test_DriveCollection(void) hr = IEnumVARIANT_Skip(enumvar, 1); ok(hr == S_FALSE, "got 0x%08x\n", hr); - /* reset and iterate again */ hr = IEnumVARIANT_Reset(enumvar); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IEnumVARIANT_Clone(enumvar, &clone); + if(hr == S_OK) + test_clone(enumvar, TRUE); + while (IEnumVARIANT_Next(enumvar, 1, &var, &fetched) == S_OK) { IDrive *drive = (IDrive*)V_DISPATCH(&var); DriveTypeConst type;

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: a8e16ab94cb6a56678111172eec5f8d5f01fd9d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8e16ab94cb6a56678111172… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Mar 29 12:47:25 2019 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 62 ++++---------------------------------------------------------- 1 file changed, 4 insertions(+), 58 deletions(-) diff --git a/po/fi.po b/po/fi.po index ee79051..f997548 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10871,10 +10871,6 @@ msgstr "" "Niitä ei voi käyttää yhdessä." #: winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." @@ -10895,10 +10891,6 @@ msgid "An error occurred with the specified port." msgstr "Annetun portin käytössä tapahtui virhe." #: winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." @@ -15207,10 +15199,6 @@ msgid "Drive configuration" msgstr "Asemien asetukset" #: winecfg.rc:233 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." @@ -15499,12 +15487,6 @@ msgid "System drive" msgstr "Järjestelmäasema" #: winecfg.rc:76 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" @@ -15513,8 +15495,8 @@ msgid "" msgstr "" "Oletko varma, että haluat poistaa C-aseman?\n" "\n" -"Useimmat Windows-ohjelmat odottavat, että C-asema on olemassa, ja kokevat " -"kurjan kuoleman, jos sitä ei ole. Jos jatkat, muista luoda se uudelleen!" +"Monet Windows-ohjelmat olettavat, että C-asema on olemassa, ja saattavat " +"kaatua oudosti, jos sitä ei ole. Jos jatkat, muista luoda uusi C-asema!" #: winecfg.rc:77 msgctxt "Drive letter" @@ -16790,42 +16772,6 @@ msgid "D" msgstr "H" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/K] Copy file attributes, without this attributes are not preserved.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -16872,7 +16818,7 @@ msgstr "" "[/I] Oleta hakemisto, jos kohdetta ei ole ja kopioidaan useampi tiedosto.\n" "[/S] Kopioi hakemistot ja alihakemistot.\n" "[/E] Kopioi hakemistot ja alihakemistot, myös tyhjät.\n" -"[/Q] Älä listaa nimiä kopioitaessa eli toimi hiljaa.\n" +"[/Q] Älä listaa nimiä kopioitaessa vaan toimi hiljaa.\n" "[/F] Näytä koko lähde- ja kohdenimet, kun kopioidaan.\n" "[/L] Simuloi toiminto ja näytä nimet, jotka kopioitaisiin.\n" "[/W] Kysy ennen kopioinnin aloittamista.\n" @@ -16882,7 +16828,7 @@ msgstr "" "[/P] Kysy jokaisesta lähdetiedostosta ennen kopiointia.\n" "[/N] Kopioi käyttäen lyhyitä nimiä.\n" "[/U] Kopioi vain tiedostot, jotka ovat jo olemassa kohteessa.\n" -"[/R] Kirjoita yli, jos kohdetiedostolla on vain luku -attribuutti.\n" +"[/R] Kirjoita yli, vaikka kohdetiedostolla olisi vain luku -attribuutti.\n" "[/H] Sisällytä kopioon piilotetut ja järjestelmätiedostot.\n" "[/C] Jatka, vaikka kopioinnin aikana tulisi virhe.\n" "[/A] Kopioi vain tiedostot, joilla on arkistointiattribuutti.\n"

1 0

Jacek Caban : mshtml: Implement IHTMLElement6::msMatchesSelector.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: c62e96ebfcdc77c701bfadc622aedab544ba244b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c62e96ebfcdc77c701bfadc6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 29 15:34:52 2019 +0100 mshtml: Implement IHTMLElement6::msMatchesSelector. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/elements.js | 2 ++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index c628a18..a469380 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4514,8 +4514,27 @@ static HRESULT WINAPI HTMLElement6_getElementsByClassName(IHTMLElement6 *iface, static HRESULT WINAPI HTMLElement6_msMatchesSelector(IHTMLElement6 *iface, BSTR v, VARIANT_BOOL *pfMatches) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pfMatches); - return E_NOTIMPL; + nsAString nsstr; + cpp_bool b; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pfMatches); + + if(!This->dom_element) { + FIXME("No dom element\n"); + return E_UNEXPECTED; + } + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMElement_MozMatchesSelector(This->dom_element, &nsstr, &b); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + WARN("MozMatchesSelector failed: %08x\n", nsres); + return map_nsresult(nsres); + } + + *pfMatches = b; + return S_OK; } static HRESULT WINAPI HTMLElement6_put_onabort(IHTMLElement6 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 1df2b07..1423e3b 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -207,6 +207,8 @@ function test_query_selector() { ok(e.tagName === "DIV", "e.tagName = " + e.tagName); e = document.body.querySelector(".class1"); ok(e.tagName === "DIV", "e.tagName = " + e.tagName); + ok(e.msMatchesSelector(".class1") === true, "msMatchesSelector returned " + e.msMatchesSelector(".class1")); + ok(e.msMatchesSelector(".class2") === false, "msMatchesSelector returned " + e.msMatchesSelector(".class2")); e = document.querySelector("a"); ok(e.tagName === "A", "e.tagName = " + e.tagName);

1 0