June 2015 - Wine-commits - list.winehq.org

YongHao Hu : msvcp110: Add tr2_sys__Make_dir implementation and test.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 9939b5f564a4059b03e0b2b0cd887a52c80a5d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9939b5f564a4059b03e0b2b0c… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Jun 13 00:31:30 2015 +0800 msvcp110: Add tr2_sys__Make_dir implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 29 +++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 16 ++++++++++++++++ 5 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index a06d260..dcf47db 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1617,8 +1617,8 @@ @ stub -arch=win64 ?_MP_Mul(a)std@@YAXQEA_K_K1(a)Z @ stub -arch=win32 ?_MP_Rem(a)std@@YAXQA_K_K(a)Z @ stub -arch=win64 ?_MP_Rem(a)std@@YAXQEA_K_K(a)Z -@ stub -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z -@ stub -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z +@ cdecl -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z(str) tr2_sys__Make_dir +@ cdecl -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) tr2_sys__Make_dir @ stub -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPB_W(a)Z @ stub -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEB_W(a)Z @ cdecl -arch=win32 ?_Makeloc(a)_Locimp@locale(a)std@@CAPAV123(a)ABV_Locinfo@3(a)HPAV123@PBV23@@Z(ptr long ptr ptr) locale__Locimp__Makeloc diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 275d7ab..acfd380 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1578,8 +1578,8 @@ @ stub -arch=win64 ?_MP_Mul(a)std@@YAXQEA_K_K1(a)Z @ stub -arch=win32 ?_MP_Rem(a)std@@YAXQA_K_K(a)Z @ stub -arch=win64 ?_MP_Rem(a)std@@YAXQEA_K_K(a)Z -@ stub -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z -@ stub -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z +@ cdecl -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z(str) tr2_sys__Make_dir +@ cdecl -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) tr2_sys__Make_dir @ stub -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPB_W(a)Z @ stub -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEB_W(a)Z @ cdecl -arch=win32 ?_Makeloc(a)_Locimp@locale(a)std@@CAPAV123(a)ABV_Locinfo@3(a)HPAV123@PBV23@@Z(ptr long ptr ptr) locale__Locimp__Makeloc diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 5953fbe..90c317b 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -64,6 +64,7 @@ static ULONGLONG(__cdecl *p_tr2_sys__File_size)(char const*); static int (__cdecl *p_tr2_sys__Equivalent)(char const*, char const*); static char* (__cdecl *p_tr2_sys__Current_get)(char *); static MSVCP_bool (__cdecl *p_tr2_sys__Current_set)(char const*); +static int (__cdecl *p_tr2_sys__Make_dir)(char const*); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -100,6 +101,8 @@ static BOOL init(void) "?_Current_get(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)D@Z"); SET(p_tr2_sys__Current_set, "?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z"); + SET(p_tr2_sys__Make_dir, + "?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -109,6 +112,8 @@ static BOOL init(void) "?_Current_get(a)sys@tr2(a)std@@YAPADAAY0BAE(a)D@Z"); SET(p_tr2_sys__Current_set, "?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z"); + SET(p_tr2_sys__Make_dir, + "?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z"); } msvcr = GetModuleHandleA("msvcr120.dll"); @@ -469,6 +474,29 @@ static void test_tr2_sys__Current_set(void) ok(!strcmp(origin_path, current_path), "test_tr2_sys__Current_get(): expect: %s, got %s\n", origin_path, current_path); } +static void test_tr2_sys__Make_dir(void) +{ + int ret, i; + struct { + char const *path; + int val; + } tests[] = { + { "tr2_test_dir", 1 }, + { "tr2_test_dir", 0 }, + { NULL, -1 }, + { "??invalid_name>>", -1 } + }; + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + errno = 0xdeadbeef; + ret = p_tr2_sys__Make_dir(tests[i].path); + ok(ret == tests[i].val, "tr2_sys__Make_dir(): test %d expect: %d, got %d\n", i+1, tests[i].val, ret); + ok(errno == 0xdeadbeef, "tr2_sys__Make_dir(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); + } + + ok(RemoveDirectoryA("tr2_test_dir"), "Expected tr2_test_dir to exist\n"); +} + START_TEST(msvcp120) { if(!init()) return; @@ -482,5 +510,6 @@ START_TEST(msvcp120) test_tr2_sys__Equivalent(); test_tr2_sys__Current_get(); test_tr2_sys__Current_set(); + test_tr2_sys__Make_dir(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 596eee5..9fb9ba2 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1578,8 +1578,8 @@ @ stub -arch=win64 ?_MP_Mul(a)std@@YAXQEA_K_K1(a)Z @ stub -arch=win32 ?_MP_Rem(a)std@@YAXQA_K_K(a)Z @ stub -arch=win64 ?_MP_Rem(a)std@@YAXQEA_K_K(a)Z -@ stub -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z -@ stub -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z +@ cdecl -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z(str) msvcp120.?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z +@ cdecl -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) msvcp120.?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z @ stub -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPB_W(a)Z @ stub -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEB_W(a)Z @ cdecl -arch=win32 ?_Makeloc(a)_Locimp@locale(a)std@@CAPAV123(a)ABV_Locinfo@3(a)HPAV123@PBV23@@Z(ptr long ptr ptr) msvcp120.?_Makeloc(a)_Locimp@locale(a)std@@CAPAV123(a)ABV_Locinfo@3(a)HPAV123@PBV23@@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index e78c46b..49e841e 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14260,6 +14260,22 @@ MSVCP_bool __cdecl tr2_sys__Current_set(char const* path) return SetCurrentDirectoryA(path) != 0; } +/* ?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z */ +/* ?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z */ +int __cdecl tr2_sys__Make_dir(char const* path) +{ + TRACE("(%p)\n", path); + + if(!CreateDirectoryA(path, NULL)) { + if(GetLastError() == ERROR_ALREADY_EXISTS) + return 0; + else + return -1; + } + + return 1; +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

YongHao Hu : msvcp110: Add tr2_sys__Remove_dir implementation and test.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 8351bef5b5ff4e97ced18615658cf8404397ea93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8351bef5b5ff4e97ced186156… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Jun 13 00:32:09 2015 +0800 msvcp110: Add tr2_sys__Remove_dir implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 30 ++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 8 ++++++++ 5 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index dcf47db..9ba3224 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1718,8 +1718,8 @@ @ stub -arch=arm ?_Release(a)_Pad@std@@QAAXXZ @ stub -arch=i386 ?_Release(a)_Pad@std@@QAEXXZ @ stub -arch=win64 ?_Release(a)_Pad@std@@QEAAXXZ -@ stub -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPBD(a)Z -@ stub -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z +@ cdecl -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) tr2_sys__Remove_dir +@ cdecl -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) tr2_sys__Remove_dir @ stub -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPB_W(a)Z @ stub -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z @ stub -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPBD0(a)Z diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index acfd380..488bb01 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1679,8 +1679,8 @@ @ stub -arch=arm ?_Release(a)_Pad@std@@QAAXXZ @ stub -arch=i386 ?_Release(a)_Pad@std@@QAEXXZ @ stub -arch=win64 ?_Release(a)_Pad@std@@QEAAXXZ -@ stub -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPBD(a)Z -@ stub -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z +@ cdecl -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) tr2_sys__Remove_dir +@ cdecl -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) tr2_sys__Remove_dir @ stub -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPB_W(a)Z @ stub -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z @ stub -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPBD0(a)Z diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 90c317b..e97aa55 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -65,6 +65,7 @@ static int (__cdecl *p_tr2_sys__Equivalent)(char const*, char const*); static char* (__cdecl *p_tr2_sys__Current_get)(char *); static MSVCP_bool (__cdecl *p_tr2_sys__Current_set)(char const*); static int (__cdecl *p_tr2_sys__Make_dir)(char const*); +static MSVCP_bool (__cdecl *p_tr2_sys__Remove_dir)(char const*); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -103,6 +104,8 @@ static BOOL init(void) "?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z"); SET(p_tr2_sys__Make_dir, "?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z"); + SET(p_tr2_sys__Remove_dir, + "?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -114,6 +117,8 @@ static BOOL init(void) "?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z"); SET(p_tr2_sys__Make_dir, "?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z"); + SET(p_tr2_sys__Remove_dir, + "?_Remove_dir(a)sys@tr2(a)std@@YA_NPBD(a)Z"); } msvcr = GetModuleHandleA("msvcr120.dll"); @@ -497,6 +502,30 @@ static void test_tr2_sys__Make_dir(void) ok(RemoveDirectoryA("tr2_test_dir"), "Expected tr2_test_dir to exist\n"); } +static void test_tr2_sys__Remove_dir(void) +{ + MSVCP_bool ret; + int i; + struct { + char const *path; + MSVCP_bool val; + } tests[] = { + { "tr2_test_dir", TRUE }, + { "tr2_test_dir", FALSE }, + { NULL, FALSE }, + { "??invalid_name>>", FALSE } + }; + + ok(p_tr2_sys__Make_dir("tr2_test_dir"), "tr2_sys__Make_dir() failed\n"); + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + errno = 0xdeadbeef; + ret = p_tr2_sys__Remove_dir(tests[i].path); + ok(ret == tests[i].val, "test_tr2_sys__Remove_dir(): test %d expect: %d, got %d\n", i+1, tests[i].val, ret); + ok(errno == 0xdeadbeef, "test_tr2_sys__Remove_dir(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); + } +} + START_TEST(msvcp120) { if(!init()) return; @@ -511,5 +540,6 @@ START_TEST(msvcp120) test_tr2_sys__Current_get(); test_tr2_sys__Current_set(); test_tr2_sys__Make_dir(); + test_tr2_sys__Remove_dir(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 9fb9ba2..3633567 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1679,8 +1679,8 @@ @ stub -arch=arm ?_Release(a)_Pad@std@@QAAXXZ @ stub -arch=i386 ?_Release(a)_Pad@std@@QAEXXZ @ stub -arch=win64 ?_Release(a)_Pad@std@@QEAAXXZ -@ stub -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPBD(a)Z -@ stub -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z +@ cdecl -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) msvcp120.?_Remove_dir(a)sys@tr2(a)std@@YA_NPBD(a)Z +@ cdecl -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) msvcp120.?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z @ stub -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPB_W(a)Z @ stub -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z @ stub -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPBD0(a)Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 49e841e..218c6c7 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14276,6 +14276,14 @@ int __cdecl tr2_sys__Make_dir(char const* path) return 1; } +/* ?_Remove_dir(a)sys@tr2(a)std@@YA_NPBD(a)Z */ +/* ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z */ +MSVCP_bool __cdecl tr2_sys__Remove_dir(char const* path) +{ + TRACE("(%p)\n", path); + return RemoveDirectoryA(path) != 0; +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

Henri Verbeet : wined3d: Use surface_get_rect() in wined3d_surface_update_overlay().
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: b4b2a29dec805f3970432c43fe48266ebd633730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b2a29dec805f3970432c43f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 14:07:32 2015 +0200 wined3d: Use surface_get_rect() in wined3d_surface_update_overlay(). --- dlls/wined3d/surface.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4df6ca8..c6d5a5a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2029,29 +2029,8 @@ HRESULT CDECL wined3d_surface_update_overlay(struct wined3d_surface *surface, co return WINED3DERR_INVALIDCALL; } - if (src_rect) - { - surface->overlay_srcrect = *src_rect; - } - else - { - surface->overlay_srcrect.left = 0; - surface->overlay_srcrect.top = 0; - surface->overlay_srcrect.right = surface->resource.width; - surface->overlay_srcrect.bottom = surface->resource.height; - } - - if (dst_rect) - { - surface->overlay_destrect = *dst_rect; - } - else - { - surface->overlay_destrect.left = 0; - surface->overlay_destrect.top = 0; - surface->overlay_destrect.right = dst_surface->resource.width; - surface->overlay_destrect.bottom = dst_surface->resource.height; - } + surface_get_rect(surface, src_rect, &surface->overlay_srcrect); + surface_get_rect(dst_surface, dst_rect, &surface->overlay_destrect); if (surface->overlay_dest && (surface->overlay_dest != dst_surface || flags & WINEDDOVER_HIDE)) {

1 0

Henri Verbeet : wined3d: Implement SM4 discard in the GLSL shader backend.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: c9227bccc5a1bf94fbf5bf335fae7f4b16c888ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9227bccc5a1bf94fbf5bf335… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 14:07:33 2015 +0200 wined3d: Implement SM4 discard in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f69a2ce..fa96fbe 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4704,22 +4704,29 @@ static void shader_glsl_texreg2rgb(const struct wined3d_shader_instruction *ins) * If any of the first 3 components are < 0, discard this pixel */ static void shader_glsl_texkill(const struct wined3d_shader_instruction *ins) { - struct glsl_dst_param dst_param; + if (ins->ctx->reg_maps->shader_version.major >= 4) + { + struct glsl_src_param src_param; - /* The argument is a destination parameter, and no writemasks are allowed */ - shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); - if (ins->ctx->reg_maps->shader_version.major >= 2) + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); + shader_addline(ins->ctx->buffer, "if (bool(floatBitsToUint(%s))) discard;\n", src_param.param_str); + } + else { - if (ins->ctx->reg_maps->shader_version.major >= 4) - FIXME("SM4 discard not implemented.\n"); - /* 2.0 shaders compare all 4 components in texkill */ - shader_addline(ins->ctx->buffer, "if (any(lessThan(%s.xyzw, vec4(0.0)))) discard;\n", dst_param.reg_name); - } else { - /* 1.X shaders only compare the first 3 components, probably due to the nature of the texkill - * instruction as a tex* instruction, and phase, which kills all a / w components. Even if all - * 4 components are defined, only the first 3 are used - */ - shader_addline(ins->ctx->buffer, "if (any(lessThan(%s.xyz, vec3(0.0)))) discard;\n", dst_param.reg_name); + struct glsl_dst_param dst_param; + + /* The argument is a destination parameter, and no writemasks are allowed */ + shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); + + /* 2.0 shaders compare all 4 components in texkill. */ + if (ins->ctx->reg_maps->shader_version.major >= 2) + shader_addline(ins->ctx->buffer, "if (any(lessThan(%s.xyzw, vec4(0.0)))) discard;\n", dst_param.reg_name); + /* 1.x shaders only compare the first 3 components, probably due to + * the nature of the texkill instruction as a tex* instruction, and + * phase, which kills all .w components. Even if all 4 components are + * defined, only the first 3 are used. */ + else + shader_addline(ins->ctx->buffer, "if (any(lessThan(%s.xyz, vec3(0.0)))) discard;\n", dst_param.reg_name); } }

