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

Jacek Caban : rbtree.h: Store compare function instead of wine_rb_functions in wine_rb_tree.
by Alexandre Julliard Aug. 31, 2016

Aug. 31, 2016

Module: wine Branch: master Commit: f5d7ee1a57f689311bcdea7679cc4c50a26657d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5d7ee1a57f689311bcdea767… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:30:25 2016 +0200 rbtree.h: Store compare function instead of wine_rb_functions in wine_rb_tree. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/rbtree.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index f13592e..528a494 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -44,7 +44,7 @@ struct wine_rb_functions struct wine_rb_tree { - const struct wine_rb_functions *functions; + int (*compare)(const void *key, const struct wine_rb_entry *entry); struct wine_rb_entry *root; }; @@ -131,7 +131,7 @@ static inline void wine_rb_postorder(struct wine_rb_tree *tree, wine_rb_traverse static inline int wine_rb_init(struct wine_rb_tree *tree, const struct wine_rb_functions *functions) { - tree->functions = functions; + tree->compare = functions->compare; tree->root = NULL; return 0; @@ -159,7 +159,7 @@ static inline struct wine_rb_entry *wine_rb_get(const struct wine_rb_tree *tree, struct wine_rb_entry *entry = tree->root; while (entry) { - int c = tree->functions->compare(key, entry); + int c = tree->compare(key, entry); if (!c) return entry; entry = c < 0 ? entry->left : entry->right; } @@ -175,7 +175,7 @@ static inline int wine_rb_put(struct wine_rb_tree *tree, const void *key, struct int c; parent = *iter; - c = tree->functions->compare(key, parent); + c = tree->compare(key, parent); if (!c) return -1; else if (c < 0) iter = &parent->left; else iter = &parent->right;

1 0

Jacek Caban : d3d10: Removed no loner needed wine_rb_init error handling.
by Alexandre Julliard Aug. 31, 2016

Aug. 31, 2016

Module: wine Branch: master Commit: 0f418a698c49d330818cfbf9ea3e714c36c3c3ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f418a698c49d330818cfbf9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:31:00 2016 +0200 d3d10: Removed no loner needed wine_rb_init error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 6ca75b6..0cbe667 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -231,13 +231,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl return E_OUTOFMEMORY; } - if (wine_rb_init(&object->types, &d3d10_effect_type_rb_functions) == -1) - { - ERR("Failed to initialize type rbtree.\n"); - HeapFree(GetProcessHeap(), 0, object); - return E_FAIL; - } - + wine_rb_init(&object->types, &d3d10_effect_type_rb_functions); object->ID3D10Effect_iface.lpVtbl = &d3d10_effect_vtbl; object->refcount = 1; ID3D10Device_AddRef(device);

1 0

Alexandre Julliard : rpcss: Make rpcss a proper service.
by Alexandre Julliard Aug. 31, 2016

Aug. 31, 2016

Module: wine Branch: master Commit: 8df5add2d7aac41a9299c100cde7977b3549cfb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df5add2d7aac41a9299c100c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 31 22:21:17 2016 +0900 rpcss: Make rpcss a proper service. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/moniker.c | 59 +++++++++++++++------- dlls/rpcrt4/rpc_epmap.c | 61 ++++++++++++++-------- loader/wine.inf.in | 12 ++++- programs/rpcss/Makefile.in | 4 +- programs/rpcss/rpcss_main.c | 120 +++++++++++++++++++++++++------------------- 5 files changed, 163 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8df5add2d7aac41a9299c…

1 0

Jacek Caban : d3d11: Removed no longer needed wine_rb_init error handling.
by Alexandre Julliard Aug. 31, 2016

Aug. 31, 2016

Module: wine Branch: master Commit: c0fa655d9ed276f2a85ceded668b74f459ffac4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0fa655d9ed276f2a85ceded6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:31:23 2016 +0200 d3d11: Removed no longer needed wine_rb_init error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 8 +------- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 36 +++++------------------------------- 3 files changed, 7 insertions(+), 39 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index b4a00c8..ef2c40c 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -75,7 +75,6 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba void *device_object, REFIID riid, void **device_layer) { struct d3d_device *object; - HRESULT hr; TRACE("id %#x, layer_base %p, unknown0 %#x, device_object %p, riid %s, device_layer %p\n", id, layer_base, unknown0, device_object, debugstr_guid(riid), device_layer); @@ -88,12 +87,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba } object = *layer_base; - if (FAILED(hr = d3d_device_init(object, device_object))) - { - WARN("Failed to initialize device, hr %#x.\n", hr); - *device_layer = NULL; - return hr; - } + d3d_device_init(object, device_object); *device_layer = &object->IUnknown_inner; TRACE("Created d3d10 device at %p\n", object); diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 4af0faa..78cd265 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -518,7 +518,7 @@ static inline struct d3d_device *impl_from_ID3D10Device(ID3D10Device1 *iface) return CONTAINING_RECORD(iface, struct d3d_device, ID3D10Device1_iface); } -HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) DECLSPEC_HIDDEN; +void d3d_device_init(struct d3d_device *device, void *outer_unknown) DECLSPEC_HIDDEN; /* Layered device */ enum dxgi_device_layer_id diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9a42c8b..66f823d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5351,7 +5351,7 @@ static const struct wine_rb_functions d3d_rasterizer_state_rb_ops = d3d_rasterizer_state_compare, }; -HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) +void d3d_device_init(struct d3d_device *device, void *outer_unknown) { device->IUnknown_inner.lpVtbl = &d3d_device_inner_unknown_vtbl; device->ID3D11Device_iface.lpVtbl = &d3d11_device_vtbl; @@ -5366,39 +5366,13 @@ HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) d3d11_immediate_context_init(&device->immediate_context, device); ID3D11DeviceContext_Release(&device->immediate_context.ID3D11DeviceContext_iface); - if (wine_rb_init(&device->blend_states, &d3d_blend_state_rb_ops) == -1) - { - WARN("Failed to initialize blend state rbtree.\n"); - return E_FAIL; - } device->blend_factor[0] = 1.0f; device->blend_factor[1] = 1.0f; device->blend_factor[2] = 1.0f; device->blend_factor[3] = 1.0f; - if (wine_rb_init(&device->depthstencil_states, &d3d_depthstencil_state_rb_ops) == -1) - { - WARN("Failed to initialize depthstencil state rbtree.\n"); - wine_rb_destroy(&device->blend_states, NULL, NULL); - return E_FAIL; - } - - if (wine_rb_init(&device->rasterizer_states, &d3d_rasterizer_state_rb_ops) == -1) - { - WARN("Failed to initialize rasterizer state rbtree.\n"); - wine_rb_destroy(&device->depthstencil_states, NULL, NULL); - wine_rb_destroy(&device->blend_states, NULL, NULL); - return E_FAIL; - } - - if (wine_rb_init(&device->sampler_states, &d3d_sampler_state_rb_ops) == -1) - { - WARN("Failed to initialize sampler state rbtree.\n"); - wine_rb_destroy(&device->rasterizer_states, NULL, NULL); - wine_rb_destroy(&device->depthstencil_states, NULL, NULL); - wine_rb_destroy(&device->blend_states, NULL, NULL); - return E_FAIL; - } - - return S_OK; + wine_rb_init(&device->blend_states, &d3d_blend_state_rb_ops); + wine_rb_init(&device->depthstencil_states, &d3d_depthstencil_state_rb_ops); + wine_rb_init(&device->rasterizer_states, &d3d_rasterizer_state_rb_ops); + wine_rb_init(&device->sampler_states, &d3d_sampler_state_rb_ops); }

