wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Riccardo Bortolato : wined3d: Don' t pass a wined3d_volume to device_volume_created callback anymore.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 33bb9e96109cda4709a55603f1244d011e3c2b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33bb9e96109cda4709a55603f… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 7 19:04:34 2015 +0200 wined3d: Don't pass a wined3d_volume to device_volume_created callback anymore. 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/d3d11/device.c | 6 +++--- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 8 ++++---- dlls/ddraw/ddraw.c | 6 +++--- dlls/wined3d/volume.c | 2 +- include/wine/wined3d.h | 3 +-- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5384387..4939883 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2966,11 +2966,11 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent } static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_volume *volume, void **parent, + struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, void **parent, const struct wined3d_parent_ops **parent_ops) { - TRACE("device_parent %p, texture %p, sub_resource_idx %u, volume %p, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, volume, parent, parent_ops); + TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", + device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); *parent = NULL; *parent_ops = &d3d10_null_wined3d_parent_ops; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 818f601..e9583fc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3019,12 +3019,12 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, - struct wined3d_volume *volume, void **parent, const struct wined3d_parent_ops **parent_ops) + void **parent, const struct wined3d_parent_ops **parent_ops) { struct d3d8_volume *d3d_volume; - TRACE("device_parent %p, texture %p, sub_resource_idx %u, volume %p, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, volume, parent, parent_ops); + TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", + device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) return E_OUTOFMEMORY; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 35abb13..656bf4b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3553,13 +3553,13 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent } static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_volume *volume, void **parent, - const struct wined3d_parent_ops **parent_ops) + struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, + void **parent, const struct wined3d_parent_ops **parent_ops) { struct d3d9_volume *d3d_volume; - TRACE("device_parent %p, texture %p, sub_resource_idx %u, volume %p, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, volume, parent, parent_ops); + TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", + device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) return E_OUTOFMEMORY; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index aef9963..21f8038 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4746,11 +4746,11 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent } static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_volume *volume, + struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, void **parent, const struct wined3d_parent_ops **parent_ops) { - TRACE("device_parent %p, texture %p, sub_resource_idx %u, volume %p, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, volume, parent, parent_ops); + TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", + device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); *parent = NULL; *parent_ops = &ddraw_null_wined3d_parent_ops; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index ef5a999..6a7cc5c 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -784,7 +784,7 @@ HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wi } if (FAILED(hr = device_parent->ops->volume_created(device_parent, - container, level, object, &parent, &parent_ops))) + container, level, &parent, &parent_ops))) { WARN("Failed to create volume parent, hr %#x.\n", hr); wined3d_volume_destroy(object); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a354308..4579e02 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2018,7 +2018,6 @@ struct wined3d_surface; struct wined3d_swapchain; struct wined3d_texture; struct wined3d_vertex_declaration; -struct wined3d_volume; struct wined3d_device_parent { @@ -2034,7 +2033,7 @@ struct wined3d_device_parent_ops struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops); HRESULT (__cdecl *volume_created)(struct wined3d_device_parent *device_parent, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, - struct wined3d_volume *volume, void **parent, const struct wined3d_parent_ops **parent_ops); + void **parent, const struct wined3d_parent_ops **parent_ops); HRESULT (__cdecl *create_swapchain_texture)(struct wined3d_device_parent *device_parent, void *parent, const struct wined3d_resource_desc *desc, struct wined3d_texture **texture); HRESULT (__cdecl *create_swapchain)(struct wined3d_device_parent *device_parent,

1 0

Riccardo Bortolato : d3d9: Don' t use a wined3d_volume in d3d9_volume_GetDesc.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: fca636a01cfd1ef213326125582139bdd72a287a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca636a01cfd1ef2133261255… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 7 19:04:33 2015 +0200 d3d9: Don't use a wined3d_volume in d3d9_volume_GetDesc. finally removed the wind3d_volume pointer from d3d9_volume. Also removed wined3d_volume_get_resource. 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/d3d9/d3d9_private.h | 3 +-- dlls/d3d9/device.c | 2 +- dlls/d3d9/volume.c | 9 ++++----- dlls/wined3d/volume.c | 7 ------- dlls/wined3d/wined3d.spec | 2 -- include/wine/wined3d.h | 2 -- 6 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 28db978..ea0d3e6 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -193,12 +193,11 @@ struct d3d9_volume struct d3d9_resource resource; struct wined3d_texture *wined3d_texture; unsigned int sub_resource_idx; - struct wined3d_volume *wined3d_volume; struct d3d9_texture *texture; }; void volume_init(struct d3d9_volume *volume, struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, struct wined3d_volume *wined3d_volume, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d9_swapchain { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5568cc8..35abb13 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3564,7 +3564,7 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent * if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) return E_OUTOFMEMORY; - volume_init(d3d_volume, wined3d_texture, sub_resource_idx, volume, parent_ops); + volume_init(d3d_volume, wined3d_texture, sub_resource_idx, parent_ops); *parent = d3d_volume; TRACE("Created volume %p.\n", d3d_volume); diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index dde8980..ca72f99 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -117,13 +117,13 @@ static HRESULT WINAPI d3d9_volume_GetDesc(IDirect3DVolume9 *iface, D3DVOLUME_DES { struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface); struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *wined3d_resource; + struct wined3d_resource *sub_resource; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - wined3d_resource = wined3d_volume_get_resource(volume->wined3d_volume); - wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); + sub_resource = wined3d_texture_get_sub_resource(volume->wined3d_texture, volume->sub_resource_idx); + wined3d_resource_get_desc(sub_resource, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); @@ -203,12 +203,11 @@ static const struct wined3d_parent_ops d3d9_volume_wined3d_parent_ops = }; void volume_init(struct d3d9_volume *volume, struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, struct wined3d_volume *wined3d_volume, const struct wined3d_parent_ops **parent_ops) + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) { volume->IDirect3DVolume9_iface.lpVtbl = &d3d9_volume_vtbl; d3d9_resource_init(&volume->resource); volume->resource.refcount = 0; - volume->wined3d_volume = wined3d_volume; volume->texture = wined3d_texture_get_parent(wined3d_texture); volume->wined3d_texture = wined3d_texture; volume->sub_resource_idx = sub_resource_idx; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 608f0c0..ef5a999 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -474,13 +474,6 @@ static ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume) return wined3d_texture_decref(volume->container); } -struct wined3d_resource * CDECL wined3d_volume_get_resource(struct wined3d_volume *volume) -{ - TRACE("volume %p.\n", volume); - - return &volume->resource; -} - static BOOL volume_check_block_align(const struct wined3d_volume *volume, const struct wined3d_box *box) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0efa91c..c4ebd35 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -282,5 +282,3 @@ @ cdecl wined3d_vertex_declaration_decref(ptr) @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) - -@ cdecl wined3d_volume_get_resource(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7422545..a354308 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2568,8 +2568,6 @@ ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaratio void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex_declaration *declaration); ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration *declaration); -struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); - /* Return the integer base-2 logarithm of x. Undefined for x == 0. */ static inline unsigned int wined3d_log2i(unsigned int x) {

1 0

Riccardo Bortolato : d3d9: Make use of wined3d_texture_unmap in d3d9_volume_UnlockBox.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 8dd86823fdd9a5e631cf3173727b6f667ef1b611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd86823fdd9a5e631cf31737… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 7 19:04:32 2015 +0200 d3d9: Make use of wined3d_texture_unmap in d3d9_volume_UnlockBox. Also removed wined3d_volume_unmap from wined3d public api. 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/d3d9/volume.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 - 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 25c2c2c..dde8980 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -167,7 +167,7 @@ static HRESULT WINAPI d3d9_volume_UnlockBox(IDirect3DVolume9 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_volume_unmap(volume->wined3d_volume); + hr = wined3d_texture_unmap(volume->wined3d_texture, volume->sub_resource_idx); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 743f2dd..608f0c0 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -676,7 +676,7 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume, return WINED3D_OK; } -HRESULT CDECL wined3d_volume_unmap(struct wined3d_volume *volume) +HRESULT wined3d_volume_unmap(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 5406ce0..0efa91c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -284,4 +284,3 @@ @ cdecl wined3d_vertex_declaration_incref(ptr) @ cdecl wined3d_volume_get_resource(ptr) -@ cdecl wined3d_volume_unmap(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e2ee844..d75761e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2344,6 +2344,7 @@ void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD loc HRESULT wined3d_volume_map(struct wined3d_volume *volume, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) DECLSPEC_HIDDEN; void wined3d_volume_validate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN; +HRESULT wined3d_volume_unmap(struct wined3d_volume *volume) DECLSPEC_HIDDEN; void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b8f6001..7422545 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2569,7 +2569,6 @@ void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration *declaration); struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); -HRESULT __cdecl wined3d_volume_unmap(struct wined3d_volume *volume); /* Return the integer base-2 logarithm of x. Undefined for x == 0. */ static inline unsigned int wined3d_log2i(unsigned int x)

1 0

Riccardo Bortolato : d3d9: Make use of wined3d_texture_map in d3d9_volume_LockBox.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: b9cc2859fe21ab82f3bdf77002d9509021037f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9cc2859fe21ab82f3bdf7700… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 7 19:04:31 2015 +0200 d3d9: Make use of wined3d_texture_map in d3d9_volume_LockBox. Also removed wined3d_volume_map from wined3d public api. 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/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/volume.c | 5 ++++- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d.h | 2 -- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index a1b824b..28db978 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -191,6 +191,8 @@ struct d3d9_volume { IDirect3DVolume9 IDirect3DVolume9_iface; struct d3d9_resource resource; + struct wined3d_texture *wined3d_texture; + unsigned int sub_resource_idx; struct wined3d_volume *wined3d_volume; struct d3d9_texture *texture; }; diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 603fb6e..25c2c2c 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -148,7 +148,8 @@ static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface, iface, locked_box, box, flags); wined3d_mutex_lock(); - hr = wined3d_volume_map(volume->wined3d_volume, &map_desc, (const struct wined3d_box *)box, flags); + hr = wined3d_texture_map(volume->wined3d_texture, volume->sub_resource_idx, + &map_desc, (const struct wined3d_box *)box, flags); wined3d_mutex_unlock(); locked_box->RowPitch = map_desc.row_pitch; @@ -209,6 +210,8 @@ void volume_init(struct d3d9_volume *volume, struct wined3d_texture *wined3d_tex volume->resource.refcount = 0; volume->wined3d_volume = wined3d_volume; volume->texture = wined3d_texture_get_parent(wined3d_texture); + volume->wined3d_texture = wined3d_texture; + volume->sub_resource_idx = sub_resource_idx; *parent_ops = &d3d9_volume_wined3d_parent_ops; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 099927c..743f2dd 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -531,7 +531,7 @@ static BOOL wined3d_volume_check_box_dimensions(const struct wined3d_volume *vol return TRUE; } -HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, +HRESULT wined3d_volume_map(struct wined3d_volume *volume, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { struct wined3d_device *device = volume->resource.device; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index dbe078f..5406ce0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -284,5 +284,4 @@ @ cdecl wined3d_vertex_declaration_incref(ptr) @ cdecl wined3d_volume_get_resource(ptr) -@ cdecl wined3d_volume_map(ptr ptr ptr long) @ cdecl wined3d_volume_unmap(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3071726..e2ee844 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2341,6 +2341,8 @@ void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pit void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN; +HRESULT wined3d_volume_map(struct wined3d_volume *volume, + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) DECLSPEC_HIDDEN; void wined3d_volume_validate_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_const_bo_address *data) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c9448df..b8f6001 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2569,8 +2569,6 @@ void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration *declaration); struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); -HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); HRESULT __cdecl wined3d_volume_unmap(struct wined3d_volume *volume); /* Return the integer base-2 logarithm of x. Undefined for x == 0. */

