August 2014 - Wine-commits - list.winehq.org

Nikolay Sivov : wrc: Remove some always-true conditions (PVS-Studio).
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 08058c793f28989874661ada89264fb550fa6177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08058c793f28989874661ada8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 19 06:53:04 2014 +0400 wrc: Remove some always-true conditions (PVS-Studio). --- tools/wrc/translation.c | 98 ++++++++++++++++++------------------------------- 1 file changed, 36 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08058c793f28989874661…

1 0

Henri Verbeet : wined3d: Recognize some more AMD cards.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: df59ac1d0cae07095bc969f5c905416fc1865e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=df59ac1d0cae07095bc969f5c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 19 09:22:25 2014 +0200 wined3d: Recognize some more AMD cards. --- dlls/wined3d/directx.c | 15 +++++++++++++++ dlls/wined3d/wined3d_private.h | 7 +++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f1ba7b5..fe98bab 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1323,9 +1323,16 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6700, "AMD Radeon HD 6700 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6800, "AMD Radeon HD 6800 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6900, "AMD Radeon HD 6900 Series", DRIVER_AMD_R600, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7660D, "AMD Radeon HD 7660D", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7700, "AMD Radeon HD 7700 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7800, "AMD Radeon HD 7800 Series", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7900, "AMD Radeon HD 7900 Series", DRIVER_AMD_R600, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD8600M, "AMD Radeon HD 8600M Series", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD8670, "AMD Radeon HD 8670", DRIVER_AMD_R600, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD8770, "AMD Radeon HD 8770", DRIVER_AMD_R600, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R3, "AMD Radeon HD 8400 / R3 Series", DRIVER_AMD_R600, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R7, "AMD Radeon(TM) R7 Graphics", DRIVER_AMD_R600, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R9, "AMD Radeon R9 290", DRIVER_AMD_R600, 4096}, /* VMware */ {HW_VENDOR_VMWARE, CARD_VMWARE_SVGA3D, "VMware SVGA 3D (Microsoft Corporation - WDDM)", DRIVER_VMWARE, 1024}, @@ -1996,11 +2003,19 @@ cards_intel[] = * These are returned but not handled: RC410, RV380. */ cards_amd_mesa[] = { + /* Sea Islands */ + {"HAWAII", CARD_AMD_RADEON_R9 }, + {"KAVERI", CARD_AMD_RADEON_R7 }, + {"KABINI", CARD_AMD_RADEON_R3 }, + {"BONAIRE", CARD_AMD_RADEON_HD8770}, /* Southern Islands */ + {"OLAND", CARD_AMD_RADEON_HD8670}, + {"HAINAN", CARD_AMD_RADEON_HD8600M}, {"TAHITI", CARD_AMD_RADEON_HD7900}, {"PITCAIRN", CARD_AMD_RADEON_HD7800}, {"CAPE VERDE", CARD_AMD_RADEON_HD7700}, /* Northern Islands */ + {"ARUBA", CARD_AMD_RADEON_HD7660D}, {"CAYMAN", CARD_AMD_RADEON_HD6900}, {"BARTS", CARD_AMD_RADEON_HD6800}, {"TURKS", CARD_AMD_RADEON_HD6600}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ebe0bf8..9341b2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1413,9 +1413,16 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD6700 = 0x68ba, CARD_AMD_RADEON_HD6800 = 0x6739, CARD_AMD_RADEON_HD6900 = 0x6719, + CARD_AMD_RADEON_HD7660D = 0x9901, CARD_AMD_RADEON_HD7700 = 0x683d, CARD_AMD_RADEON_HD7800 = 0x6819, CARD_AMD_RADEON_HD7900 = 0x679a, + CARD_AMD_RADEON_HD8600M = 0x6660, + CARD_AMD_RADEON_HD8670 = 0x6610, + CARD_AMD_RADEON_HD8770 = 0x665c, + CARD_AMD_RADEON_R3 = 0x9830, + CARD_AMD_RADEON_R7 = 0x130f, + CARD_AMD_RADEON_R9 = 0x67b1, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Henri Verbeet : wined3d: Explicitly destroy the volume in texture3d_sub_resource_cleanup().
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 64a1fde181f6c26e80623e56c41f2768fc43f8fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a1fde181f6c26e80623e56c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 19 09:22:26 2014 +0200 wined3d: Explicitly destroy the volume in texture3d_sub_resource_cleanup(). The texture always has the only reference to its subresources. This also means we never have to set the container to NULL. --- dlls/wined3d/texture.c | 4 +-- dlls/wined3d/volume.c | 62 ++++++++++++------------------------------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 20 insertions(+), 48 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8beb9f8..423dec8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1064,9 +1064,7 @@ static void texture3d_sub_resource_cleanup(struct wined3d_resource *sub_resource { struct wined3d_volume *volume = volume_from_resource(sub_resource); - /* Cleanup the container. */ - volume_set_container(volume, NULL); - wined3d_volume_decref(volume); + wined3d_volume_destroy(volume); } static const struct wined3d_texture_ops texture3d_ops = diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 994cfc2..f1d09e5 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -27,13 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) -{ - TRACE("volume %p, container %p.\n", volume, container); - - volume->container = container; -} - static BOOL volume_prepare_system_memory(struct wined3d_volume *volume) { if (volume->resource.heap_memory) @@ -461,6 +454,18 @@ static void wined3d_volume_free_pbo(struct wined3d_volume *volume) context_release(context); } +void wined3d_volume_destroy(struct wined3d_volume *volume) +{ + TRACE("volume %p.\n", volume); + + if (volume->pbo) + wined3d_volume_free_pbo(volume); + + resource_cleanup(&volume->resource); + volume->resource.parent_ops->wined3d_object_destroyed(volume->resource.parent); + HeapFree(GetProcessHeap(), 0, volume); +} + static void volume_unload(struct wined3d_resource *resource) { struct wined3d_volume *volume = volume_from_resource(resource); @@ -504,46 +509,16 @@ static void volume_unload(struct wined3d_resource *resource) ULONG CDECL wined3d_volume_incref(struct wined3d_volume *volume) { - ULONG refcount; - - if (volume->container) - { - TRACE("Forwarding to container %p.\n", volume->container); - return wined3d_texture_incref(volume->container); - } - - refcount = InterlockedIncrement(&volume->resource.ref); - - TRACE("%p increasing refcount to %u.\n", volume, refcount); + TRACE("Forwarding to container %p.\n", volume->container); - return refcount; + return wined3d_texture_incref(volume->container); } ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume) { - ULONG refcount; - - if (volume->container) - { - TRACE("Forwarding to container %p.\n", volume->container); - return wined3d_texture_decref(volume->container); - } + TRACE("Forwarding to container %p.\n", volume->container); - refcount = InterlockedDecrement(&volume->resource.ref); - - TRACE("%p decreasing refcount to %u.\n", volume, refcount); - - if (!refcount) - { - if (volume->pbo) - wined3d_volume_free_pbo(volume); - - resource_cleanup(&volume->resource); - volume->resource.parent_ops->wined3d_object_destroyed(volume->resource.parent); - HeapFree(GetProcessHeap(), 0, volume); - } - - return refcount; + return wined3d_texture_decref(volume->container); } void * CDECL wined3d_volume_get_parent(const struct wined3d_volume *volume) @@ -846,7 +821,7 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_texture volume->flags |= WINED3D_VFLAG_PBO; } - volume_set_container(volume, container); + volume->container = container; return WINED3D_OK; } @@ -879,8 +854,7 @@ HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wi wined3d_texture_get_parent(container), object, &parent, &parent_ops))) { WARN("Failed to create volume parent, hr %#x.\n", hr); - volume_set_container(object, NULL); - wined3d_volume_decref(object); + wined3d_volume_destroy(object); return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9341b2f..20594e1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2188,9 +2188,9 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN; +void wined3d_volume_destroy(struct wined3d_volume *volume) DECLSPEC_HIDDEN; void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; -void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN; void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN; void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_bo_address *data) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Explicitly destroy the surface in texture2d_sub_resource_cleanup().
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: ed230a426adbc5e376f9ce7f00c2113b19f3ea59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed230a426adbc5e376f9ce7f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 19 09:22:27 2014 +0200 wined3d: Explicitly destroy the surface in texture2d_sub_resource_cleanup(). Like volumes. We can do this now because we no longer have standalone surfaces. --- dlls/wined3d/surface.c | 58 ++++++++++++------------------------------ dlls/wined3d/texture.c | 3 +-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 18 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a8fa477..d8ee07f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -103,6 +103,15 @@ static void surface_cleanup(struct wined3d_surface *surface) resource_cleanup(&surface->resource); } +void wined3d_surface_destroy(struct wined3d_surface *surface) +{ + TRACE("surface %p.\n", surface); + + surface_cleanup(surface); + surface->resource.parent_ops->wined3d_object_destroyed(surface->resource.parent); + HeapFree(GetProcessHeap(), 0, surface); +} + void surface_update_draw_binding(struct wined3d_surface *surface) { if (!surface_is_offscreen(surface) || wined3d_settings.offscreen_rendering_mode != ORM_FBO) @@ -151,14 +160,6 @@ void surface_set_swapchain(struct wined3d_surface *surface, struct wined3d_swapc surface_update_draw_binding(surface); } -void surface_set_container(struct wined3d_surface *surface, struct wined3d_texture *container) -{ - TRACE("surface %p, container %p.\n", surface, container); - - surface->container = container; - surface_update_draw_binding(surface); -} - struct blt_info { GLenum binding; @@ -2135,49 +2136,24 @@ static inline unsigned short float_32_to_16(const float *in) ULONG CDECL wined3d_surface_incref(struct wined3d_surface *surface) { - ULONG refcount; - TRACE("surface %p, swapchain %p, container %p.\n", surface, surface->swapchain, surface->container); if (surface->swapchain) return wined3d_swapchain_incref(surface->swapchain); - if (surface->container) - return wined3d_texture_incref(surface->container); - - refcount = InterlockedIncrement(&surface->resource.ref); - TRACE("%p increasing refcount to %u.\n", surface, refcount); - - return refcount; + return wined3d_texture_incref(surface->container); } ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface) { - ULONG refcount; - TRACE("surface %p, swapchain %p, container %p.\n", surface, surface->swapchain, surface->container); if (surface->swapchain) return wined3d_swapchain_decref(surface->swapchain); - if (surface->container) - return wined3d_texture_decref(surface->container); - - refcount = InterlockedDecrement(&surface->resource.ref); - TRACE("%p decreasing refcount to %u.\n", surface, refcount); - - if (!refcount) - { - surface_cleanup(surface); - surface->resource.parent_ops->wined3d_object_destroyed(surface->resource.parent); - - TRACE("Destroyed surface %p.\n", surface); - HeapFree(GetProcessHeap(), 0, surface); - } - - return refcount; + return wined3d_texture_decref(surface->container); } void CDECL wined3d_surface_preload(struct wined3d_surface *surface) @@ -6016,7 +5992,8 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text return hr; } - surface_set_container(surface, container); + surface->container = container; + surface_update_draw_binding(surface); surface_validate_location(surface, WINED3D_LOCATION_SYSMEM); list_init(&surface->renderbuffers); list_init(&surface->overlays); @@ -6036,11 +6013,9 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text surface->texture_level = level; /* Call the private setup routine */ - hr = surface->surface_ops->surface_private_setup(surface); - if (FAILED(hr)) + if (FAILED(hr = surface->surface_ops->surface_private_setup(surface))) { - ERR("Private setup failed, returning %#x\n", hr); - surface_set_container(surface, NULL); + ERR("Private setup failed, hr %#x.\n", hr); surface_cleanup(surface); return hr; } @@ -6091,8 +6066,7 @@ HRESULT wined3d_surface_create(struct wined3d_texture *container, const struct w wined3d_texture_get_parent(container), object, &parent, &parent_ops))) { WARN("Failed to create surface parent, hr %#x.\n", hr); - surface_set_container(object, NULL); - wined3d_surface_decref(object); + wined3d_surface_destroy(object); return hr; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 423dec8..392f84d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -742,8 +742,7 @@ static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource { struct wined3d_surface *surface = surface_from_resource(sub_resource); - surface_set_container(surface, NULL); - wined3d_surface_decref(surface); + wined3d_surface_destroy(surface); } static const struct wined3d_texture_ops texture2d_ops = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 20594e1..4c79ddb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2303,7 +2303,6 @@ void surface_prepare_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) DECLSPEC_HIDDEN; -void surface_set_container(struct wined3d_surface *surface, struct wined3d_texture *container) DECLSPEC_HIDDEN; void surface_set_swapchain(struct wined3d_surface *surface, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, GLint level) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; @@ -2313,6 +2312,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; HRESULT wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, GLenum target, GLint level, DWORD flags, struct wined3d_surface **surface) DECLSPEC_HIDDEN; +void wined3d_surface_destroy(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_prepare_map_memory(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context,

1 0

Henri Verbeet : wined3d: Move the "map_binding" field from struct wined3d_surface to struct wined3d_resource.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 694cdcc41cc74eff8c1d96ac0e18895862b22476 URL: http://source.winehq.org/git/wine.git/?a=commit;h=694cdcc41cc74eff8c1d96ac0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 19 09:22:28 2014 +0200 wined3d: Move the "map_binding" field from struct wined3d_surface to struct wined3d_resource. Like "draw_binding". --- dlls/wined3d/surface.c | 74 +++++++++++++++++++++--------------------- dlls/wined3d/texture.c | 4 +-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 40 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=694cdcc41cc74eff8c1d9…

1 0

Henri Verbeet : wined3d: Replace surface_is_offscreen() with wined3d_resource_is_offscreen().
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: f753ff90be2d9dfd0a21af4df3de843f64bc44f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f753ff90be2d9dfd0a21af4df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 19 09:22:29 2014 +0200 wined3d: Replace surface_is_offscreen() with wined3d_resource_is_offscreen(). Introducing rendertarget views will (eventually) allow rendering to 3D textures and buffers. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/context.c | 8 +++---- dlls/wined3d/resource.c | 24 ++++++++++++++++++++ dlls/wined3d/surface.c | 47 ++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 5 ++--- 5 files changed, 46 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f753ff90be2d9dfd0a21a…

1 0

Piotr Caban : oleaut32: Add support for VAR_TIMEVALUEONLY and VAR_DATEVALUEONLY flags in VarDateFromUdateEx.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: fc6ec997e2dcc96a8e68f1ba6df61e3cbc69e8df URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc6ec997e2dcc96a8e68f1ba6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 19 11:55:14 2014 +0200 oleaut32: Add support for VAR_TIMEVALUEONLY and VAR_DATEVALUEONLY flags in VarDateFromUdateEx. --- dlls/oleaut32/tests/vartest.c | 6 ++++++ dlls/oleaut32/variant.c | 21 +++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 6acd4e2..224dad3 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1934,6 +1934,12 @@ static void test_VarDateFromUdate(void) /* for DATE values 0.0 < x < 1.0, x and -x represent the same datetime */ /* but when converting to DATE, prefer the positive versions */ UD2T(30,12,1899,6,0,0,0,6,364,0,S_OK,0.25); + + UD2T(1,1,1980,18,1,16,0,2,1,VAR_TIMEVALUEONLY,S_OK,0.7508796296296296); + UD2T(1,1,1980,18,1,16,0,2,1,VAR_DATEVALUEONLY,S_OK,29221.0); + UD2T(25,12,1899,6,0,0,0,1,359,VAR_TIMEVALUEONLY,S_OK,0.25); + UD2T(25,12,1899,6,0,0,0,1,359,VAR_DATEVALUEONLY,S_OK,-5.0); + UD2T(1,-1,1980,18,1,16,0,0,0,VAR_TIMEVALUEONLY|VAR_DATEVALUEONLY,S_OK,0.7508796296296296); } static void test_st2dt(int line, WORD d, WORD m, WORD y, WORD h, WORD mn, diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index a00e16f..e391a90 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1350,7 +1350,7 @@ INT WINAPI VariantTimeToSystemTime(double dateIn, LPSYSTEMTIME lpSt) HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DATE *pDateOut) { UDATE ud; - double dateVal, dateSign; + double dateVal = 0; TRACE("(%p->%d/%d/%d %d:%d:%d:%d %d %d,0x%08x,0x%08x,%p)\n", pUdateIn, pUdateIn->st.wMonth, pUdateIn->st.wDay, pUdateIn->st.wYear, @@ -1360,6 +1360,8 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT if (lcid != MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)) FIXME("lcid possibly not handled, treating as en-us\n"); + if (dwFlags & ~(VAR_TIMEVALUEONLY|VAR_DATEVALUEONLY)) + FIXME("unsupported flags: %x\n", dwFlags); ud = *pUdateIn; @@ -1370,15 +1372,18 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT return E_INVALIDARG; /* Date */ - dateVal = VARIANT_DateFromJulian(VARIANT_JulianFromDMY(ud.st.wYear, ud.st.wMonth, ud.st.wDay)); + if (!(dwFlags & VAR_TIMEVALUEONLY)) + dateVal = VARIANT_DateFromJulian(VARIANT_JulianFromDMY(ud.st.wYear, ud.st.wMonth, ud.st.wDay)); - /* Sign */ - dateSign = (dateVal < 0.0) ? -1.0 : 1.0; + if ((dwFlags & VAR_TIMEVALUEONLY) || !(dwFlags & VAR_DATEVALUEONLY)) + { + double dateSign = (dateVal < 0.0) ? -1.0 : 1.0; - /* Time */ - dateVal += ud.st.wHour / 24.0 * dateSign; - dateVal += ud.st.wMinute / 1440.0 * dateSign; - dateVal += ud.st.wSecond / 86400.0 * dateSign; + /* Time */ + dateVal += ud.st.wHour / 24.0 * dateSign; + dateVal += ud.st.wMinute / 1440.0 * dateSign; + dateVal += ud.st.wSecond / 86400.0 * dateSign; + } TRACE("Returning %g\n", dateVal); *pDateOut = dateVal;

1 0

Francois Gouget : rsaenh/tests: Add a trailing '\n' to some ok() calls.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: 37456407901300798367bf67ecd65301d4514c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37456407901300798367bf67e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 19 00:25:49 2014 +0200 rsaenh/tests: Add a trailing '\n' to some ok() calls. --- dlls/rsaenh/tests/rsaenh.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 41b51c1..5192c2f 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1536,10 +1536,10 @@ static void test_rc2(void) dwLen = sizeof(dwKeyLen); result = CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); - ok(result, "%08x", GetLastError()); + ok(result, "%08x\n", GetLastError()); ok(dwKeyLen == 56, "%d (%08x)\n", dwKeyLen, GetLastError()); result = CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); - ok(result, "%08x", GetLastError()); + ok(result, "%08x\n", GetLastError()); ok(dwKeyLen == 56 || broken(dwKeyLen == 40), "%d (%08x)\n", dwKeyLen, GetLastError()); dwKeyLen = 128; @@ -1550,7 +1550,7 @@ static void test_rc2(void) dwKeyLen = 12345; ok(result, "expected success, got error 0x%08X\n", GetLastError()); result = CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); - ok(result, "%08x", GetLastError()); + ok(result, "%08x\n", GetLastError()); ok(dwKeyLen == 128, "Expected 128, got %d\n", dwKeyLen); } else @@ -1558,16 +1558,16 @@ static void test_rc2(void) ok(!result, "expected error\n"); ok(GetLastError() == NTE_BAD_DATA, "Expected 0x80009005, got 0x%08X\n", GetLastError()); result = CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); - ok(result, "%08x", GetLastError()); + ok(result, "%08x\n", GetLastError()); ok(dwKeyLen == 40, "Expected 40, got %d\n", dwKeyLen); } dwLen = sizeof(dwKeyLen); result = CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); - ok(result, "%08x", GetLastError()); + ok(result, "%08x\n", GetLastError()); ok(dwKeyLen == 56, "%d (%08x)\n", dwKeyLen, GetLastError()); result = CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); - ok(result, "%08x", GetLastError()); + ok(result, "%08x\n", GetLastError()); ok((!BASE_PROV && dwKeyLen == 128) || (BASE_PROV && dwKeyLen == 40), "%d (%08x)\n", dwKeyLen, GetLastError());