1 0

Henri Verbeet : d3d11: Use wined3d_resource_map() in d3d10_buffer_Map().
by Alexandre Julliard Aug. 31, 2016

Aug. 31, 2016

Module: wine Branch: master Commit: cec2ff4f86025fba405ee1d17cd2042bb08391c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec2ff4f86025fba405ee1d17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 31 11:27:50 2016 +0200 d3d11: Use wined3d_resource_map() in d3d10_buffer_Map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 5a5e66e..a43b6be 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -303,6 +303,7 @@ static UINT STDMETHODCALLTYPE d3d10_buffer_GetEvictionPriority(ID3D10Buffer *ifa static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP map_type, UINT map_flags, void **data) { struct d3d_buffer *buffer = impl_from_ID3D10Buffer(iface); + struct wined3d_map_desc wined3d_map_desc; HRESULT hr; TRACE("iface %p, map_type %u, map_flags %#x, data %p.\n", iface, map_type, map_flags, data); @@ -311,8 +312,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP FIXME("Ignoring map_flags %#x.\n", map_flags); wined3d_mutex_lock(); - hr = wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, - wined3d_map_flags_from_d3d11_map_type(map_type)); + hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0, + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)); + *data = wined3d_map_desc.data; wined3d_mutex_unlock(); return hr;

1 0

Jacek Caban : ntoskrnl.exe: Use static initializer for device_drivers.
by Alexandre Julliard Aug. 31, 2016