1 0

Sebastian Lackner : ntdll/tests: Add tests for calling NtReadFile/ NtWriteFile on directory.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: b8315e87f18cc8c29aa13ea88ee12a1e0be5587f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8315e87f18cc8c29aa13ea88… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 8 07:25:27 2015 +0200 ntdll/tests: Add tests for calling NtReadFile/NtWriteFile on directory. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 1afb9c8..b8f1847 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -177,6 +177,7 @@ static void create_file_test(void) static const WCHAR pathInvalidNtW[] = {'\\','\\','?','\\',0}; static const WCHAR pathInvalidNt2W[] = {'\\','?','?','\\',0}; static const WCHAR pathInvalidDosW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\',0}; + static const char testdata[] = "Hello World"; FILE_NETWORK_OPEN_INFORMATION info; NTSTATUS status; HANDLE dir, file; @@ -184,6 +185,9 @@ static void create_file_test(void) OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; UNICODE_STRING nameW; + LARGE_INTEGER offset; + char buf[32]; + DWORD ret; GetCurrentDirectoryW( MAX_PATH, path ); pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); @@ -195,9 +199,36 @@ static void create_file_test(void) attr.SecurityQualityOfService = NULL; /* try various open modes and options on directories */ - status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, - FILE_OPEN, FILE_DIRECTORY_FILE, NULL, 0 ); + status = pNtCreateFile( &dir, GENERIC_READ|GENERIC_WRITE, &attr, &io, NULL, 0, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_DIRECTORY_FILE, NULL, 0 ); ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + U(io).Status = 0xdeadbeef; + offset.QuadPart = 0; + status = pNtReadFile( dir, NULL, NULL, NULL, &io, buf, sizeof(buf), &offset, NULL ); + todo_wine + ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtReadFile error %08x\n", status ); + if (status == STATUS_PENDING) + { + ret = WaitForSingleObject( dir, 1000 ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject error %u\n", ret ); + ok( U(io).Status == STATUS_INVALID_DEVICE_REQUEST, + "expected STATUS_INVALID_DEVICE_REQUEST, got %08x\n", U(io).Status ); + } + + U(io).Status = 0xdeadbeef; + offset.QuadPart = 0; + status = pNtWriteFile( dir, NULL, NULL, NULL, &io, testdata, sizeof(testdata), &offset, NULL); + todo_wine + ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtWriteFile error %08x\n", status ); + if (status == STATUS_PENDING) + { + ret = WaitForSingleObject( dir, 1000 ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject error %u\n", ret ); + ok( U(io).Status == STATUS_INVALID_DEVICE_REQUEST, + "expected STATUS_INVALID_DEVICE_REQUEST, got %08x\n", U(io).Status ); + } + CloseHandle( dir ); status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE,

