October 2014 - Wine-Commits

Shuai Meng : vbscript: Implemented Timer.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: 7a4860104772597b70444238b82887bd0932f783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a4860104772597b70444238b… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Oct 13 17:18:24 2014 +0800 vbscript: Implemented Timer. --- dlls/vbscript/global.c | 19 +++++++++++++++++-- dlls/vbscript/tests/api.vbs | 2 ++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 93fdcc3..bbbe22c 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -130,6 +130,16 @@ static inline HRESULT return_double(VARIANT *res, double val) return S_OK; } +static inline HRESULT return_float(VARIANT *res, float val) +{ + if(res) { + V_VT(res) = VT_R4; + V_R4(res) = val; + } + + return S_OK; +} + static inline HRESULT return_null(VARIANT *res) { if(res) @@ -760,8 +770,13 @@ static HRESULT Global_Rnd(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Timer(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SYSTEMTIME lt; + double sec; + + GetLocalTime(&lt); + sec = lt.wHour * 3600 + lt.wMinute * 60 + lt.wSecond + lt.wMilliseconds / 1000.0; + return return_float(res, sec); + } static HRESULT Global_LBound(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index e2efa98..1b68d2e 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1264,4 +1264,6 @@ Call ok(getVT(RGB(&h1&, &h100&, &h111&)) = "VT_I4", "getVT(RGB(&h1&, &h100&, &h1 Call testRGBError(-1, &h1e&, &h3b&, 5) Call testRGBError(&h4d&, -2, &h2f&, 5) +Call ok(getVT(Timer) = "VT_R4", "getVT(Timer) = " & getVT(Timer)) + Call reportSuccess()

1 0

Nikolay Sivov : dwrite: Create single shared factory.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: 100698771286eb6ba98dc4f06824a12c285ac212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=100698771286eb6ba98dc4f06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 9 09:05:27 2014 +0400 dwrite: Create single shared factory. --- dlls/dwrite/main.c | 155 +++++++++++++++++++++++++++++++++++++---------- dlls/dwrite/tests/font.c | 55 +++++++++++++++-- 2 files changed, 175 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=100698771286eb6ba98dc…

1 0

Nikolay Sivov : widl: Generate method macros/ wrappers for overridden methods.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: c27af4774e769824f0ebe6f1e5733fc2c99659d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c27af4774e769824f0ebe6f1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 13 14:23:22 2014 +0400 widl: Generate method macros/wrappers for overridden methods. --- dlls/dwrite/tests/layout.c | 15 +++++++---- tools/widl/header.c | 67 +++++++++++++++++++++++++++++++++++++--------- 2 files changed, 65 insertions(+), 17 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 2e4618a..bff9d15 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -478,7 +478,7 @@ static void test_GetLocaleName(void) static const WCHAR strW[] = {'s','t','r','i','n','g',0}; static const WCHAR ruW[] = {'r','u',0}; IDWriteTextLayout *layout; - IDWriteTextFormat *format; + IDWriteTextFormat *format, *format2; WCHAR buff[10]; UINT32 len; HRESULT hr; @@ -489,13 +489,17 @@ static void test_GetLocaleName(void) hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 0, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); - len = IDWriteTextLayout_GetLocaleNameLength(layout); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextFormat, (void**)&format2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + len = IDWriteTextFormat_GetLocaleNameLength(format2); ok(len == 2, "got %u\n", len); len = IDWriteTextFormat_GetLocaleNameLength(format); ok(len == 2, "got %u\n", len); - hr = IDWriteTextLayout_GetLocaleName(layout, buff, len); + hr = IDWriteTextFormat_GetLocaleName(format2, buff, len); ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); - hr = IDWriteTextLayout_GetLocaleName(layout, buff, len+1); + hr = IDWriteTextFormat_GetLocaleName(format2, buff, len+1); ok(hr == S_OK, "got 0x%08x\n", hr); ok(!lstrcmpW(buff, ruW), "got %s\n", wine_dbgstr_w(buff)); hr = IDWriteTextFormat_GetLocaleName(format, buff, len); @@ -506,6 +510,7 @@ static void test_GetLocaleName(void) IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); + IDWriteTextFormat_Release(format2); } static void test_CreateEllipsisTrimmingSign(void) @@ -571,7 +576,7 @@ static void test_fontweight(void) range.length = 0; weight = DWRITE_FONT_WEIGHT_BOLD; - hr = layout->lpVtbl->IDWriteTextLayout_GetFontWeight(layout, 0, &weight, &range); + hr = IDWriteTextLayout_GetFontWeight(layout, 0, &weight, &range); ok(hr == S_OK, "got 0x%08x\n", hr); ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight); ok(range.length == 6, "got %d\n", range.length); diff --git a/tools/widl/header.c b/tools/widl/header.c index f0f0156..c23faf4 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -828,6 +828,32 @@ static int is_inherited_method(const type_t *iface, const var_t *func) return 0; } +static int is_override_method(const type_t *iface, const type_t *child, const var_t *func) +{ + if (iface == child) + return 0; + + do + { + const statement_t *stmt; + STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(child)) + { + const var_t *funccmp = stmt->u.var; + + if (!is_callas(func->attrs)) + { + char inherit_name[256]; + /* compare full name including property prefix */ + strcpy(inherit_name, get_name(funccmp)); + if (!strcmp(inherit_name, get_name(func))) return 1; + } + } + } + while ((child = type_iface_get_inherit(child)) && child != iface); + + return 0; +} + static int is_aggregate_return(const var_t *func) { enum type_type type = type_get_type(type_function_get_rettype(func->type)); @@ -835,13 +861,23 @@ static int is_aggregate_return(const var_t *func) type == TYPE_COCLASS || type == TYPE_INTERFACE; } -static void write_method_macro(FILE *header, const type_t *iface, const char *name) +static char *get_vtbl_entry_name(const type_t *iface, const var_t *func) +{ + static char buff[255]; + if (is_inherited_method(iface, func)) + sprintf(buff, "%s_%s", iface->name, get_name(func)); + else + sprintf(buff, "%s", get_name(func)); + return buff; +} + +static void write_method_macro(FILE *header, const type_t *iface, const type_t *child, const char *name) { const statement_t *stmt; int first_iface = 1; if (type_iface_get_inherit(iface)) - write_method_macro(header, type_iface_get_inherit(iface), name); + write_method_macro(header, type_iface_get_inherit(iface), child, name); STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { @@ -853,8 +889,10 @@ static void write_method_macro(FILE *header, const type_t *iface, const char *na first_iface = 0; } - if (!is_callas(func->attrs) && !is_inherited_method(iface, func) && - !is_aggregate_return(func)) { + if (is_override_method(iface, child, func)) + continue; + + if (!is_callas(func->attrs) && !is_aggregate_return(func)) { const var_t *arg; fprintf(header, "#define %s_%s(This", name, get_name(func)); @@ -863,7 +901,7 @@ static void write_method_macro(FILE *header, const type_t *iface, const char *na fprintf(header, ",%s", arg->name); fprintf(header, ") "); - fprintf(header, "(This)->lpVtbl->%s(This", get_name(func)); + fprintf(header, "(This)->lpVtbl->%s(This", get_vtbl_entry_name(iface, func)); if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry ) fprintf(header, ",%s", arg->name); @@ -929,13 +967,13 @@ static void write_cpp_method_def(FILE *header, const type_t *iface) } } -static void write_inline_wrappers(FILE *header, const type_t *iface, const char *name) +static void write_inline_wrappers(FILE *header, const type_t *iface, const type_t *child, const char *name) { const statement_t *stmt; int first_iface = 1; if (type_iface_get_inherit(iface)) - write_inline_wrappers(header, type_iface_get_inherit(iface), name); + write_inline_wrappers(header, type_iface_get_inherit(iface), child, name); STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { @@ -947,7 +985,10 @@ static void write_inline_wrappers(FILE *header, const type_t *iface, const char first_iface = 0; } - if (!is_callas(func->attrs) && !is_inherited_method(iface, func)) { + if (is_override_method(iface, child, func)) + continue; + + if (!is_callas(func->attrs)) { const var_t *arg; fprintf(header, "static FORCEINLINE "); @@ -960,13 +1001,13 @@ static void write_inline_wrappers(FILE *header, const type_t *iface, const char indent(header, 0); fprintf(header, "%sThis->lpVtbl->%s(This", is_void(type_function_get_rettype(func->type)) ? "" : "return ", - get_name(func)); + get_vtbl_entry_name(iface, func)); } else { indent(header, 0); write_type_decl_left(header, type_function_get_rettype(func->type)); fprintf(header, " __ret;\n"); indent(header, 0); - fprintf(header, "return *This->lpVtbl->%s(This,&__ret", get_name(func)); + fprintf(header, "return *This->lpVtbl->%s(This,&__ret", get_vtbl_entry_name(iface, func)); } if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry ) @@ -1188,6 +1229,7 @@ static void write_com_interface_end(FILE *header, type_t *iface) { int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); + type_t *type; if (uuid) write_guid(header, dispinterface ? "DIID" : "IID", iface->name, uuid); @@ -1245,9 +1287,10 @@ static void write_com_interface_end(FILE *header, type_t *iface) /* dispinterfaces don't have real functions, so don't write macros for them, * only for the interface this interface inherits from, i.e. IDispatch */ fprintf(header, "#ifndef WIDL_C_INLINE_WRAPPERS\n"); - write_method_macro(header, dispinterface ? type_iface_get_inherit(iface) : iface, iface->name); + type = dispinterface ? type_iface_get_inherit(iface) : iface; + write_method_macro(header, type, type, iface->name); fprintf(header, "#else\n"); - write_inline_wrappers(header, dispinterface ? type_iface_get_inherit(iface) : iface, iface->name); + write_inline_wrappers(header, type, type, iface->name); fprintf(header, "#endif\n"); fprintf(header, "#endif\n"); fprintf(header, "\n");

1 0

Matteo Bruni : d3d9/tests: Add some tests for shaders using more than the maximum number of supported constants.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: d897db7605a2c9fbdbbce82952bac75ce0c16503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d897db7605a2c9fbdbbce8295… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 9 18:00:58 2014 +0200 d3d9/tests: Add some tests for shaders using more than the maximum number of supported constants. --- dlls/d3d9/tests/device.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 02c8227..8d0f6b7 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5150,6 +5150,182 @@ float4 main(const float4 color : COLOR) : SV_TARGET 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; +#if 0 + vs_1_1 + dcl_position v0 + def c255, 1.0, 1.0, 1.0, 1.0 + add r0, v0, c255 + mov oPos, r0 +#endif + static const DWORD vs_1_255[] = + { + 0xfffe0101, + 0x0000001f, 0x80000000, 0x900f0000, + 0x00000051, 0xa00f00ff, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x00000002, 0x800f0000, 0x90e40000, 0xa0e400ff, + 0x00000001, 0xc00f0000, 0x80e40000, + 0x0000ffff + }; +#if 0 + vs_1_1 + dcl_position v0 + def c256, 1.0, 1.0, 1.0, 1.0 + add r0, v0, c256 + mov oPos, r0 +#endif + static const DWORD vs_1_256[] = + { + 0xfffe0101, + 0x0000001f, 0x80000000, 0x900f0000, + 0x00000051, 0xa00f0100, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x00000002, 0x800f0000, 0x90e40000, 0xa0e40100, + 0x00000001, 0xc00f0000, 0x80e40000, + 0x0000ffff + }; +#if 0 + vs_3_0 + dcl_position v0 + dcl_position o0 + def c256, 1.0, 1.0, 1.0, 1.0 + add r0, v0, c256 + mov o0, r0 +#endif + static const DWORD vs_3_256[] = + { + 0xfffe0300, + 0x0200001f, 0x80000000, 0x900f0000, + 0x0200001f, 0x80000000, 0xe00f0000, + 0x05000051, 0xa00f0100, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x03000002, 0x800f0000, 0x90e40000, 0xa0e40100, + 0x02000001, 0xe00f0000, 0x80e40000, + 0x0000ffff + }; +#if 0 + /* This shader source generates syntax errors with the native shader assembler + * due to the constant register index values. + * The bytecode was modified by hand to use the intended values. */ + vs_3_0 + dcl_position v0 + dcl_position o0 + defi i16, 1, 1, 1, 1 + rep i16 + add r0, r0, v0 + endrep + mov o0, r0 +#endif + static const DWORD vs_3_i16[] = + { + 0xfffe0300, + 0x0200001f, 0x80000000, 0x900f0000, + 0x0200001f, 0x80000000, 0xe00f0000, + 0x05000030, 0xf00f0010, 0x00000001, 0x00000001, 0x00000001, 0x00000001, + 0x01000026, 0xf0e40010, + 0x03000002, 0x800f0000, 0x80e40000, 0x90e40000, + 0x00000027, + 0x02000001, 0xe00f0000, 0x80e40000, + 0x0000ffff + }; +#if 0 + /* This shader source generates syntax errors with the native shader assembler + * due to the constant register index values. + * The bytecode was modified by hand to use the intended values. */ + vs_3_0 + dcl_position v0 + dcl_position o0 + defb b16, true + mov r0, v0 + if b16 + add r0, r0, v0 + endif + mov o0, r0 +#endif + static const DWORD vs_3_b16[] = + { + 0xfffe0300, + 0x0200001f, 0x80000000, 0x900f0000, + 0x0200001f, 0x80000000, 0xe00f0000, + 0x0200002f, 0xe00f0810, 0x00000001, + 0x02000001, 0x800f0000, 0x90e40000, + 0x01000028, 0xe0e40810, + 0x03000002, 0x800f0000, 0x80e40000, 0x90e40000, + 0x0000002b, + 0x02000001, 0xe00f0000, 0x80e40000, + 0x0000ffff + }; +#if 0 + /* This shader source generates syntax errors with the native shader assembler + * due to the constant register index values. + * The bytecode was modified by hand to use the intended values. */ + ps_1_1 + def c8, 1.0, 1.0, 1.0, 1.0 + add r0, v0, c8 +#endif + static const DWORD ps_1_8[] = + { + 0xffff0101, + 0x00000051, 0xa00f0008, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x00000002, 0x800f0000, 0x90e40000, 0xa0e40008, + 0x0000ffff + }; +#if 0 + /* This shader source generates syntax errors with the native shader assembler + * due to the constant register index values. + * The bytecode was modified by hand to use the intended values. */ + ps_2_0 + def c32, 1.0, 1.0, 1.0, 1.0 + add oC0, v0, c32 +#endif + static const DWORD ps_2_32[] = + { + 0xffff0200, + 0x05000051, 0xa00f0020, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x03000002, 0x800f0000, 0x90e40000, 0xa0e40020, + 0x0000ffff + }; +#if 0 + /* This shader source generates syntax errors with the native shader assembler + * due to the constant register index values. + * The bytecode was modified by hand to use the intended values. */ + ps_3_0 + dcl_color0 v0 + def c224, 1.0, 1.0, 1.0, 1.0 + add oC0, v0, c224 +#endif + static const DWORD ps_3_224[] = + { + 0xffff0300, + 0x0200001f, 0x8000000a, 0x900f0000, + 0x05000051, 0xa00f00e0, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x03000002, 0x800f0800, 0x90e40000, 0xa0e400e0, + 0x0000ffff + }; +#if 0 + /* This shader source generates syntax errors with the native shader assembler + * due to the constant register index values. + * The bytecode was modified by hand to use the intended values. */ + ps_2_0 + defb b0, true + defi i0, 1, 1, 1, 1 + rep i0 + if b0 + add r0, r0, v0 + endif + endrep + mov oC0, r0 +#endif + static const DWORD ps_2_0_boolint[] = + { + 0xffff0200, + 0x0200002f, 0xe00f0800, 0x00000001, + 0x05000030, 0xf00f0000, 0x00000001, 0x00000001, 0x00000001, 0x00000001, + 0x01000026, 0xf0e40000, + 0x01000028, 0xe0e40800, + 0x03000002, 0x800f0000, 0x80e40000, 0x90e40000, + 0x0000002b, + 0x00000027, + 0x02000001, 0x800f0800, 0x80e40000, + 0x0000ffff + }; IDirect3DVertexShader9 *vs = NULL; IDirect3DPixelShader9 *ps = NULL; @@ -5186,10 +5362,52 @@ float4 main(const float4 color : COLOR) : SV_TARGET { hr = IDirect3DDevice9_CreateVertexShader(device, vs_3_0, &vs); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + if (caps.VertexShaderVersion <= D3DVS_VERSION(1, 1) && caps.MaxVertexShaderConst < 256) + { + hr = IDirect3DDevice9_CreateVertexShader(device, vs_1_255, &vs); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + } + else + { + skip("GPU supports SM2+, skipping SM1 test.\n"); + } + + skip("This GPU doesn't support SM3, skipping test with shader using unsupported constants.\n"); } else + { skip("This GPU supports SM3, skipping unsupported shader test.\n"); + hr = IDirect3DDevice9_CreateVertexShader(device, vs_1_255, &vs); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DVertexShader9_Release(vs); + hr = IDirect3DDevice9_CreateVertexShader(device, vs_1_256, &vs); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVertexShader(device, vs_3_256, &vs); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVertexShader(device, vs_3_i16, &vs); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVertexShader(device, vs_3_b16, &vs); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + } + + if (caps.PixelShaderVersion < D3DPS_VERSION(3, 0)) + { + skip("This GPU doesn't support SM3, skipping test with shader using unsupported constants.\n"); + goto cleanup; + } + hr = IDirect3DDevice9_CreatePixelShader(device, ps_1_8, &ps); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, ps_2_32, &ps); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, ps_3_224, &ps); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, ps_2_0_boolint, &ps); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + if (ps) + IDirect3DPixelShader9_Release(ps); + +cleanup: refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d);

1 0

Nikolay Sivov : dwrite: Added parameter check for registering/ unregistering collection loaders.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: 28e9b3f42121a3828717d72da7c77a14301273b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e9b3f42121a3828717d72da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 14:49:12 2014 +0400 dwrite: Added parameter check for registering/unregistering collection loaders. --- dlls/dwrite/main.c | 10 ++++++++-- dlls/dwrite/tests/font.c | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 033e89a..0379feb 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -491,11 +491,14 @@ static HRESULT WINAPI dwritefactory_CreateCustomFontCollection(IDWriteFactory *i static HRESULT WINAPI dwritefactory_RegisterFontCollectionLoader(IDWriteFactory *iface, IDWriteFontCollectionLoader *loader) { - int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); + int i; TRACE("(%p)->(%p)\n", This, loader); + if (!loader) + return E_INVALIDARG; + for (i = 0; i < This->loader_count; i++) if (This->loaders[i] == loader) return DWRITE_E_ALREADYREGISTERED; @@ -527,11 +530,14 @@ static HRESULT WINAPI dwritefactory_RegisterFontCollectionLoader(IDWriteFactory static HRESULT WINAPI dwritefactory_UnregisterFontCollectionLoader(IDWriteFactory *iface, IDWriteFontCollectionLoader *loader) { - int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); + int i; TRACE("(%p)->(%p)\n", This, loader); + if (!loader) + return E_INVALIDARG; + for (i = 0; i < This->loader_count; i++) if (This->loaders[i] == loader) break; if (i == This->loader_count) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 945bfbf..efe3743 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -855,6 +855,12 @@ static void test_CustomFontCollection(void) IDWriteFontCollectionLoader collection2 = { &dwritefontcollectionloadervtbl }; HRESULT hr; + hr = IDWriteFactory_RegisterFontCollectionLoader(factory, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_UnregisterFontCollectionLoader(factory, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_RegisterFontCollectionLoader(factory, &collection); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFactory_RegisterFontCollectionLoader(factory, &collection2);

1 0

Nikolay Sivov : dwrite: Update to IDWriteFontFace2.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: a1ff4f904e7e2ae0e8ba7a7f31085b64ec813ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ff4f904e7e2ae0e8ba7a7f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 10 10:01:24 2014 +0400 dwrite: Update to IDWriteFontFace2. --- dlls/dwrite/font.c | 255 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 205 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1ff4f904e7e2ae0e8ba7…

1 0

Nikolay Sivov : dwrite: Update to IDWriteFont2.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: 1f9ca4775a9951e3060ffd0c34b64e91fdfcfb9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f9ca4775a9951e3060ffd0c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 10 09:28:58 2014 +0400 dwrite: Update to IDWriteFont2. --- dlls/dwrite/font.c | 148 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 88 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f9ca4775a9951e3060ff…

1 0

Akihiro Sagawa : kernel32: Fix incorrect lastpart in GetFullPathNameA with DBCS.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: 4aea5ca72b3af995606ab4784792608637548291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aea5ca72b3af995606ab4784… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 14 00:24:58 2014 +0900 kernel32: Fix incorrect lastpart in GetFullPathNameA with DBCS. --- dlls/kernel32/path.c | 16 ++++++---------- dlls/kernel32/tests/path.c | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 09fb04b..c4a37b2 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -251,12 +251,12 @@ DWORD WINAPI GetFullPathNameA( LPCSTR name, DWORD len, LPSTR buffer, LPSTR *lastpart ) { WCHAR *nameW; - WCHAR bufferW[MAX_PATH]; + WCHAR bufferW[MAX_PATH], *lastpartW = NULL; DWORD ret; if (!(nameW = FILE_name_AtoW( name, FALSE ))) return 0; - ret = GetFullPathNameW( nameW, MAX_PATH, bufferW, NULL); + ret = GetFullPathNameW( nameW, MAX_PATH, bufferW, &lastpartW); if (!ret) return 0; if (ret > MAX_PATH) @@ -267,14 +267,10 @@ DWORD WINAPI GetFullPathNameA( LPCSTR name, DWORD len, LPSTR buffer, ret = copy_filename_WtoA( bufferW, buffer, len ); if (ret < len && lastpart) { - LPSTR p = buffer + strlen(buffer) - 1; - - if (*p != '\\') - { - while ((p > buffer + 2) && (*p != '\\')) p--; - *lastpart = p + 1; - } - else *lastpart = NULL; + if (lastpartW) + *lastpart = buffer + FILE_name_WtoA( bufferW, lastpartW - bufferW, NULL, 0 ); + else + *lastpart = NULL; } return ret; } diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 0f07ea6..44f14d0 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1828,6 +1828,7 @@ static void test_GetFullPathNameA(void) char output[MAX_PATH], *filepart; DWORD ret; int i; + UINT acp; const struct { @@ -1864,6 +1865,27 @@ static void test_GetFullPathNameA(void) "[%d] Expected GetLastError() to return 0xdeadbeef, got %u\n", i, GetLastError()); } + + acp = GetACP(); + if (acp != 932) + skip("Skipping DBCS(Japanese) GetFullPathNameA test in this codepage (%d)\n", acp); + else { + const struct dbcs_case { + const char *input; + const char *expected; + } testset[] = { + { "c:\\a\\\x95\x5c\x97\xa0.txt", "\x95\x5c\x97\xa0.txt" }, + { "c:\\\x83\x8f\x83\x43\x83\x93\\wine.c", "wine.c" }, + { "c:\\demo\\\x97\xa0\x95\x5c", "\x97\xa0\x95\x5c" } + }; + for (i = 0; i < sizeof(testset)/sizeof(testset[0]); i++) { + ret = GetFullPathNameA(testset[i].input, sizeof(output), + output, &filepart); + ok(ret, "[%d] GetFullPathName error %u\n", i, GetLastError()); + ok(!lstrcmpA(filepart, testset[i].expected), + "[%d] expected %s got %s\n", i, testset[i].expected, filepart); + } + } } static void test_GetFullPathNameW(void)

1 0

Matteo Bruni : wined3d: Fail to create shaders using more than the supported number of constants.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: f24e62b303a08a2c10e21bc462759aa0937bcd5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24e62b303a08a2c10e21bc46… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 9 18:00:57 2014 +0200 wined3d: Fail to create shaders using more than the supported number of constants. --- dlls/wined3d/shader.c | 401 ++++++++++++++++++++++++++++---------------------- 1 file changed, 222 insertions(+), 179 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f24e62b303a08a2c10e21…

1 0

André Hentschel : winedump: Fix compiler warnings.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: 8fc9a84960ad146b805e925bdf387729453624a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc9a84960ad146b805e925bd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 13 22:44:11 2014 +0200 winedump: Fix compiler warnings. --- tools/winedump/pe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 36ea137..aedd98e 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -790,7 +790,7 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) if (fnc->u.s.C || fnc->u.s.L) { strcat(intregs, ", "); - if (fnc->u.s.C || fnc->u.s.L && !fnc->u.s.H) + if (fnc->u.s.C || (fnc->u.s.L && !fnc->u.s.H)) strcat(intregspop, ", "); } } @@ -810,7 +810,7 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) if (fnc->u.s.C || fnc->u.s.L) { strcat(intregs, ", "); - if (fnc->u.s.C || fnc->u.s.L && !fnc->u.s.H) + if (fnc->u.s.C || (fnc->u.s.L && !fnc->u.s.H)) strcat(intregspop, ", "); } } @@ -822,7 +822,7 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) if (fnc->u.s.C || fnc->u.s.L) { strcat(intregs, ", "); - if (fnc->u.s.C || fnc->u.s.L && !fnc->u.s.H) + if (fnc->u.s.C || (fnc->u.s.L && !fnc->u.s.H)) strcat(intregspop, ", "); } }

1 0