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

Hans Leidekker : webservices: Add support for reading double values.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 524fa65734fbc20135db89b6fa68464aadfc8148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=524fa65734fbc20135db89b6f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 18 13:51:20 2016 +0200 webservices: Add support for reading double values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 210 ++++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 96 ++++++++++++++++++ 2 files changed, 306 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=524fa65734fbc20135db8…

1 0

Austin English : dbghelp: Add forwards for EnumerateLoadedModulesEx/ EnumerateLoadedModulesExW.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 6e0366fd5ea0a3a56f4680d4b477be1562f534d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e0366fd5ea0a3a56f4680d4b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 11 16:31:13 2016 -0500 dbghelp: Add forwards for EnumerateLoadedModulesEx/EnumerateLoadedModulesExW. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 4 ++-- include/dbghelp.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 6004f95..3655f8c 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -4,8 +4,8 @@ @ stdcall EnumDirTreeW(long wstr wstr ptr ptr ptr) @ stdcall EnumerateLoadedModules(long ptr ptr) @ stdcall EnumerateLoadedModules64(long ptr ptr) -@ stub EnumerateLoadedModulesEx -@ stub EnumerateLoadedModulesExW +@ stdcall EnumerateLoadedModulesEx(long ptr ptr) EnumerateLoadedModules64 +@ stdcall EnumerateLoadedModulesExW(long ptr ptr) EnumerateLoadedModulesW64 @ stdcall EnumerateLoadedModulesW64(long ptr ptr) @ stdcall ExtensionApiVersion() @ stdcall FindDebugInfoFile(str str ptr) diff --git a/include/dbghelp.h b/include/dbghelp.h index 2fd9ef0..e6015ff 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -908,6 +908,8 @@ typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK64)(PCSTR, DWORD64, ULONG, P BOOL WINAPI EnumerateLoadedModules64(HANDLE, PENUMLOADED_MODULES_CALLBACK64, PVOID); typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACKW64)(PCWSTR, DWORD64, ULONG, PVOID); BOOL WINAPI EnumerateLoadedModulesW64(HANDLE, PENUMLOADED_MODULES_CALLBACKW64, PVOID); +BOOL WINAPI EnumerateLoadedModulesEx(HANDLE, PENUMLOADED_MODULES_CALLBACK64, PVOID); +BOOL WINAPI EnumerateLoadedModulesExW(HANDLE, PENUMLOADED_MODULES_CALLBACKW64, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK64)(PCSTR, DWORD64, PVOID); BOOL WINAPI SymEnumerateModules64(HANDLE, PSYM_ENUMMODULES_CALLBACK64, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACKW64)(PCWSTR, DWORD64, PVOID);

1 0

