November 2015 - Wine-commits

YongHao Hu : msvcp110: Add tr2_sys__Open_dir implementation.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: b5c12faa6a793443eb97fdb512787fb3b3ef82c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c12faa6a793443eb97fdb51… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Oct 31 17:28:46 2015 +0800 msvcp110: Add tr2_sys__Open_dir implementation. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 39 +++++++++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index a739dd4..dab4cd2 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1641,8 +1641,8 @@ @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV123@@Z(ptr) locale__Locimp__New_Locimp @ cdecl -arch=win32 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)_N@Z(long) locale__Locimp__New_Locimp_transparent @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z(long) locale__Locimp__New_Locimp_transparent -@ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXPADPBDAAHAAW4file_type(a)123@@Z -@ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXPEADPEBDAEAHAEAW4file_type(a)123@@Z +@ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXPADPBDAAHAAW4file_type(a)123@@Z(ptr str long long) tr2_sys__Open_dir +@ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z(ptr str long long) tr2_sys__Open_dir @ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXPA_WPB_WAAHAAW4file_type(a)123@@Z @ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXPEA_WPEB_WAEAHAEAW4file_type(a)123@@Z @ cdecl -arch=arm ?_Orphan_all(a)_Container_base0@std@@QAAXXZ(ptr) Container_base0_Orphan_all diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index e24268d..4448764 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1602,8 +1602,8 @@ @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV123@@Z(ptr) locale__Locimp__New_Locimp @ cdecl -arch=win32 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)_N@Z(long) locale__Locimp__New_Locimp_transparent @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z(long) locale__Locimp__New_Locimp_transparent -@ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z -@ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z(ptr str long long) tr2_sys__Open_dir +@ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z(ptr str long long) tr2_sys__Open_dir @ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)_WPB_WAAHAAW4file_type@123@@Z @ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)_WPEB_WAEAHAEAW4file_type@123@@Z @ cdecl -arch=arm ?_Orphan_all(a)_Container_base0@std@@QAAXXZ(ptr) Container_base0_Orphan_all diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index d0debd1..7217a46 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1602,8 +1602,8 @@ @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV123@@Z(ptr) msvcp120.?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV123@@Z @ cdecl -arch=win32 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)_N@Z(long) msvcp120.?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)_N@Z @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z(long) msvcp120.?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z -@ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z -@ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z(ptr str long long) msvcp120.?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z +@ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z(ptr str long long) msvcp120.?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z @ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)_WPB_WAAHAAW4file_type@123@@Z @ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)_WPEB_WAEAHAEAW4file_type@123@@Z @ cdecl -arch=arm ?_Orphan_all(a)_Container_base0@std@@QAAXXZ(ptr) msvcp120.?_Orphan_all(a)_Container_base0@std@@QAAXXZ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 4005290..5242b53 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14439,6 +14439,45 @@ void __cdecl tr2_sys__Last_write_time_set(char const* path, __int64 newtime) CloseHandle(handle); } +/* ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z */ +/* ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z */ +void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, enum file_type* type) +{ + HANDLE handle; + WIN32_FIND_DATAA data; + char temppath[MAX_PATH]; + + TRACE("(%p %s %p %p)\n", target, debugstr_a(dest), err_code, type); + if(strlen(dest) > MAX_PATH - 3) { + *err_code = ERROR_BAD_PATHNAME; + return NULL; + } + strcpy(temppath, dest); + strcat(temppath, "\\*"); + + handle = FindFirstFileA(temppath, &data); + if(handle == INVALID_HANDLE_VALUE) { + *err_code = GetLastError(); + return NULL; + } + while(!strcmp(data.cFileName, ".") || !strcmp(data.cFileName, "..")) { + if(!FindNextFileA(handle, &data)) { + *err_code = ERROR_SUCCESS; + *type = status_unknown; + FindClose(handle); + return NULL; + } + } + + strcpy(target, data.cFileName); + *err_code = ERROR_SUCCESS; + if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + *type = directory_file; + else + *type = regular_file; + return handle; +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

Sebastian Lackner : server: Clear last error when creating object without name.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 52f9acedd2fb4dab817f2204c74e7f9aa6b26943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f9acedd2fb4dab817f2204c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 2 06:02:16 2015 +0100 server: Clear last error when creating object without name. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 6 +++++- server/named_pipe.c | 6 +++++- server/object.c | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/server/directory.c b/server/directory.c index 4ebc974..e0cf75e 100644 --- a/server/directory.c +++ b/server/directory.c @@ -287,7 +287,11 @@ void *create_named_object_dir( struct directory *root, const struct unicode_str struct object *obj, *new_obj = NULL; struct unicode_str new_name; - if (!name || !name->len) return alloc_object( ops ); + if (!name || !name->len) + { + if ((new_obj = alloc_object( ops ))) clear_error(); + return new_obj; + } if (!(obj = find_object_dir( root, name, attributes, &new_name ))) return NULL; if (!new_name.len) diff --git a/server/named_pipe.c b/server/named_pipe.c index f5e536c..fbabc5a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -671,7 +671,11 @@ static struct named_pipe *create_named_pipe( struct directory *root, const struc struct named_pipe *pipe = NULL; struct unicode_str new_name; - if (!name || !name->len) return alloc_object( &named_pipe_ops ); + if (!name || !name->len) + { + if ((pipe = alloc_object( &named_pipe_ops ))) clear_error(); + return pipe; + } if (!(obj = find_object_dir( root, name, attr, &new_name ))) { diff --git a/server/object.c b/server/object.c index 965c11c..31883bd 100644 --- a/server/object.c +++ b/server/object.c @@ -242,7 +242,11 @@ void *create_named_object( struct namespace *namespace, const struct object_ops { struct object *obj; - if (!name || !name->len) return alloc_object( ops ); + if (!name || !name->len) + { + if ((obj = alloc_object( ops ))) clear_error(); + return obj; + } if ((obj = find_object( namespace, name, attributes ))) {

1 0

Hugh McMaster : po: Fix some format specifiers in the Turkish translation.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: a3f943f03f6917f5ce8a02e87a6effd0f1b6cd22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f943f03f6917f5ce8a02e87… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Nov 2 18:34:03 2015 +1100 po: Fix some format specifiers in the Turkish translation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index 9a66490..0ee7f0e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -11952,11 +11952,11 @@ msgstr "regsvr32: '%1!S!', '%2% DLL dosyasında yok.\n" #: regsvr32.rc:44 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "regsvr32: '%!' DLL dosyası kaydedilemedi.\n" +msgstr "regsvr32: '%1' DLL dosyası kaydedilemedi.\n" #: regsvr32.rc:45 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "regsvr32: '%!' DLL dosyası başarıyla kaydedildi.\n" +msgstr "regsvr32: '%1' DLL dosyası başarıyla kaydedildi.\n" #: regsvr32.rc:46 msgid "regsvr32: Failed to unregister DLL '%1'\n" @@ -12874,7 +12874,7 @@ msgstr "" #: uninstaller.rc:33 msgid "uninstaller: Invalid option [%1]\n" -msgstr "uninstaller: '%c' geçersiz seçenek.\n" +msgstr "uninstaller: '%1' geçersiz seçenek.\n" #: uninstaller.rc:35 msgid ""

1 0

Sebastian Lackner : widl: When adding an interface typedef do check whether it has been already added while resolving the parent interface.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 736beff9c69923b8616767f9a825cd45ec77d584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=736beff9c69923b8616767f9a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Oct 31 14:31:26 2015 +0800 widl: When adding an interface typedef do check whether it has been already added while resolving the parent interface. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index fc0eae7..98081f2 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2078,6 +2078,10 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) add_interface_typeinfo(typelib, inherit); } + /* check typelib_idx again, it could have been added while resolving the parent interface */ + if (-1 < interface->typelib_idx) + return; + interface->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_INTERFACE, interface->name, interface->attrs); msft_typeinfo->typeinfo->size = pointer_size;

1 0

Alexandre Julliard : mmdevapi/tests: Avoid %ll printf format.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: bc9a95bb517b0aedb8d3e505a6bb579fe35b6bb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9a95bb517b0aedb8d3e505a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 31 15:02:29 2015 +0900 mmdevapi/tests: Avoid %ll printf format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index be17a0d..298c886 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -337,7 +337,8 @@ static void test_audioclient(void) (UINT)(t2/10000), (UINT)(t2 % 10000)); ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000) || broken(t2 == 0) /* (!) win10 */, - "Latency < default period, delta %ldus (%llu vs %llu)\n", (long)((t2-t1)/10), t2, t1); + "Latency < default period, delta %dus (%x%08x vs %x%08x)\n", + (LONG)((t2-t1)/10), (DWORD)(t2 >> 32), (DWORD)t2, (DWORD)(t1 >> 32), (DWORD)t1); /* Native appears to add the engine period to the HW latency in shared mode */ if(t2 == 0) win10 = TRUE;