1 0

Francois Gouget : shell32/tests: Add a trailing '\n' to a couple of win_skip() calls.
by Alexandre Julliard 19 Aug '14

19 Aug '14

Module: wine Branch: master Commit: c1d592876af9a51a3ff3540595f1571c558ffb02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d592876af9a51a3ff354059… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 19 00:26:15 2014 +0200 shell32/tests: Add a trailing '\n' to a couple of win_skip() calls. --- dlls/shell32/tests/shlfolder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index a583d49..fc37443 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3739,7 +3739,7 @@ static void test_ShellItemArrayEnumItems(void) if(!pSHCreateShellItemArray) { - win_skip("No SHCreateShellItemArray, skipping test.."); + win_skip("No SHCreateShellItemArray, skipping test...\n"); return; } @@ -4157,7 +4157,7 @@ static void test_ShellItemArrayGetAttributes(void) if(!pSHCreateShellItemArrayFromShellItem) { - win_skip("No SHCreateShellItemArrayFromShellItem, skipping test.."); + win_skip("No SHCreateShellItemArrayFromShellItem, skipping test...\n"); return; }

1 0

Zhenbo Li : mshtml/tests: Fix test_tr_modify().
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 9ee4b8b0789716e61efce0f8c83b993a10819542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee4b8b0789716e61efce0f8c… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Aug 18 16:55:34 2014 +0800 mshtml/tests: Fix test_tr_modify(). --- dlls/mshtml/tests/dom.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 33645c8..dddb28c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5801,7 +5801,7 @@ static void test_tr_modify(IHTMLElement *elem, IHTMLTableRow *row) { HRESULT hres; IDispatch *disp; - IUnknown *unk; + IHTMLTableCell *cell; hres = IHTMLTableRow_deleteCell(row, 0); ok(hres == S_OK, "deleteCell failed: %08x\n", hres); @@ -5810,10 +5810,11 @@ static void test_tr_modify(IHTMLElement *elem, IHTMLTableRow *row) hres = IHTMLTableRow_insertCell(row, 0, &disp); ok(hres == S_OK, "insertCell failed: %08x\n", hres); ok(disp != NULL, "disp == NULL\n"); - hres = IDispatch_QueryInterface(disp, &IID_IHTMLTableCell, (void **)&unk); + hres = IDispatch_QueryInterface(disp, &IID_IHTMLTableCell, (void **)&cell); ok(hres == S_OK, "Could not get IID_IHTMLTableCell interface: %08x\n", hres); + ok(cell != NULL, "cell == NULL\n"); if (SUCCEEDED(hres)) - IUnknown_Release(unk); + IHTMLTableCell_Release(cell); test_tr_possess(elem, row, 2, "td2"); IDispatch_Release(disp); }

1 0