1 0

Iván Matellanes : msvcirt: Improve implementation of streambuf::pbackfail.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: b34b65e462af459b40821f9b2629b0c7d2c1300b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34b65e462af459b40821f9b2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 7 22:19:32 2015 +0100 msvcirt: Improve implementation of streambuf::pbackfail. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 35 +++++++++++------- dlls/msvcirt/tests/msvcirt.c | 88 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b34b65e462af459b40821…

1 0

Iván Matellanes : msvcirt: Implement stdiobuf:: seekoff.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 6aa589e85444a9a4d5c3141516e03222ef97c9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa589e85444a9a4d5c314151… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 7 22:19:31 2015 +0100 msvcirt: Implement stdiobuf::seekoff. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 7 ++++-- dlls/msvcirt/tests/msvcirt.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 1eefe73..bfef1a3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1571,8 +1571,11 @@ int __thiscall stdiobuf_pbackfail(stdiobuf *this, int c) DEFINE_THISCALL_WRAPPER(stdiobuf_seekoff, 16) streampos __thiscall stdiobuf_seekoff(stdiobuf *this, streamoff offset, ios_seek_dir dir, int mode) { - FIXME("(%p %d %d %d) stub\n", this, offset, dir, mode); - return EOF; + TRACE("(%p %d %d %d)\n", this, offset, dir, mode); + call_streambuf_overflow(&this->base, EOF); + if (fseek(this->file, offset, dir)) + return EOF; + return ftell(this->file); } /* ?setrwbuf@stdiobuf@@QAEHHH@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 758062c..704a6c2 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -210,6 +210,7 @@ static int (*__thiscall p_strstreambuf_underflow)(strstreambuf*); static stdiobuf* (*__thiscall p_stdiobuf_file_ctor)(stdiobuf*, FILE*); static void (*__thiscall p_stdiobuf_dtor)(stdiobuf*); static int (*__thiscall p_stdiobuf_overflow)(stdiobuf*, int); +static streampos (*__thiscall p_stdiobuf_seekoff)(stdiobuf*, streamoff, ios_seek_dir, int); static int (*__thiscall p_stdiobuf_setrwbuf)(stdiobuf*, int, int); static int (*__thiscall p_stdiobuf_sync)(stdiobuf*); static int (*__thiscall p_stdiobuf_underflow)(stdiobuf*); @@ -375,6 +376,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QEAA@PEAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UEAA@XZ"); SET(p_stdiobuf_overflow, "?overflow@stdiobuf@@UEAAHH@Z"); + SET(p_stdiobuf_seekoff, "?seekoff@stdiobuf@@UEAAJJW4seek_dir@ios@@H@Z"); SET(p_stdiobuf_setrwbuf, "?setrwbuf@stdiobuf@@QEAAHHH@Z"); SET(p_stdiobuf_sync, "?sync@stdiobuf@@UEAAHXZ"); SET(p_stdiobuf_underflow, "?underflow@stdiobuf@@UEAAHXZ"); @@ -460,6 +462,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QAE@PAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UAE@XZ"); SET(p_stdiobuf_overflow, "?overflow@stdiobuf@@UAEHH@Z"); + SET(p_stdiobuf_seekoff, "?seekoff@stdiobuf@@UAEJJW4seek_dir@ios@@H@Z"); SET(p_stdiobuf_setrwbuf, "?setrwbuf@stdiobuf@@QAEHHH@Z"); SET(p_stdiobuf_sync, "?sync@stdiobuf@@UAEHXZ"); SET(p_stdiobuf_underflow, "?underflow@stdiobuf@@UAEHXZ"); @@ -2048,6 +2051,63 @@ static void test_stdiobuf(void) ok(ret == 0, "expected 0 got %d\n", ret); ok(stb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", stb1.base.unbuffered); + /* seekoff */ + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 0, SEEKDIR_beg, OPENMODE_in); + ok(ret == 0, "expected 0 got %d\n", ret); + stb1.base.unbuffered = 0; + ret = (int) call_func3(p_streambuf_xsputn, &stb1.base, "Never gonna say goodbye", 22); + ok(ret == 22, "expected 22 got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 5, SEEKDIR_beg, OPENMODE_in); + ok(ret == 5, "expected 5 got %d\n", ret); + ok(stb1.base.pptr == stb1.base.pbase + 22, "wrong put pointer, expected %p got %p\n", stb1.base.pbase + 22, stb1.base.pptr); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 300, SEEKDIR_beg, OPENMODE_in); + ok(ret == 300, "expected 300 got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, -310, SEEKDIR_cur, OPENMODE_in); + ok(ret == EOF, "expected EOF got %d\n", ret); + stb1.base.eback = stb1.base.base; + stb1.base.gptr = stb1.base.egptr = stb1.base.pbase = stb1.base.base + 10; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, -280, SEEKDIR_cur, OPENMODE_in); + ok(ret == 20, "expected 20 got %d\n", ret); + stb1.base.gptr = stb1.base.eback; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 80, SEEKDIR_cur, OPENMODE_in); + ok(ret == 100, "expected 100 got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 0, SEEKDIR_end, OPENMODE_in); + ok(ret == 49, "expected 49 got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 1, SEEKDIR_end, OPENMODE_in); + ok(ret == 50, "expected 50 got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, -60, SEEKDIR_end, OPENMODE_in); + ok(ret == EOF, "expected EOF got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, -20, SEEKDIR_end, OPENMODE_out); + ok(ret == 29, "expected 29 got %d\n", ret); + stb1.base.eback = stb1.base.gptr = stb1.base.egptr = NULL; + stb1.base.pptr = stb1.base.pbase; + stb1.base.unbuffered = 1; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, 0, SEEKDIR_beg, OPENMODE_in); + ok(ret == 0, "expected 0 got %d\n", ret); + stb2.base.pptr += 10; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, 20, SEEKDIR_beg, OPENMODE_in); + ok(ret == 20, "expected 20 got %d\n", ret); + ok(stb2.base.pptr == stb2.base.pbase + 10, "wrong put pointer, expected %p got %p\n", stb2.base.pbase + 10, stb2.base.pptr); + stb2.base.unbuffered = 0; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, 10, SEEKDIR_cur, OPENMODE_in); + ok(ret == 40, "expected 40 got %d\n", ret); + ok(stb2.base.pptr == stb2.base.pbase, "wrong put pointer, expected %p got %p\n", stb2.base.pbase, stb2.base.pptr); + stb2.base.gptr = stb2.base.eback; + stb2.base.pptr += 5; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, -50, SEEKDIR_cur, OPENMODE_in|OPENMODE_out); + ok(ret == EOF, "expected EOF got %d\n", ret); + ok(stb2.base.pptr == stb2.base.pbase, "wrong put pointer, expected %p got %p\n", stb2.base.pbase, stb2.base.pptr); + stb2.base.pbase = stb2.base.pptr = stb2.base.epptr = NULL; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, 0, SEEKDIR_end, OPENMODE_in|OPENMODE_out); + ok(ret == 48, "expected 48 got %d\n", ret); + ok(stb2.base.pbase == stb2.base.base + 32, "wrong put pointer, expected %p got %p\n", stb2.base.base + 32, stb2.base.pbase); + ok(stb2.base.pptr == stb2.base.base + 32, "wrong put pointer, expected %p got %p\n", stb2.base.base + 32, stb2.base.pptr); + ok(stb2.base.epptr == stb2.base.ebuf, "wrong put pointer, expected %p got %p\n", stb2.base.ebuf, stb2.base.epptr); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, -28, SEEKDIR_end, -1); + ok(ret == 20, "expected 20 got %d\n", ret); + stb2.base.gptr = stb2.base.egptr; + stb2.base.unbuffered = 1; + call_func1(p_stdiobuf_dtor, &stb1); call_func1(p_stdiobuf_dtor, &stb2); fclose(file1);