1 0

Matteo Bruni : wined3d: Cleanup extension check for shader model 4 support.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 905261ab40dbf5e3be4664e210d6b3bfd2bb3dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905261ab40dbf5e3be4664e21… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 29 15:09:53 2015 +0100 wined3d: Cleanup extension check for shader model 4 support. This essentially enables shader model 4 support with Mesa or OS X when using core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 6 ++---- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d7f0512..046c6eb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3553,6 +3553,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) if (gl_version >= MAKEDWORD_VERSION(2, 0)) gl_info->supported[WINED3D_GL_VERSION_2_0] = TRUE; + if (gl_version >= MAKEDWORD_VERSION(3, 2)) + gl_info->supported[WINED3D_GL_VERSION_3_2] = TRUE; if (gl_info->supported[APPLE_FENCE]) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4a95e44..44e7090 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7761,10 +7761,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s { UINT shader_model; - if (gl_info->supported[EXT_GPU_SHADER4] && gl_info->supported[ARB_SHADER_BIT_ENCODING] - && gl_info->supported[ARB_GEOMETRY_SHADER4] && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) - && gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && gl_info->supported[ARB_DRAW_INSTANCED] - && gl_info->supported[ARB_TEXTURE_RG] && gl_info->supported[ARB_SAMPLER_OBJECTS]) + if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] + && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS]) shader_model = 4; /* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3 * texldd and texldl instructions. */ diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2be7262..437f62f 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -165,6 +165,7 @@ enum wined3d_gl_extension WINED3D_GL_NORMALIZED_TEXRECT, WINED3D_GL_LEGACY_CONTEXT, WINED3D_GL_VERSION_2_0, + WINED3D_GL_VERSION_3_2, WINED3D_GL_EXT_COUNT, };