Aug. 31, 2016

Module: wine Branch: master Commit: ccdbc176c0b131afad05395d152d78c6468da511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccdbc176c0b131afad05395d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:30:33 2016 +0200 ntoskrnl.exe: Use static initializer for device_drivers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7c35d14..a2cbb74 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -90,32 +90,6 @@ struct wine_driver DRIVER_EXTENSION driver_extension; }; -static struct wine_rb_tree wine_drivers; - -static CRITICAL_SECTION drivers_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &drivers_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": drivers_cs") } -}; -static CRITICAL_SECTION drivers_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; - -static void *wine_drivers_rb_alloc( size_t size ) -{ - return HeapAlloc( GetProcessHeap(), 0, size ); -} - -static void *wine_drivers_rb_realloc( void *ptr, size_t size ) -{ - return HeapReAlloc( GetProcessHeap(), 0, ptr, size ); -} - -static void wine_drivers_rb_free( void *ptr ) -{ - HeapFree( GetProcessHeap(), 0, ptr ); -} - static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) { const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); @@ -124,13 +98,16 @@ static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry return RtlCompareUnicodeString( k, &driver->driver_obj.DriverName, FALSE ); } -static const struct wine_rb_functions wine_drivers_rb_functions = +static struct wine_rb_tree wine_drivers = { wine_drivers_rb_compare }; + +static CRITICAL_SECTION drivers_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = { - wine_drivers_rb_alloc, - wine_drivers_rb_realloc, - wine_drivers_rb_free, - wine_drivers_rb_compare, + 0, 0, &drivers_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": drivers_cs") } }; +static CRITICAL_SECTION drivers_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; #ifdef __i386__ #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ @@ -2447,7 +2424,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( inst ); - if (wine_rb_init( &wine_drivers, &wine_drivers_rb_functions )) return FALSE; #if defined(__i386__) || defined(__x86_64__) handler = RtlAddVectoredExceptionHandler( TRUE, vectored_handler ); #endif

1 0

Henri Verbeet : d3d9: Use wined3d_resource_unmap() in d3d9_indexbuffer_Unlock().
by Alexandre Julliard Aug. 30, 2016

Aug. 30, 2016

Module: wine Branch: master Commit: a6e17d11089d774d19877e1266f47e89baab7d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6e17d11089d774d19877e126… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 11:48:22 2016 +0200 d3d9: Use wined3d_resource_unmap() in d3d9_indexbuffer_Unlock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index d66c31d..dc52d93 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -490,7 +490,7 @@ static HRESULT WINAPI d3d9_indexbuffer_Unlock(IDirect3DIndexBuffer9 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(buffer->wined3d_buffer); + wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); wined3d_mutex_unlock(); return D3D_OK;

1 0

Alexandre Julliard : server: Avoid some compiler warnings when EWOULDBLOCK == EAGAIN.
by Alexandre Julliard Aug. 30, 2016

Aug. 30, 2016