1 0

Iván Matellanes : msvcirt: Implement stdiobuf:: setrwbuf.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 66ff2e3bad1d0b6e011381afc598f5b92fb9f0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ff2e3bad1d0b6e011381afc… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 7 22:19:30 2015 +0100 msvcirt: Implement stdiobuf::setrwbuf. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 28 ++++++++++++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 1d915fa..1eefe73 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1580,8 +1580,32 @@ streampos __thiscall stdiobuf_seekoff(stdiobuf *this, streamoff offset, ios_seek DEFINE_THISCALL_WRAPPER(stdiobuf_setrwbuf, 12) int __thiscall stdiobuf_setrwbuf(stdiobuf *this, int read_size, int write_size) { - FIXME("(%p %d %d) stub\n", this, read_size, write_size); - return EOF; + char *reserve; + int buffer_size = read_size + write_size; + + TRACE("(%p %d %d)\n", this, read_size, write_size); + if (read_size < 0 || write_size < 0) + return 0; + if (!buffer_size) { + this->base.unbuffered = 1; + return 0; + } + /* get a new buffer */ + reserve = MSVCRT_operator_new(buffer_size); + if (!reserve) + return 0; + streambuf_setb(&this->base, reserve, reserve + buffer_size, 1); + this->base.unbuffered = 0; + /* set the get/put areas */ + if (read_size > 0) + streambuf_setg(&this->base, reserve, reserve + read_size, reserve + read_size); + else + streambuf_setg(&this->base, NULL, NULL, NULL); + if (write_size > 0) + streambuf_setp(&this->base, reserve + read_size, reserve + buffer_size); + else + streambuf_setp(&this->base, NULL, NULL); + return 1; } /* ?stdiofile@stdiobuf@@QAEPAU_iobuf@@XZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 8bc45c1..758062c 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -210,6 +210,7 @@ static int (*__thiscall p_strstreambuf_underflow)(strstreambuf*); static stdiobuf* (*__thiscall p_stdiobuf_file_ctor)(stdiobuf*, FILE*); static void (*__thiscall p_stdiobuf_dtor)(stdiobuf*); static int (*__thiscall p_stdiobuf_overflow)(stdiobuf*, int); +static int (*__thiscall p_stdiobuf_setrwbuf)(stdiobuf*, int, int); static int (*__thiscall p_stdiobuf_sync)(stdiobuf*); static int (*__thiscall p_stdiobuf_underflow)(stdiobuf*); @@ -374,6 +375,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QEAA@PEAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UEAA@XZ"); SET(p_stdiobuf_overflow, "?overflow@stdiobuf@@UEAAHH@Z"); + SET(p_stdiobuf_setrwbuf, "?setrwbuf@stdiobuf@@QEAAHHH@Z"); SET(p_stdiobuf_sync, "?sync@stdiobuf@@UEAAHXZ"); SET(p_stdiobuf_underflow, "?underflow@stdiobuf@@UEAAHXZ"); @@ -458,6 +460,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QAE@PAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UAE@XZ"); SET(p_stdiobuf_overflow, "?overflow@stdiobuf@@UAEHH@Z"); + SET(p_stdiobuf_setrwbuf, "?setrwbuf@stdiobuf@@QAEHHH@Z"); SET(p_stdiobuf_sync, "?sync@stdiobuf@@UAEHXZ"); SET(p_stdiobuf_underflow, "?underflow@stdiobuf@@UAEHXZ"); @@ -2016,6 +2019,35 @@ static void test_stdiobuf(void) ok(stb2.base.gptr == stb2.base.egptr, "wrong get pointer, expected %p got %p\n", stb2.base.egptr, stb2.base.gptr); stb2.base.unbuffered = 1; + /* setrwbuf */ + ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, 100, 60); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(stb1.base.allocated == 1, "wrong allocate value, expected 1 got %d\n", stb1.base.allocated); + ok(stb1.base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", stb1.base.unbuffered); + ok(stb1.base.ebuf == stb1.base.base + 160, "expected %p got %p\n", stb1.base.base + 160, stb1.base.ebuf); + ok(stb1.base.eback == stb1.base.base, "wrong get base, expected %p got %p\n", stb1.base.base, stb1.base.eback); + ok(stb1.base.gptr == stb1.base.base + 100, "wrong get pointer, expected %p got %p\n", stb1.base.base + 100, stb1.base.gptr); + ok(stb1.base.egptr == stb1.base.base + 100, "wrong get end, expected %p got %p\n", stb1.base.base + 100, stb1.base.egptr); + ok(stb1.base.pbase == stb1.base.base + 100, "wrong put base, expected %p got %p\n", stb1.base.base + 100, stb1.base.pbase); + ok(stb1.base.pptr == stb1.base.base + 100, "wrong put pointer, expected %p got %p\n", stb1.base.base + 100, stb1.base.pptr); + ok(stb1.base.epptr == stb1.base.base + 160, "wrong put end, expected %p got %p\n", stb1.base.base + 160, stb1.base.epptr); + ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, -1, 64); + ok(ret == 0 || ret == 1, "expected 0 or 1, got %d\n", ret); + ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, 32, -8); + ok(ret == 0 || ret == 1, "expected 0 or 1, got %d\n", ret); + ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, 0, 64); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(stb1.base.ebuf == stb1.base.base + 64, "expected %p got %p\n", stb1.base.base + 64, stb1.base.ebuf); + ok(stb1.base.eback == NULL, "wrong get base, expected %p got %p\n", NULL, stb1.base.eback); + ok(stb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, stb1.base.gptr); + ok(stb1.base.egptr == NULL, "wrong get end, expected %p got %p\n", NULL, stb1.base.egptr); + ok(stb1.base.pbase == stb1.base.base, "wrong put base, expected %p got %p\n", stb1.base.base, stb1.base.pbase); + ok(stb1.base.pptr == stb1.base.base, "wrong put pointer, expected %p got %p\n", stb1.base.base, stb1.base.pptr); + ok(stb1.base.epptr == stb1.base.base + 64, "wrong put end, expected %p got %p\n", stb1.base.base + 64, stb1.base.epptr); + ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, 0, 0); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(stb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", stb1.base.unbuffered); + call_func1(p_stdiobuf_dtor, &stb1); call_func1(p_stdiobuf_dtor, &stb2); fclose(file1);