1 0

Riccardo Bortolato : wined3d: Make wined3d_device_copy_sub_resource_region return an error code.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 4a4efc35062ad5d99ba344a48d4d6111f6287abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4efc35062ad5d99ba344a48… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Thu Oct 29 16:49:28 2015 +0100 wined3d: Make wined3d_device_copy_sub_resource_region return an error code. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 16 +++++++++------- include/wine/wined3d.h | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d00f263..4806e3d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3867,7 +3867,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, } } -void CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device, +HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) @@ -3886,7 +3886,7 @@ void CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device if (src_resource == dst_resource && src_sub_resource_idx == dst_sub_resource_idx) { WARN("Source and destination are the same sub-resource.\n"); - return; + return WINED3DERR_INVALIDCALL; } if (src_resource->type != dst_resource->type) @@ -3894,7 +3894,7 @@ void CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device WARN("Resource types (%s / %s) don't match.\n", debug_d3dresourcetype(dst_resource->type), debug_d3dresourcetype(src_resource->type)); - return; + return WINED3DERR_INVALIDCALL; } if (src_resource->format->id != dst_resource->format->id) @@ -3902,20 +3902,20 @@ void CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device WARN("Resource formats (%s / %s) don't match.\n", debug_d3dformat(dst_resource->format->id), debug_d3dformat(src_resource->format->id)); - return; + return WINED3DERR_INVALIDCALL; } if (dst_resource->type != WINED3D_RTYPE_TEXTURE) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type)); - return; + return WINED3DERR_INVALIDCALL; } dst_texture = wined3d_texture_from_resource(dst_resource); if (!(tmp = wined3d_texture_get_sub_resource(dst_texture, dst_sub_resource_idx))) { WARN("Invalid dst_sub_resource_idx %u.\n", dst_sub_resource_idx); - return; + return WINED3DERR_INVALIDCALL; } dst_surface = surface_from_resource(tmp); @@ -3923,7 +3923,7 @@ void CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device if (!(tmp = wined3d_texture_get_sub_resource(src_texture, src_sub_resource_idx))) { WARN("Invalid src_sub_resource_idx %u.\n", src_sub_resource_idx); - return; + return WINED3DERR_INVALIDCALL; } src_surface = surface_from_resource(tmp); @@ -3939,6 +3939,8 @@ void CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *device if (FAILED(hr = wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) ERR("Failed to blit, hr %#x.\n", hr); + + return hr; } void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9cc1e1c..52c822e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2130,7 +2130,7 @@ HRESULT __cdecl wined3d_device_clear_rendertarget_view(struct wined3d_device *de struct wined3d_rendertarget_view *view, const RECT *rect, const struct wined3d_color *color); void __cdecl wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource); -void __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *device, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box);