1 0

Henri Verbeet : d2d1: Fix the ID2D1Factory::CreatePathGeometry() declaration.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 7e8c88fa1ed2c81e04b14e20c2a3070f55b1aa59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8c88fa1ed2c81e04b14e20c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 14:07:34 2015 +0200 d2d1: Fix the ID2D1Factory::CreatePathGeometry() declaration. --- dlls/d2d1/factory.c | 2 +- include/d2d1.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 918fa13..d276b30 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -134,7 +134,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory *iface, ID2D1PathGeometry *geometry) +static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory *iface, ID2D1PathGeometry **geometry) { FIXME("iface %p, geometry %p stub!\n", iface, geometry); diff --git a/include/d2d1.idl b/include/d2d1.idl index 1623e46..d62a498 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1216,7 +1216,7 @@ interface ID2D1Factory : IUnknown [out] ID2D1TransformedGeometry **transformed_geometry ); HRESULT CreatePathGeometry( - [out] ID2D1PathGeometry *geometry + [out] ID2D1PathGeometry **geometry ); HRESULT CreateStrokeStyle( [in] const D2D1_STROKE_STYLE_PROPERTIES *desc,

1 0

Henri Verbeet : d2d1: Implement d2d_factory_CreatePathGeometry().
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 2b1d3bfb472b2bef864ada5b415270dbfc0ad8bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1d3bfb472b2bef864ada5b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 14:07:35 2015 +0200 d2d1: Implement d2d_factory_CreatePathGeometry(). --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/d2d1_private.h | 8 ++ dlls/d2d1/factory.c | 14 ++- dlls/d2d1/geometry.c | 255 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 276 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b1d3bfb472b2bef864ad…

1 0

Henri Verbeet : d2d1: Implement d2d_path_geometry_Open().
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: e8d41475b9594146af1cefa585d21f0e55e16c2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d41475b9594146af1cefa58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 14:07:36 2015 +0200 d2d1: Implement d2d_path_geometry_Open(). --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/geometry.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 138 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 791df3c..7d82b90 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -192,6 +192,7 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat struct d2d_geometry { ID2D1Geometry ID2D1Geometry_iface; + ID2D1GeometrySink ID2D1GeometrySink_iface; LONG refcount; }; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index a6658cb..818a5d0 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -23,6 +23,135 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); +static inline struct d2d_geometry *impl_from_ID2D1GeometrySink(ID2D1GeometrySink *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1GeometrySink_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_QueryInterface(ID2D1GeometrySink *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1GeometrySink) + || IsEqualGUID(iid, &IID_ID2D1SimplifiedGeometrySink) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1GeometrySink_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_geometry_sink_AddRef(ID2D1GeometrySink *iface) +{ + struct d2d_geometry *geometry = impl_from_ID2D1GeometrySink(iface); + + TRACE("iface %p.\n", iface); + + return ID2D1Geometry_AddRef(&geometry->ID2D1Geometry_iface); +} + +static ULONG STDMETHODCALLTYPE d2d_geometry_sink_Release(ID2D1GeometrySink *iface) +{ + struct d2d_geometry *geometry = impl_from_ID2D1GeometrySink(iface); + + TRACE("iface %p.\n", iface); + + return ID2D1Geometry_Release(&geometry->ID2D1Geometry_iface); +} + +static void STDMETHODCALLTYPE d2d_geometry_sink_SetFillMode(ID2D1GeometrySink *iface, D2D1_FILL_MODE mode) +{ + FIXME("iface %p, mode %#x stub!\n", iface, mode); +} + +static void STDMETHODCALLTYPE d2d_geometry_sink_SetSegmentFlags(ID2D1GeometrySink *iface, D2D1_PATH_SEGMENT flags) +{ + FIXME("iface %p, flags %#x stub!\n", iface, flags); +} + +static void STDMETHODCALLTYPE d2d_geometry_sink_BeginFigure(ID2D1GeometrySink *iface, + D2D1_POINT_2F start_point, D2D1_FIGURE_BEGIN figure_begin) +{ + FIXME("iface %p, start_point {%.8e, %.8e}, figure_begin %#x stub!\n", + iface, start_point.x, start_point.y, figure_begin); +} + +static void STDMETHODCALLTYPE d2d_geometry_sink_AddLines(ID2D1GeometrySink *iface, + const D2D1_POINT_2F *points, UINT32 count) +{ + FIXME("iface %p, points %p, count %u stub!\n", iface, points, count); +} + +static void STDMETHODCALLTYPE d2d_geometry_sink_AddBeziers(ID2D1GeometrySink *iface, + const D2D1_BEZIER_SEGMENT *beziers, UINT32 count) +{ + FIXME("iface %p, beziers %p, count %u stub!\n", iface, beziers, count); +} + +static void STDMETHODCALLTYPE d2d_geometry_sink_EndFigure(ID2D1GeometrySink *iface, D2D1_FIGURE_END figure_end) +{ + FIXME("iface %p, figure_end %#x stub!\n", iface, figure_end); +} + +static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d2d_geometry_sink_AddLine(ID2D1GeometrySink *iface, D2D1_POINT_2F point) +{ + FIXME("iface %p, point {%.8e, %.8e} stub!\n", iface, point.x, point.y); +} + +static void STDMETHODCALLTYPE d2d_geometry_sink_AddBezier(ID2D1GeometrySink *iface, const D2D1_BEZIER_SEGMENT *bezier) +{ + FIXME("iface %p, bezier %p stub!\n", iface, bezier); +} + +static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBezier(ID2D1GeometrySink *iface, + const D2D1_QUADRATIC_BEZIER_SEGMENT *bezier) +{ + FIXME("iface %p, bezier %p stub!\n", iface, bezier); +} + +static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBeziers(ID2D1GeometrySink *iface, + const D2D1_QUADRATIC_BEZIER_SEGMENT *beziers, UINT32 bezier_count) +{ + FIXME("iface %p, beziers %p, bezier_count %u stub!\n", iface, beziers, bezier_count); +} + +static void STDMETHODCALLTYPE d2d_geometry_sink_AddArc(ID2D1GeometrySink *iface, const D2D1_ARC_SEGMENT *arc) +{ + FIXME("iface %p, arc %p stub!\n", iface, arc); +} + +struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl = +{ + d2d_geometry_sink_QueryInterface, + d2d_geometry_sink_AddRef, + d2d_geometry_sink_Release, + d2d_geometry_sink_SetFillMode, + d2d_geometry_sink_SetSegmentFlags, + d2d_geometry_sink_BeginFigure, + d2d_geometry_sink_AddLines, + d2d_geometry_sink_AddBeziers, + d2d_geometry_sink_EndFigure, + d2d_geometry_sink_Close, + d2d_geometry_sink_AddLine, + d2d_geometry_sink_AddBezier, + d2d_geometry_sink_AddQuadraticBezier, + d2d_geometry_sink_AddQuadraticBeziers, + d2d_geometry_sink_AddArc, +}; + static inline struct d2d_geometry *impl_from_ID2D1PathGeometry(ID2D1PathGeometry *iface) { return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface); @@ -197,9 +326,14 @@ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Widen(ID2D1PathGeometry *ifac static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Open(ID2D1PathGeometry *iface, ID2D1GeometrySink **sink) { - FIXME("iface %p, sink %p stub!\n", iface, sink); + struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface); - return E_NOTIMPL; + TRACE("iface %p, sink %p.\n", iface, sink); + + *sink = &geometry->ID2D1GeometrySink_iface; + ID2D1GeometrySink_AddRef(*sink); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_path_geometry_Stream(ID2D1PathGeometry *iface, ID2D1GeometrySink *sink) @@ -251,5 +385,6 @@ static const struct ID2D1PathGeometryVtbl d2d_path_geometry_vtbl = void d2d_path_geometry_init(struct d2d_geometry *geometry) { geometry->ID2D1Geometry_iface.lpVtbl = (ID2D1GeometryVtbl *)&d2d_path_geometry_vtbl; + geometry->ID2D1GeometrySink_iface.lpVtbl = &d2d_geometry_sink_vtbl; geometry->refcount = 1; }

1 0

Huw Davies : oleaut32/tests: Add broken behaviour on Win 2003.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 46bdb6e59a007b71aa6a0932228e30bf3ad8bc2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=46bdb6e59a007b71aa6a09322… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 15 13:24:18 2015 +0100 oleaut32/tests: Add broken behaviour on Win 2003. --- dlls/oleaut32/tests/safearray.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index ae8b2a8..2a62977 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -456,11 +456,15 @@ static void test_safearray(void) bound.lLbound = 0; SafeArrayRedim(a, &bound); SafeArrayPtrOfIndex(a, indices, (void **)&ptr1); - ok(*(WORD *)ptr1 == 0, "Expanded area not zero-initialized\n"); + ok(*(WORD *)ptr1 == 0 || + broken(*(WORD *)ptr1 != 0), /* Win 2003 */ + "Expanded area not zero-initialized\n"); indices[1] = 1; SafeArrayPtrOfIndex(a, indices, (void **)&ptr1); - ok(*(WORD *)ptr1 == 0x55aa, "Data not preserved when resizing array\n"); + ok(*(WORD *)ptr1 == 0x55aa || + broken(*(WORD *)ptr1 != 0x55aa), /* Win 2003 */ + "Data not preserved when resizing array\n"); hres = SafeArrayDestroy(a); ok(hres == S_OK,"SAD failed with hres %x\n", hres);

1 0

Nikolay Sivov : dwrite: Call GetCount() once when looking for family name.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 6655b0c93adeaf9db1dd3771cebbc2ee6fe280f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6655b0c93adeaf9db1dd3771c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 15 01:14:25 2015 +0300 dwrite: Call GetCount() once when looking for family name. --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4c7fdcf..587dc05 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1435,10 +1435,10 @@ static UINT32 collection_find_family(struct dwrite_fontcollection *collection, c for (i = 0; i < collection->family_count; i++) { IDWriteLocalizedStrings *family_name = collection->family_data[i]->familyname; + UINT32 j, count = IDWriteLocalizedStrings_GetCount(family_name); HRESULT hr; - int j; - for (j = 0; j < IDWriteLocalizedStrings_GetCount(family_name); j++) { + for (j = 0; j < count; j++) { WCHAR buffer[255]; hr = IDWriteLocalizedStrings_GetString(family_name, j, buffer, 255); if (SUCCEEDED(hr) && !strcmpiW(buffer, name))

1 0

Nikolay Sivov : dwrite: Fix the way drawing effects are reported for inline objects.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: b7fb00e9aa7b17c4fe9f90ac137b50a245528704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7fb00e9aa7b17c4fe9f90ac1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 15 01:15:25 2015 +0300 dwrite: Fix the way drawing effects are reported for inline objects. --- dlls/dwrite/layout.c | 136 ++++++++++++++++++-------- dlls/dwrite/tests/layout.c | 237 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 320 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7fb00e9aa7b17c4fe9f9…

1 0