1 0

Ken Thomases : winemac: Remove JPEG 2000 from the bitmap formats that other bitmap formats can be converted to.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 10b95d0dc74d1c9f069807ec3f397839c3f9cc79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b95d0dc74d1c9f069807ec3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 7 16:22:27 2015 -0500 winemac: Remove JPEG 2000 from the bitmap formats that other bitmap formats can be converted to. Since a983cfb01, the Mac driver won't even present formats, like this one, which don't correspond to a known Windows format through the clipboard APIs, so it's pointless. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_clipboard.m | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index b8ca796..1d1cb88 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -66,12 +66,10 @@ CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) [NSNumber numberWithUnsignedInteger:NSBMPFileType], [NSNumber numberWithUnsignedInteger:NSGIFFileType], [NSNumber numberWithUnsignedInteger:NSJPEGFileType], - [NSNumber numberWithUnsignedInteger:NSJPEG2000FileType], nil]; BitmapOutputTypes = [[NSArray alloc] initWithObjects:@"public.tiff", @"public.png", - @"com.microsoft.bmp", @"com.compuserve.gif", @"public.jpeg", - @"public.jpeg-2000", nil]; + @"com.microsoft.bmp", @"com.compuserve.gif", @"public.jpeg", nil]; BitmapOutputTypeMap = [[NSDictionary alloc] initWithObjects:bitmapFileTypes forKeys:BitmapOutputTypes];