1 0

Andrew Eikum : xaudio2/tests: Fix memory leaks.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 23a0c7f677079dd5f6aa4c51319140f045eee26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=23a0c7f677079dd5f6aa4c513… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 30 08:55:39 2015 -0500 xaudio2/tests: Fix memory leaks. Spotted by Nikolay Sivov. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 3f03cc6..c7ae982 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -766,6 +766,13 @@ static void test_looping(IXAudio2 *xa) ok(played - running_total == 22050 + 44100 * 2, "Got wrong samples played: %u\n", played - running_total); ok(nloopends == (played - running_total) / 88200 + 1, "Got wrong OnLoopEnd calls: %u\n", nloopends); running_total = played; + + if(xaudio27) + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); + else + IXAudio2SourceVoice_DestroyVoice(src); + IXAudio2MasteringVoice_DestroyVoice(master); + HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); } static UINT32 test_DeviceDetails(IXAudio27 *xa)

1 0

Andrew Eikum : xaudio2: For legacy xaudio2, prefer native version.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: b321834d56d197aa21ed89143674917239dc3810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b321834d56d197aa21ed89143… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 30 09:42:50 2015 -0500 xaudio2: For legacy xaudio2, prefer native version. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_0/xaudio_dll.c | 2 ++ dlls/xaudio2_1/xaudio_dll.c | 2 ++ dlls/xaudio2_2/xaudio_dll.c | 2 ++ dlls/xaudio2_3/xaudio_dll.c | 2 ++ dlls/xaudio2_4/xaudio_dll.c | 2 ++ dlls/xaudio2_5/xaudio_dll.c | 2 ++ dlls/xaudio2_6/xaudio_dll.c | 2 ++ 7 files changed, 14 insertions(+) diff --git a/dlls/xaudio2_0/xaudio_dll.c b/dlls/xaudio2_0/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_0/xaudio_dll.c +++ b/dlls/xaudio2_0/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_1/xaudio_dll.c b/dlls/xaudio2_1/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_1/xaudio_dll.c +++ b/dlls/xaudio2_1/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_2/xaudio_dll.c b/dlls/xaudio2_2/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_2/xaudio_dll.c +++ b/dlls/xaudio2_2/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_3/xaudio_dll.c b/dlls/xaudio2_3/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_3/xaudio_dll.c +++ b/dlls/xaudio2_3/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_4/xaudio_dll.c b/dlls/xaudio2_4/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_4/xaudio_dll.c +++ b/dlls/xaudio2_4/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_5/xaudio_dll.c b/dlls/xaudio2_5/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_5/xaudio_dll.c +++ b/dlls/xaudio2_5/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_6/xaudio_dll.c b/dlls/xaudio2_6/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_6/xaudio_dll.c +++ b/dlls/xaudio2_6/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance);

1 0