Module: wine Branch: master Commit: 438dae524d9410f571f7fe5cc335fb74fec8d2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=438dae524d9410f571f7fe5cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 30 19:08:23 2016 +0900 server: Avoid some compiler warnings when EWOULDBLOCK == EAGAIN. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/request.c | 6 +++--- server/sock.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/request.c b/server/request.c index 597bf88..b937e6f 100644 --- a/server/request.c +++ b/server/request.c @@ -241,7 +241,7 @@ void write_reply( struct thread *thread ) } if (errno == EPIPE) kill_thread( thread, 0 ); /* normal death */ - else if (errno != EWOULDBLOCK && errno != EAGAIN) + else if (errno != EWOULDBLOCK && (EWOULDBLOCK == EAGAIN || errno != EAGAIN)) fatal_protocol_error( thread, "reply write: %s\n", strerror( errno )); } @@ -368,7 +368,7 @@ error: kill_thread( thread, 0 ); else if (ret > 0) fatal_protocol_error( thread, "partial read %d\n", ret ); - else if (errno != EWOULDBLOCK && errno != EAGAIN) + else if (errno != EWOULDBLOCK && (EWOULDBLOCK == EAGAIN || errno != EAGAIN)) fatal_protocol_error( thread, "read: %s\n", strerror( errno )); } @@ -449,7 +449,7 @@ int receive_fd( struct process *process ) } else { - if (errno != EWOULDBLOCK && errno != EAGAIN) + if (errno != EWOULDBLOCK && (EWOULDBLOCK == EAGAIN || errno != EAGAIN)) { fprintf( stderr, "Protocol error: process %04x: ", process->id ); perror( "recvmsg" ); diff --git a/server/sock.c b/server/sock.c index dc10d2a..89049e0 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1075,8 +1075,8 @@ static void ifchange_poll_event( struct fd *fd, int event ) r = recv( get_unix_fd(fd), buffer, sizeof(buffer), MSG_DONTWAIT ); if (r < 0) { - if (errno == EWOULDBLOCK || errno == EAGAIN) - return; /* retry when poll() says the socket is ready */ + if (errno == EWOULDBLOCK || (EWOULDBLOCK != EAGAIN && errno == EAGAIN)) + return; /* retry when poll() says the socket is ready */ status = sock_get_ntstatus( errno ); } else if (r > 0)

1 0

Alistair Leslie-Hughes : inetcomm/tests: Add Attachment tests.
by Alexandre Julliard Aug. 30, 2016

Aug. 30, 2016

Module: wine Branch: master Commit: 002af352fac43d170aad216bf15098b27555539a URL: http://source.winehq.org/git/wine.git/?a=commit;h=002af352fac43d170aad216bf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 18 11:13:02 2016 +0000 inetcomm/tests: Add Attachment tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 011c19f..ce1e4af 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -338,6 +338,59 @@ static void test_CreateMessage(void) hr = IMimeMessage_GetAttachments(msg, &count, &body_list); ok(hr == S_OK, "ret %08x\n", hr); ok(count == 2, "got %d\n", count); + if(count == 2) + { + ENCODINGTYPE encoding; + IMimeBody *attachment; + PROPVARIANT prop; + + PropVariantInit(&prop); + + hr = IMimeMessage_BindToObject(msg, body_list[0], &IID_IMimeBody, (void**)&attachment); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_IsContentType(attachment, "multipart", NULL); + ok(hr == S_FALSE, "ret %08x\n", hr); + + hr = IMimeBody_GetCurrentEncoding(attachment, &encoding); + ok(hr == S_OK, "ret %08x\n", hr); + todo_wine ok(encoding == IET_8BIT, "ret %d\n", encoding); + + prop.vt = VT_LPSTR; + hr = IMimeBody_GetProp(attachment, "Content-Transfer-Encoding", 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + + ok(prop.vt == VT_LPSTR, "type %d\n", prop.vt); + ok(!strcmp(prop.u.pszVal, "8bit"), "got %s\n", prop.u.pszVal); + PropVariantClear(&prop); + + hr = IMimeBody_IsType(attachment, IBT_ATTACHMENT); + todo_wine ok(hr == S_FALSE, "ret %08x\n", hr); + + IMimeBody_Release(attachment); + + hr = IMimeMessage_BindToObject(msg, body_list[1], &IID_IMimeBody, (void**)&attachment); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_IsContentType(attachment, "multipart", NULL); + ok(hr == S_FALSE, "ret %08x\n", hr); + + hr = IMimeBody_GetCurrentEncoding(attachment, &encoding); + ok(hr == S_OK, "ret %08x\n", hr); + todo_wine ok(encoding == IET_7BIT, "ret %d\n", encoding); + + prop.vt = VT_LPSTR; + hr = IMimeBody_GetProp(attachment, "Content-Transfer-Encoding", 0, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + ok(prop.vt == VT_LPSTR, "type %d\n", prop.vt); + ok(!strcmp(prop.u.pszVal, "7bit"), "got %s\n", prop.u.pszVal); + PropVariantClear(&prop); + + hr = IMimeBody_IsType(attachment, IBT_ATTACHMENT); + ok(hr == S_OK, "ret %08x\n", hr); + + IMimeBody_Release(attachment); + } CoTaskMemFree(body_list); hr = IMimeBody_GetCharset(body, &hcs);

1 0

Henri Verbeet : d3d9: Use wined3d_resource_unmap() in d3d9_vertexbuffer_Unlock().
by Alexandre Julliard Aug. 30, 2016

Aug. 30, 2016

Module: wine Branch: master Commit: f1e78067217edc2de29dcf7b8261a60377e25561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1e78067217edc2de29dcf7b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 11:48:20 2016 +0200 d3d9: Use wined3d_resource_unmap() in d3d9_vertexbuffer_Unlock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 53f2272..de77d5a 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -208,7 +208,7 @@ static HRESULT WINAPI d3d9_vertexbuffer_Unlock(IDirect3DVertexBuffer9 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(buffer->wined3d_buffer); + wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); wined3d_mutex_unlock(); return D3D_OK;

1 0