1 0

Nikolay Sivov : wiaservc/tests: Basic test for device enumerator.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 6fc2d3ce2e0e46b1c1302c7279689d843d1c40d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc2d3ce2e0e46b1c1302c727… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 00:12:34 2015 +0300 wiaservc/tests: Basic test for device enumerator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/wiaservc/tests/Makefile.in | 5 +++ dlls/wiaservc/tests/wia.c | 76 +++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/wia_lh.idl | 2 ++ include/wia_xp.idl | 2 ++ include/wiadef.h | 22 ++++++++++++ 8 files changed, 110 insertions(+) diff --git a/configure b/configure index 8b1fb86..2ba059a 100755 --- a/configure +++ b/configure @@ -17872,6 +17872,7 @@ wine_fn_config_dll wer enable_wer implib wine_fn_config_test dlls/wer/tests wer_test wine_fn_config_dll wevtapi enable_wevtapi wine_fn_config_dll wiaservc enable_wiaservc clean +wine_fn_config_test dlls/wiaservc/tests wiaservc_test wine_fn_config_dll win32s16.dll16 enable_win16 wine_fn_config_dll win87em.dll16 enable_win16 wine_fn_config_dll winaspi.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 5e83d39..1e9bd66 100644 --- a/configure.ac +++ b/configure.ac @@ -3385,6 +3385,7 @@ WINE_CONFIG_DLL(wer,,[implib]) WINE_CONFIG_TEST(dlls/wer/tests) WINE_CONFIG_DLL(wevtapi) WINE_CONFIG_DLL(wiaservc,,[clean]) +WINE_CONFIG_TEST(dlls/wiaservc/tests) WINE_CONFIG_DLL(win32s16.dll16,enable_win16) WINE_CONFIG_DLL(win87em.dll16,enable_win16) WINE_CONFIG_DLL(winaspi.dll16,enable_win16) diff --git a/dlls/wiaservc/tests/Makefile.in b/dlls/wiaservc/tests/Makefile.in new file mode 100644 index 0000000..594e1b2 --- /dev/null +++ b/dlls/wiaservc/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wiaservc.dll +IMPORTS = ole32 + +C_SRCS = \ + wia.c diff --git a/dlls/wiaservc/tests/wia.c b/dlls/wiaservc/tests/wia.c new file mode 100644 index 0000000..e3f4edb --- /dev/null +++ b/dlls/wiaservc/tests/wia.c @@ -0,0 +1,76 @@ +/* + * Unit test suite for WIA system + * + * Copyright 2015 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#define COBJMACROS + +#include "objbase.h" +#include "initguid.h" +#include "wia_lh.h" + +#include "wine/test.h" + +static IWiaDevMgr *devmanager; + +static void test_EnumDeviceInfo(void) +{ + IEnumWIA_DEV_INFO *devenum; + HRESULT hr; + ULONG count; + + hr = IWiaDevMgr_EnumDeviceInfo(devmanager, WIA_DEVINFO_ENUM_LOCAL, NULL); + ok(FAILED(hr), "got 0x%08x\n", hr); + + hr = IWiaDevMgr_EnumDeviceInfo(devmanager, WIA_DEVINFO_ENUM_LOCAL, &devenum); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (hr == S_OK) { + hr = IEnumWIA_DEV_INFO_GetCount(devenum, NULL); + ok(FAILED(hr), "got 0x%08x\n", hr); + + count = 1000; + hr = IEnumWIA_DEV_INFO_GetCount(devenum, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count != 1000, "got %u\n", count); + + IEnumWIA_DEV_INFO_Release(devenum); +} +} + +START_TEST(wia) +{ + HRESULT hr; + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_WiaDevMgr, NULL, CLSCTX_LOCAL_SERVER, &IID_IWiaDevMgr, (void**)&devmanager); + if (FAILED(hr)) { + win_skip("Failed to create WiaDevMgr instance, 0x%08x\n", hr); + CoUninitialize(); + return; + } + + test_EnumDeviceInfo(); + + IWiaDevMgr_Release(devmanager); + CoUninitialize(); +} diff --git a/include/Makefile.in b/include/Makefile.in index 84a6381..3d2c97f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -611,6 +611,7 @@ SRCDIR_INCLUDES = \ werapi.h \ wfext.h \ wia.h \ + wiadef.h \ winbase.h \ wincon.h \ wincred.h \ diff --git a/include/wia_lh.idl b/include/wia_lh.idl index 7cadbc6..284528a 100644 --- a/include/wia_lh.idl +++ b/include/wia_lh.idl @@ -20,6 +20,8 @@ import "unknwn.idl"; import "oaidl.idl"; import "propidl.idl"; +cpp_quote("#include <wiadef.h>") + interface IEnumWIA_DEV_INFO; interface IWiaPropertyStorage; interface IWiaItem; diff --git a/include/wia_xp.idl b/include/wia_xp.idl index 7cadbc6..284528a 100644 --- a/include/wia_xp.idl +++ b/include/wia_xp.idl @@ -20,6 +20,8 @@ import "unknwn.idl"; import "oaidl.idl"; import "propidl.idl"; +cpp_quote("#include <wiadef.h>") + interface IEnumWIA_DEV_INFO; interface IWiaPropertyStorage; interface IWiaItem; diff --git a/include/wiadef.h b/include/wiadef.h new file mode 100644 index 0000000..28e43e0 --- /dev/null +++ b/include/wiadef.h @@ -0,0 +1,22 @@ +/* + * WIA constants + * + * Copyright 2015 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIA_DEVINFO_ENUM_ALL 0x0000000f +#define WIA_DEVINFO_ENUM_LOCAL 0x00000010

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015