Frédéric Delanoy : msvcp90: Fix a typo in an FIXME message.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 58e95f72218fa018739c484f172bc236e685d5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=58e95f72218fa018739c484f1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed May 18 12:10:31 2016 +0200 msvcp90: Fix a typo in an FIXME message. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index a41d357..81a5fbb 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -471,7 +471,7 @@ typedef struct int __cdecl _Mtx_init(_Mtx_t *mtx, int flags) { if(flags & ~MTX_MULTI_LOCK) - FIXME("unknown flags ignorred: %x\n", flags); + FIXME("unknown flags ignored: %x\n", flags); *mtx = MSVCRT_operator_new(sizeof(**mtx)); (*mtx)->flags = flags;

1 0

Frédéric Delanoy : oleaut32: Fix a typo in an comment.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: c12845216cb254fd902ffa30668aa74b1b184ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c12845216cb254fd902ffa306… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed May 18 12:10:33 2016 +0200 oleaut32: Fix a typo in an comment. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 8f274ba..31c9ab9 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -217,7 +217,7 @@ typedef struct { /* after this may follow an array with default value pointers if the * appropriate bit in the FKCCIC field has been set: - * INT oDefautlValue[nrargs]; + * INT oDefaultValue[nrargs]; */ /* Parameter info one per argument*/

1 0

Józef Kucia : d3d11: Accept DXGI_FORMAT_UNKNOWN as format in view descriptions.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 4a86e3d4975826ffeddfbd98f3c1c6d83819d438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a86e3d4975826ffeddfbd98f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 18 00:04:38 2016 +0200 d3d11: Accept DXGI_FORMAT_UNKNOWN as format in view descriptions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 6 +- dlls/d3d11/tests/d3d11.c | 6 +- dlls/d3d11/view.c | 168 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 171 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a86e3d4975826ffeddfb…

1 0

Józef Kucia : wined3d: Add SV_VertexID sysval semantic.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 2d97dbf87b042fe62d90ce5015c253544e34c757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d97dbf87b042fe62d90ce501… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 18 00:04:36 2016 +0200 wined3d: Add SV_VertexID sysval semantic. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 1 + include/wine/wined3d.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f8c335c..01c5d50 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -232,6 +232,7 @@ static const struct sysval_semantic_names[] = { {WINED3D_SV_POSITION, "SV_Position"}, + {WINED3D_SV_VERTEX_ID, "SV_VertexID"}, {WINED3D_SV_INSTANCE_ID, "SV_InstanceID"}, {WINED3D_SV_PRIMITIVE_ID, "SV_PrimitiveID"}, {WINED3D_SV_IS_FRONT_FACE, "SV_IsFrontFace"}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a770d7f..8429bea 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -744,6 +744,7 @@ enum wined3d_decl_usage enum wined3d_sysval_semantic { WINED3D_SV_POSITION = 1, + WINED3D_SV_VERTEX_ID = 6, WINED3D_SV_PRIMITIVE_ID = 7, WINED3D_SV_INSTANCE_ID = 8, WINED3D_SV_IS_FRONT_FACE = 9,

1 0

Józef Kucia : wined3d: Use d3d_perf channel for performance warnings.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 8e566322341d3140e9a3c979b2438cdcd385e834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e566322341d3140e9a3c979b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 18 00:04:35 2016 +0200 wined3d: Use d3d_perf channel for performance warnings. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4fb2251..2f00e87 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1897,7 +1897,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc if ((xrel - 1.0f < -eps) || (xrel - 1.0f > eps)) { - FIXME("Doing a pixel by pixel copy from the framebuffer to a texture, expect major performance issues\n"); + FIXME_(d3d_perf)("Doing a pixel by pixel copy from the framebuffer to a texture.\n"); if (filter != WINED3D_TEXF_NONE && filter != WINED3D_TEXF_POINT) ERR("Texture filtering not supported in direct blit.\n"); @@ -2910,8 +2910,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, if ((sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | texture->resource.map_binding)) == WINED3D_LOCATION_TEXTURE_RGB) { - /* Performance warning... */ - FIXME("Downloading RGB surface %p to reload it as sRGB.\n", surface); + FIXME_(d3d_perf)("Downloading RGB surface %p to reload it as sRGB.\n", surface); surface_load_location(surface, context, texture->resource.map_binding); } } @@ -2920,8 +2919,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, if ((sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | texture->resource.map_binding)) == WINED3D_LOCATION_TEXTURE_SRGB) { - /* Performance warning... */ - FIXME("Downloading sRGB surface %p to reload it as RGB.\n", surface); + FIXME_(d3d_perf)("Downloading sRGB surface %p to reload it as RGB.\n", surface); surface_load_location(surface, context, texture->resource.map_binding); } }

1 0

Nikolay Sivov : msxml3/tests: Simplify refcount checks.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 11a01849e81cd0118ee792c6db935b365006dfaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a01849e81cd0118ee792c6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:21:59 2016 +0300 msxml3/tests: Simplify refcount checks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 7 ++++--- dlls/msxml3/tests/saxreader.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index f228b41..b50b153 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -43,9 +43,10 @@ #define EXPECT_REF(node,ref) _expect_ref((IUnknown*)node, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__, line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } DEFINE_GUID(SID_SContainerDispatch, 0xb722be00, 0x4e68, 0x101b, 0xa2, 0xbc, 0x00, 0xaa, 0x00, 0x40, 0x47, 0x70); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index a2dc3fb..5fc62b7 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -43,9 +43,10 @@ static const WCHAR emptyW[] = {0}; #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__, line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } static LONG get_refcount(void *iface)

1 0

Nikolay Sivov : dwrite/tests: Simplify refcount check a bit.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: a3e3dfcef2cd21362169a58e72e49ef4061a66f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e3dfcef2cd21362169a58e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:21:46 2016 +0300 dwrite/tests: Simplify refcount check a bit. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 13d27da..54056c7 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -225,9 +225,10 @@ static void get_script_analysis(const WCHAR *str, UINT32 len, DWRITE_SCRIPT_ANAL #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } enum drawcall_modifiers_kind {

1 0

Nikolay Sivov : dwrite: Be prepared for 0 face_id passed to face requester.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: e0e937e19a12d6f488644dfaf8bb2c25e5cd54cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e937e19a12d6f488644dfaf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 18 10:11:39 2016 +0300 dwrite: Be prepared for 0 face_id passed to face requester. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index d8afa69..b6d785f 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -107,6 +107,11 @@ static FT_Error face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointe *face = NULL; + if (!fontface) { + WARN("NULL fontface requested.\n"); + return FT_Err_Ok; + } + count = 1; hr = IDWriteFontFace_GetFiles(fontface, &count, &file); if (FAILED(hr))

1 0