Piotr Caban : include: Fix CreateSymbolicLink and TryAcquireSRWLockExclusive prototypes.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: ff698220c19eb04f4660cea203ca122212312326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff698220c19eb04f4660cea20… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 30 15:49:09 2015 +0100 include: Fix CreateSymbolicLink and TryAcquireSRWLockExclusive prototypes. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 4 ++-- include/winbase.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 9d5f25b..bc417bd 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1996,7 +1996,7 @@ WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ) /************************************************************************* * CreateSymbolicLinkW (KERNEL32.@) */ -BOOL WINAPI CreateSymbolicLinkW(LPCWSTR link, LPCWSTR target, DWORD flags) +BOOLEAN WINAPI CreateSymbolicLinkW(LPCWSTR link, LPCWSTR target, DWORD flags) { FIXME("(%s %s %d): stub\n", debugstr_w(link), debugstr_w(target), flags); return TRUE; @@ -2005,7 +2005,7 @@ BOOL WINAPI CreateSymbolicLinkW(LPCWSTR link, LPCWSTR target, DWORD flags) /************************************************************************* * CreateSymbolicLinkA (KERNEL32.@) */ -BOOL WINAPI CreateSymbolicLinkA(LPCSTR link, LPCSTR target, DWORD flags) +BOOLEAN WINAPI CreateSymbolicLinkA(LPCSTR link, LPCSTR target, DWORD flags) { FIXME("(%s %s %d): stub\n", debugstr_a(link), debugstr_a(target), flags); return TRUE; diff --git a/include/winbase.h b/include/winbase.h index 25bc593..f0cc23c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1790,8 +1790,8 @@ WINBASEAPI HANDLE WINAPI CreateSemaphoreW(LPSECURITY_ATTRIBUTES,LONG,LONG,L WINBASEAPI HANDLE WINAPI CreateSemaphoreExA(SECURITY_ATTRIBUTES*,LONG,LONG,LPCSTR,DWORD,DWORD); WINBASEAPI HANDLE WINAPI CreateSemaphoreExW(SECURITY_ATTRIBUTES*,LONG,LONG,LPCWSTR,DWORD,DWORD); #define CreateSemaphoreEx WINELIB_NAME_AW(CreateSemaphoreEx) -WINBASEAPI BOOL WINAPI CreateSymbolicLinkA(LPCSTR,LPCSTR,DWORD); -WINBASEAPI BOOL WINAPI CreateSymbolicLinkW(LPCWSTR,LPCWSTR,DWORD); +WINBASEAPI BOOLEAN WINAPI CreateSymbolicLinkA(LPCSTR,LPCSTR,DWORD); +WINBASEAPI BOOLEAN WINAPI CreateSymbolicLinkW(LPCWSTR,LPCWSTR,DWORD); #define CreateSymbolicLink WINELIB_NAME_AW(CreateSymbolicLink) WINBASEAPI BOOL WINAPI CreateHardLinkA(LPCSTR,LPCSTR,LPSECURITY_ATTRIBUTES); WINBASEAPI BOOL WINAPI CreateHardLinkW(LPCWSTR,LPCWSTR,LPSECURITY_ATTRIBUTES); @@ -2542,8 +2542,8 @@ WINBASEAPI LPVOID WINAPI TlsGetValue(DWORD); WINBASEAPI BOOL WINAPI TlsSetValue(DWORD,LPVOID); WINBASEAPI BOOL WINAPI TransactNamedPipe(HANDLE,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI TransmitCommChar(HANDLE,CHAR); -WINBASEAPI BOOL WINAPI TryAcquireSRWLockExclusive(PSRWLOCK); -WINBASEAPI BOOL WINAPI TryAcquireSRWLockShared(PSRWLOCK); +WINBASEAPI BOOLEAN WINAPI TryAcquireSRWLockExclusive(PSRWLOCK); +WINBASEAPI BOOLEAN WINAPI TryAcquireSRWLockShared(PSRWLOCK); WINBASEAPI BOOL WINAPI TryEnterCriticalSection(CRITICAL_SECTION *lpCrit); WINBASEAPI BOOL WINAPI TzSpecificLocalTimeToSystemTime(const TIME_ZONE_INFORMATION*,const SYSTEMTIME*,LPSYSTEMTIME); WINBASEAPI LONG WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS);

1 0