July 2017 - Wine-commits - list.winehq.org

Jacek Caban : winhttp: Get rid of no longer needed netconn_init.
by Alexandre Julliard 14 Jul '17

14 Jul '17

Module: wine Branch: master Commit: c2f464decb8c44fbbc08e7f694c89d6aa758a754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f464decb8c44fbbc08e7f69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 14 15:58:00 2017 +0200 winhttp: Get rid of no longer needed netconn_init. Spotted by Hans. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 7 ------- dlls/winhttp/winhttp_private.h | 1 - 2 files changed, 8 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index c6cc698..d9f81de 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -289,13 +289,6 @@ static BOOL ensure_cred_handle(void) return ret; } -BOOL netconn_init( netconn_t *conn ) -{ - memset(conn, 0, sizeof(*conn)); - conn->socket = -1; - return TRUE; -} - void netconn_unload( void ) { if(cred_handle_initialized) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index eba20c9..636bae9 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -284,7 +284,6 @@ void close_connection( request_t * ) DECLSPEC_HIDDEN; BOOL netconn_close( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int, int ) DECLSPEC_HIDDEN; netconn_t *netconn_create( int, int, int ) DECLSPEC_HIDDEN; -BOOL netconn_init( netconn_t * ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN;

1 0

Akihiro Sagawa : ntdll: Allow map_view() to allocate fixed memory between reserved area and non-reserved area.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 74b7fcfbdb87b4e0ca4d4a3193af52410da8d1b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b7fcfbdb87b4e0ca4d4a319… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jul 10 22:21:32 2017 +0900 ntdll: Allow map_view() to allocate fixed memory between reserved area and non-reserved area. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 155 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 120 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ee9c8d0..4aeb282 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -404,6 +404,42 @@ static void remove_reserved_area( void *addr, size_t size ) } +struct area_boundary +{ + void *base; + size_t size; + void *boundary; +}; + +/*********************************************************************** + * get_area_boundary_callback + * + * Get lowest boundary address between reserved area and non-reserved area + * in the specified region. If no boundaries are found, result is NULL. + * The csVirtual section must be held by caller. + */ +static int get_area_boundary_callback( void *start, size_t size, void *arg ) +{ + struct area_boundary *area = arg; + void *end = (char *)start + size; + + area->boundary = NULL; + if (area->base >= end) return 0; + if ((char *)start >= (char *)area->base + area->size) return 1; + if (area->base >= start) + { + if ((char *)area->base + area->size > (char *)end) + { + area->boundary = end; + return 1; + } + return 0; + } + area->boundary = start; + return 1; +} + + /*********************************************************************** * is_beyond_limit * @@ -423,12 +459,32 @@ static inline BOOL is_beyond_limit( const void *addr, size_t size, const void *l */ static inline void unmap_area( void *addr, size_t size ) { - if (wine_mmap_is_in_reserved_area( addr, size )) + switch (wine_mmap_is_in_reserved_area( addr, size )) + { + case -1: /* partially in a reserved area */ + { + struct area_boundary area; + size_t lower_size; + area.base = addr; + area.size = size; + wine_mmap_enum_reserved_areas( get_area_boundary_callback, &area, 0 ); + assert( area.boundary ); + lower_size = (char *)area.boundary - (char *)addr; + unmap_area( addr, lower_size ); + unmap_area( area.boundary, size - lower_size ); + break; + } + case 1: /* in a reserved area */ wine_anon_mmap( addr, size, PROT_NONE, MAP_NORESERVE | MAP_FIXED ); - else if (is_beyond_limit( addr, size, user_space_limit )) - add_reserved_area( addr, size ); - else - munmap( addr, size ); + break; + default: + case 0: /* not in a reserved area */ + if (is_beyond_limit( addr, size, user_space_limit )) + add_reserved_area( addr, size ); + else + munmap( addr, size ); + break; + } } @@ -773,6 +829,62 @@ static int alloc_reserved_area_callback( void *start, size_t size, void *arg ) return 0; } +/*********************************************************************** + * map_fixed_area + * + * mmap the fixed memory area. + * The csVirtual section must be held by caller. + */ +static NTSTATUS map_fixed_area( void *base, size_t size, unsigned int vprot ) +{ + void *ptr; + + switch (wine_mmap_is_in_reserved_area( base, size )) + { + case -1: /* partially in a reserved area */ + { + NTSTATUS status; + struct area_boundary area; + size_t lower_size; + area.base = base; + area.size = size; + wine_mmap_enum_reserved_areas( get_area_boundary_callback, &area, 0 ); + assert( area.boundary ); + lower_size = (char *)area.boundary - (char *)base; + status = map_fixed_area( base, lower_size, vprot ); + if (status == STATUS_SUCCESS) + { + status = map_fixed_area( area.boundary, size - lower_size, vprot); + if (status != STATUS_SUCCESS) unmap_area( base, lower_size ); + } + return status; + } + case 0: /* not in a reserved area, do a normal allocation */ + if ((ptr = wine_anon_mmap( base, size, VIRTUAL_GetUnixProt(vprot), 0 )) == (void *)-1) + { + if (errno == ENOMEM) return STATUS_NO_MEMORY; + return STATUS_INVALID_PARAMETER; + } + if (ptr != base) + { + /* We couldn't get the address we wanted */ + if (is_beyond_limit( ptr, size, user_space_limit )) add_reserved_area( ptr, size ); + else munmap( ptr, size ); + return STATUS_CONFLICTING_ADDRESSES; + } + break; + + default: + case 1: /* in a reserved area, make sure the address is available */ + if (find_view_range( base, size )) return STATUS_CONFLICTING_ADDRESSES; + /* replace the reserved area by our mapping */ + if ((ptr = wine_anon_mmap( base, size, VIRTUAL_GetUnixProt(vprot), MAP_FIXED )) != base) + return STATUS_INVALID_PARAMETER; + break; + } + if (is_beyond_limit( ptr, size, working_set_limit )) working_set_limit = address_space_limit; + return STATUS_SUCCESS; +} /*********************************************************************** * map_view @@ -790,36 +902,9 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { if (is_beyond_limit( base, size, address_space_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; - - switch (wine_mmap_is_in_reserved_area( base, size )) - { - case -1: /* partially in a reserved area */ - return STATUS_CONFLICTING_ADDRESSES; - - case 0: /* not in a reserved area, do a normal allocation */ - if ((ptr = wine_anon_mmap( base, size, VIRTUAL_GetUnixProt(vprot), 0 )) == (void *)-1) - { - if (errno == ENOMEM) return STATUS_NO_MEMORY; - return STATUS_INVALID_PARAMETER; - } - if (ptr != base) - { - /* We couldn't get the address we wanted */ - if (is_beyond_limit( ptr, size, user_space_limit )) add_reserved_area( ptr, size ); - else munmap( ptr, size ); - return STATUS_CONFLICTING_ADDRESSES; - } - break; - - default: - case 1: /* in a reserved area, make sure the address is available */ - if (find_view_range( base, size )) return STATUS_CONFLICTING_ADDRESSES; - /* replace the reserved area by our mapping */ - if ((ptr = wine_anon_mmap( base, size, VIRTUAL_GetUnixProt(vprot), MAP_FIXED )) != base) - return STATUS_INVALID_PARAMETER; - break; - } - if (is_beyond_limit( ptr, size, working_set_limit )) working_set_limit = address_space_limit; + status = map_fixed_area( base, size, vprot ); + if (status != STATUS_SUCCESS) return status; + ptr = base; } else {

1 0

Alexandre Julliard : wineandroid: Add a generation number to the native window to catch when old buffers are queued.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 83bed85074f1ba60bbff2d2b1804812f2c1f8b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=83bed85074f1ba60bbff2d2b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 17:18:33 2017 +0200 wineandroid: Add a generation number to the native window to catch when old buffers are queued. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 09ac4f4..3911d21 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -92,6 +92,7 @@ struct native_win_data void *mappings[NB_CACHED_BUFFERS]; HWND hwnd; BOOL opengl; + int generation; int api; int buffer_format; int swap_interval; @@ -117,6 +118,7 @@ struct native_buffer_wrapper HWND hwnd; void *bits; int buffer_id; + int generation; union native_handle_buffer native_handle; }; @@ -159,6 +161,7 @@ struct ioctl_android_dequeueBuffer int format; int usage; int buffer_id; + int generation; union native_handle_buffer native_handle; }; @@ -166,12 +169,14 @@ struct ioctl_android_queueBuffer { struct ioctl_header hdr; int buffer_id; + int generation; }; struct ioctl_android_cancelBuffer { struct ioctl_header hdr; int buffer_id; + int generation; }; struct ioctl_android_query @@ -468,6 +473,7 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR release_native_window( data ); data->parent = win; + data->generation++; if (win) { wrap_java_call(); @@ -672,6 +678,7 @@ static NTSTATUS dequeueBuffer_ioctl( void *data, DWORD in_size, DWORD out_size, res->format = buffer->format; res->usage = buffer->usage; res->buffer_id = register_buffer( win_data, buffer, res->win32 ? &mapping : NULL, &is_new ); + res->generation = win_data->generation; if (is_new) { HANDLE process = OpenProcess( PROCESS_DUP_HANDLE, FALSE, current_client_id() ); @@ -698,6 +705,7 @@ static NTSTATUS cancelBuffer_ioctl( void *data, DWORD in_size, DWORD out_size, U if (!(win_data = get_ioctl_native_win_data( &res->hdr ))) return STATUS_INVALID_HANDLE; if (!(parent = win_data->parent)) return STATUS_DEVICE_NOT_READY; + if (res->generation != win_data->generation) return STATUS_SUCCESS; /* obsolete buffer, ignore */ if (!(buffer = get_registered_buffer( win_data, res->buffer_id ))) return STATUS_INVALID_HANDLE; @@ -720,6 +728,7 @@ static NTSTATUS queueBuffer_ioctl( void *data, DWORD in_size, DWORD out_size, UL if (!(win_data = get_ioctl_native_win_data( &res->hdr ))) return STATUS_INVALID_HANDLE; if (!(parent = win_data->parent)) return STATUS_DEVICE_NOT_READY; + if (res->generation != win_data->generation) return STATUS_SUCCESS; /* obsolete buffer, ignore */ if (!(buffer = get_registered_buffer( win_data, res->buffer_id ))) return STATUS_INVALID_HANDLE; @@ -1114,6 +1123,7 @@ static int dequeueBuffer( struct ANativeWindow *window, struct ANativeWindowBuff buf->ref = 1; buf->hwnd = win->hwnd; buf->buffer_id = res.buffer_id; + buf->generation = res.generation; if (win->buffers[res.buffer_id]) win->buffers[res.buffer_id]->buffer.common.decRef(&win->buffers[res.buffer_id]->buffer.common); win->buffers[res.buffer_id] = buf; @@ -1149,6 +1159,7 @@ static int cancelBuffer( struct ANativeWindow *window, struct ANativeWindowBuffe win->hwnd, buffer, buffer->width, buffer->height, buffer->stride, buffer->format, buffer->usage, fence ); cancel.buffer_id = buf->buffer_id; + cancel.generation = buf->generation; cancel.hdr.hwnd = HandleToLong( win->hwnd ); cancel.hdr.opengl = win->opengl; wait_fence_and_close( fence ); @@ -1165,6 +1176,7 @@ static int queueBuffer( struct ANativeWindow *window, struct ANativeWindowBuffer win->hwnd, buffer, buffer->width, buffer->height, buffer->stride, buffer->format, buffer->usage, fence ); queue.buffer_id = buf->buffer_id; + queue.generation = buf->generation; queue.hdr.hwnd = HandleToLong( win->hwnd ); queue.hdr.opengl = win->opengl; wait_fence_and_close( fence );

1 0

Alexandre Julliard : wineandroid: Hold on to the native window until we get a new one.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 44ee3bf85a51be5aa664dadecd290b9be0ab012c URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ee3bf85a51be5aa664dadec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 17:22:37 2017 +0200 wineandroid: Hold on to the native window until we get a new one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 16 +++++++++++++--- dlls/wineandroid.drv/device.c | 2 ++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index d1fe305..5a99e07 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -311,6 +311,8 @@ public class WineActivity extends Activity protected WineWindow parent; protected Surface window_surface; protected Surface client_surface; + protected SurfaceTexture window_surftex; + protected SurfaceTexture client_surftex; protected WineWindowGroup window_group; protected WineWindowGroup client_group; @@ -442,14 +444,22 @@ public class WineActivity extends Activity if (is_client) { if (surftex == null) client_surface = null; - else if (client_surface == null) client_surface = new Surface( surftex ); + else if (surftex != client_surftex) + { + client_surftex = surftex; + client_surface = new Surface( surftex ); + } Log.i( LOGTAG, String.format( "set client surface hwnd %08x %s", hwnd, client_surface )); wine_surface_changed( hwnd, client_surface, true ); } else { if (surftex == null) window_surface = null; - else if (window_surface == null) window_surface = new Surface( surftex ); + else if (surftex != window_surftex) + { + window_surftex = surftex; + window_surface = new Surface( surftex ); + } Log.i( LOGTAG, String.format( "set window surface hwnd %08x %s", hwnd, window_surface )); wine_surface_changed( hwnd, window_surface, false ); } @@ -567,7 +577,7 @@ public class WineActivity extends Activity Log.i( LOGTAG, String.format( "onSurfaceTextureDestroyed win %08x %s", window.hwnd, is_client ? "client" : "whole" )); window.set_surface( null, is_client ); - return true; + return false; // hold on to the texture since the app may still be using it } public void onSurfaceTextureUpdated(SurfaceTexture surftex) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 3911d21..0ccae11 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -463,6 +463,8 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR BOOL opengl = arg3; struct native_win_data *data = get_native_win_data( hwnd, opengl ); + if (!win) return; /* do nothing and hold on to the window until we get a new surface */ + if (!data || data->parent == win) { if (win) pANativeWindow_release( win );

1 0

Jacek Caban : winhttp: Store security_flags in request_t instead of netconn_t.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: c06104c62ac5383f0b9220bc776e735bea3c43a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c06104c62ac5383f0b9220bc7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 13 13:00:26 2017 +0200 winhttp: Store security_flags in request_t instead of netconn_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 4 ++-- dlls/winhttp/request.c | 2 +- dlls/winhttp/session.c | 4 ++-- dlls/winhttp/winhttp_private.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 1cabec0..8f8c425 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -410,7 +410,7 @@ BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned return ret; } -BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) +BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags ) { SecBuffer out_buf = {0, SECBUFFER_TOKEN, NULL}, in_bufs[2] = {{0, SECBUFFER_TOKEN}, {0, SECBUFFER_EMPTY}}; SecBufferDesc out_desc = {SECBUFFER_VERSION, 1, &out_buf}, in_desc = {SECBUFFER_VERSION, 2, in_bufs}; @@ -510,7 +510,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) status = QueryContextAttributesW(&ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); if(status == SEC_E_OK) { - res = netconn_verify_cert(cert, hostname, conn->security_flags); + res = netconn_verify_cert(cert, hostname, security_flags); CertFreeCertificateContext(cert); if(res != ERROR_SUCCESS) { WARN("cert verify failed: %u\n", res); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index bcfc7b1..b0f83a7 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1048,7 +1048,7 @@ static BOOL open_connection( request_t *request ) return FALSE; } } - if (!netconn_secure_connect( &request->netconn, connect->hostname )) + if (!netconn_secure_connect( &request->netconn, connect->hostname, request->security_flags )) { netconn_close( &request->netconn ); heap_free( addressW ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 514a56d..46c98dc 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -721,7 +721,7 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf flags = 0; if (hdr->flags & WINHTTP_FLAG_SECURE) flags |= SECURITY_FLAG_SECURE; - flags |= request->netconn.security_flags; + flags |= request->security_flags; bits = netconn_get_cipher_strength( &request->netconn ); if (bits >= 128) flags |= SECURITY_FLAG_STRENGTH_STRONG; @@ -951,7 +951,7 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; } - request->netconn.security_flags = flags; + request->security_flags = flags; return TRUE; } case WINHTTP_OPTION_RESOLVE_TIMEOUT: diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 46c2aaa..53a9a7a 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -139,7 +139,6 @@ typedef struct char *peek_msg; char *peek_msg_mem; size_t peek_len; - DWORD security_flags; } netconn_t; typedef struct @@ -192,6 +191,7 @@ typedef struct void *optional; DWORD optional_len; netconn_t netconn; + DWORD security_flags; int resolve_timeout; int connect_timeout; int send_timeout; @@ -290,7 +290,7 @@ void netconn_unload( void ) DECLSPEC_HIDDEN; ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t *, int ) DECLSPEC_HIDDEN; -BOOL netconn_secure_connect( netconn_t *, WCHAR * ) DECLSPEC_HIDDEN; +BOOL netconn_secure_connect( netconn_t *, WCHAR *, DWORD ) DECLSPEC_HIDDEN; BOOL netconn_send( netconn_t *, const void *, size_t, int * ) DECLSPEC_HIDDEN; DWORD netconn_set_timeout( netconn_t *, BOOL, int ) DECLSPEC_HIDDEN; const void *netconn_get_certificate( netconn_t * ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : winhttp: Allocate netconn_t separately from request_t.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: c5026298198732fd789253428a4d3e488c0379d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5026298198732fd789253428… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 13 13:01:03 2017 +0200 winhttp: Allocate netconn_t separately from request_t. Once persistent connections will be supported, life time of connection may exceed life time of request object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 34 ++++++++--------------------- dlls/winhttp/request.c | 49 ++++++++++++++++++++++-------------------- dlls/winhttp/session.c | 38 ++++++++++++++++---------------- dlls/winhttp/winhttp_private.h | 5 ++--- 4 files changed, 57 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5026298198732fd78925…

1 0

Hugh McMaster : regedit: Use UpdateStatusBar() instead of updating the text manually.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 5a391e18cbc966999da522ff26058a9cd292b74d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a391e18cbc966999da522ff2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 13 13:22:01 2017 +0000 regedit: Use UpdateStatusBar() instead of updating the text manually. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 2a9a14b..1797b52 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -158,17 +158,6 @@ LPWSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { return ret; } -static LPWSTR GetPathFullPath(HWND hwndTV, LPWSTR path) { - LPWSTR parts[2]; - LPWSTR ret; - - parts[0] = GetPathRoot(hwndTV, 0, TRUE); - parts[1] = path; - ret = CombinePaths((LPCWSTR*)parts, 2); - HeapFree(GetProcessHeap(), 0, parts[0]); - return ret; -} - static void OnTreeSelectionChanged(HWND hwndTV, HWND hwndLV, HTREEITEM hItem, BOOL bRefreshLV) { if (bRefreshLV) { @@ -325,7 +314,6 @@ static int treeview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam if (res) { TVITEMW item; - WCHAR *fullPath; item.mask = TVIF_HANDLE | TVIF_TEXT; item.hItem = dispInfo->item.hItem; @@ -334,11 +322,9 @@ static int treeview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); update_listview_path(path); - - fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, path); - SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); - HeapFree(GetProcessHeap(), 0, fullPath); HeapFree(GetProcessHeap(), 0, path); + + UpdateStatusBar(); } SetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA, 0);

1 0

Piotr Caban : gdiplus: Add DrawPath stub for metafiles.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 8608bf532e76fc16a91b0a9bc42ba4644f24160c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8608bf532e76fc16a91b0a9bc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 13 11:53:43 2017 +0200 gdiplus: Add DrawPath stub for metafiles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 4 ++- dlls/gdiplus/metafile.c | 6 ++++ dlls/gdiplus/tests/metafile.c | 69 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index f24f38e..8c23bbb 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -111,6 +111,7 @@ extern GpStatus METAFILE_DrawImagePointsRect(GpMetafile* metafile, GpImage *imag REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, DrawImageAbort callback, VOID *callbackData) DECLSPEC_HIDDEN; extern GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a56ac43..68614f1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3819,7 +3819,9 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) if (path->pathdata.Count == 0) return Ok; - if (!graphics->hdc || !brush_can_fill_path(pen->brush, FALSE)) + if (graphics->image && graphics->image->type == ImageTypeMetafile) + retval = METAFILE_DrawPath((GpMetafile*)graphics->image, pen, path); + else if (!graphics->hdc || !brush_can_fill_path(pen->brush, FALSE)) retval = SOFTWARE_GdipDrawPath(graphics, pen, path); else retval = GDI32_GdipDrawPath(graphics, pen, path); diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index df87a66..2c3be42 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2569,3 +2569,9 @@ GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) METAFILE_WriteRecords(metafile); return Ok; } + +GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) +{ + FIXME("stub\n"); + return NotImplemented; +} diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 2ed8355..805db91 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -939,7 +939,7 @@ static void test_emfonly(void) stat = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); expect(Ok, stat); stat = GdipDrawLineI(graphics, pen, 0, 0, 10, 10); - expect(Ok, stat); + todo_wine expect(Ok, stat); GdipDeletePen(pen); stat = GdipDeleteGraphics(graphics); @@ -2483,6 +2483,72 @@ static void test_properties(void) expect(Ok, stat); } +static const emfplus_record draw_path_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {1, EmfPlusRecordTypeObject}, + {1, EmfPlusRecordTypeObject}, + {1, EmfPlusRecordTypeDrawPath}, + {1, EMR_SAVEDC}, + {1, EMR_SETICMMODE}, + {1, EMR_BITBLT}, + {1, EMR_RESTOREDC}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_drawpath(void) +{ + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + + GpMetafile *metafile; + GpGraphics *graphics; + HENHMETAFILE hemf; + GpStatus stat; + GpPath *path; + GpPen *pen; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, stat); + stat = GdipAddPathLine(path, 5, 5, 30, 30); + expect(Ok, stat); + + stat = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, stat); + + stat = GdipDrawPath(graphics, pen, path); + todo_wine expect(Ok, stat); + + stat = GdipDeletePen(pen); + expect(Ok, stat); + stat = GdipDeletePath(path); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "draw_path.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, draw_path_records, "draw path"); + DeleteEnhMetaFile(hemf); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2522,6 +2588,7 @@ START_TEST(metafile) test_gditransform(); test_drawimage(); test_properties(); + test_drawpath(); GdiplusShutdown(gdiplusToken); }

1 0

Piotr Caban : gdiplus: Add helper for saving path objects in metafile.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: e502a8dd071d69065e2c23eeef3d7c847ce81e9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e502a8dd071d69065e2c23eee… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 13 11:53:48 2017 +0200 gdiplus: Add helper for saving path objects in metafile. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 63 ++++++++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/metafile.c | 2 +- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 2c3be42..ee1efa1 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -157,6 +157,17 @@ typedef struct container GpRegion *clip; } container; +typedef struct EmfPlusPath +{ + DWORD Version; + DWORD PathPointCount; + DWORD PathPointFlags; + /* PathPoints[] */ + /* PathPointTypes[] */ + /* AlignmentPadding */ + BYTE data[1]; +} EmfPlusPath; + typedef enum { BitmapDataTypePixel, @@ -235,6 +246,7 @@ typedef struct EmfPlusObject EmfPlusRecordHeader Header; union { + EmfPlusPath path; EmfPlusImage image; EmfPlusImageAttributes image_attributes; } ObjectData; @@ -2570,8 +2582,57 @@ GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) return Ok; } +static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD *id) +{ + EmfPlusObject *object_record; + EmfPlusPointF *points; + BYTE *types; + GpStatus stat; + DWORD i, size; + + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) + return Ok; + + /* TODO: Add support for more point formats */ + size = sizeof(EmfPlusPointF)*path->pathdata.Count + path->pathdata.Count; + size = (size + 3) & ~3; + + stat = METAFILE_AllocateRecord(metafile, + FIELD_OFFSET(EmfPlusObject, ObjectData.path.data[size]), + (void**)&object_record); + if (stat != Ok) return stat; + + *id = METAFILE_AddObjectId(metafile); + object_record->Header.Type = EmfPlusRecordTypeObject; + object_record->Header.Flags = *id | ObjectTypePath << 8; + + object_record->ObjectData.path.Version = 0xDBC01002; + object_record->ObjectData.path.PathPointCount = path->pathdata.Count; + object_record->ObjectData.path.PathPointFlags = 0; + + points = (EmfPlusPointF*)object_record->ObjectData.path.data; + for (i=0; i<path->pathdata.Count; i++) + { + points[i].X = path->pathdata.Points[i].X; + points[i].Y = path->pathdata.Points[i].Y; + } + + types = (BYTE*)(points + path->pathdata.Count); + for (i=0; i<path->pathdata.Count; i++) + types[i] = path->pathdata.Types[i]; + return Ok; +} + GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) { - FIXME("stub\n"); + DWORD path_id; + GpStatus stat; + + FIXME("stub!\n"); + + stat = METAFILE_AddPathObject(metafile, path, &path_id); + if (stat != Ok) return stat; + + METAFILE_WriteRecords(metafile); return NotImplemented; } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 805db91..1d3a35d 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2486,7 +2486,7 @@ static void test_properties(void) static const emfplus_record draw_path_records[] = { {0, EMR_HEADER}, {0, EmfPlusRecordTypeHeader}, - {1, EmfPlusRecordTypeObject}, + {0, EmfPlusRecordTypeObject}, {1, EmfPlusRecordTypeObject}, {1, EmfPlusRecordTypeDrawPath}, {1, EMR_SAVEDC},

1 0

Piotr Caban : gdiplus: Add helper for saving pens to metafile.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 7d6896efee988cf326d5603d2c5ed61671b34159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d6896efee988cf326d5603d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 13 11:53:51 2017 +0200 gdiplus: Add helper for saving pens to metafile. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 276 ++++++++++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/metafile.c | 2 +- 2 files changed, 269 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index ee1efa1..7767e39 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -43,6 +43,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +typedef struct EmfPlusARGB +{ + BYTE Blue; + BYTE Green; + BYTE Red; + BYTE Alpha; +} EmfPlusARGB; + typedef struct EmfPlusRecordHeader { WORD Type; @@ -157,6 +165,69 @@ typedef struct container GpRegion *clip; } container; +enum PenDataFlags +{ + PenDataTransform = 0x0001, + PenDataStartCap = 0x0002, + PenDataEndCap = 0x0004, + PenDataJoin = 0x0008, + PenDataMiterLimit = 0x0010, + PenDataLineStyle = 0x0020, + PenDataDashedLineCap = 0x0040, + PenDataDashedLineOffset = 0x0080, + PenDataDashedLine = 0x0100, + PenDataNonCenter = 0x0200, + PenDataCompoundLine = 0x0400, + PenDataCustomStartCap = 0x0800, + PenDataCustomEndCap = 0x1000 +}; + +typedef struct EmfPlusTransformMatrix +{ + REAL TransformMatrix[6]; +} EmfPlusTransformMatrix; + +enum LineStyle +{ + LineStyleSolid, + LineStyleDash, + LineStyleDot, + LineStyleDashDot, + LineStyleDashDotDot, + LineStyleCustom +}; + +typedef struct EmfPlusPenData +{ + DWORD PenDataFlags; + DWORD PenUnit; + REAL PenWidth; + BYTE OptionalData[1]; +} EmfPlusPenData; + +typedef struct EmfPlusSolidBrushData +{ + EmfPlusARGB SolidColor; +} EmfPlusSolidBrushData; + +typedef struct EmfPlusBrush +{ + DWORD Version; + DWORD Type; + union { + EmfPlusSolidBrushData solid; + } BrushData; +} EmfPlusBrush; + +typedef struct EmfPlusPen +{ + DWORD Version; + DWORD Type; + /* EmfPlusPenData */ + /* EmfPlusBrush */ + BYTE data[1]; +} EmfPlusPen; + typedef struct EmfPlusPath { DWORD Version; @@ -209,14 +280,6 @@ typedef struct EmfPlusImage } ImageData; } EmfPlusImage; -typedef struct EmfPlusARGB -{ - BYTE Blue; - BYTE Green; - BYTE Red; - BYTE Alpha; -} EmfPlusARGB; - typedef struct EmfPlusImageAttributes { DWORD Version; @@ -246,6 +309,7 @@ typedef struct EmfPlusObject EmfPlusRecordHeader Header; union { + EmfPlusPen pen; EmfPlusPath path; EmfPlusImage image; EmfPlusImageAttributes image_attributes; @@ -2623,13 +2687,209 @@ static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD return Ok; } +static GpStatus METAFILE_PrepareBrushData(GpBrush *brush, DWORD *size) +{ + if (brush->bt == BrushTypeSolidColor) + { + *size = FIELD_OFFSET(EmfPlusBrush, BrushData.solid) + sizeof(EmfPlusSolidBrushData); + return Ok; + } + + FIXME("unsupported brush type: %d\n", brush->bt); + return NotImplemented; +} + +static void METAFILE_FillBrushData(GpBrush *brush, EmfPlusBrush *data) +{ + if (brush->bt == BrushTypeSolidColor) + { + GpSolidFill *solid = (GpSolidFill*)brush; + + data->Version = 0xDBC01002; + data->Type = solid->brush.bt; + data->BrushData.solid.SolidColor.Blue = solid->color & 0xff; + data->BrushData.solid.SolidColor.Green = (solid->color >> 8) & 0xff; + data->BrushData.solid.SolidColor.Red = (solid->color >> 16) & 0xff; + data->BrushData.solid.SolidColor.Alpha = solid->color >> 24; + } +} + +static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *id) +{ + DWORD i, data_flags, pen_data_size, brush_size; + EmfPlusObject *object_record; + EmfPlusPenData *pen_data; + GpStatus stat; + BOOL result; + + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) + return Ok; + + data_flags = 0; + pen_data_size = FIELD_OFFSET(EmfPlusPenData, OptionalData); + + GdipIsMatrixIdentity(&pen->transform, &result); + if (!result) + { + data_flags |= PenDataTransform; + pen_data_size += sizeof(EmfPlusTransformMatrix); + } + if (pen->startcap != LineCapFlat) + { + data_flags |= PenDataStartCap; + pen_data_size += sizeof(DWORD); + } + if (pen->endcap != LineCapFlat) + { + data_flags |= PenDataEndCap; + pen_data_size += sizeof(DWORD); + } + if (pen->join != LineJoinMiter) + { + data_flags |= PenDataJoin; + pen_data_size += sizeof(DWORD); + } + if (pen->miterlimit != 10.0) + { + data_flags |= PenDataMiterLimit; + pen_data_size += sizeof(REAL); + } + if (pen->style != GP_DEFAULT_PENSTYLE) + { + data_flags |= PenDataLineStyle; + pen_data_size += sizeof(DWORD); + } + if (pen->dash != (GpDashStyle)DashCapFlat) + { + data_flags |= PenDataDashedLineCap; + pen_data_size += sizeof(DWORD); + } + data_flags |= PenDataDashedLineOffset; + pen_data_size += sizeof(REAL); + if (pen->numdashes) + { + data_flags |= PenDataDashedLine; + pen_data_size += sizeof(DWORD) + pen->numdashes*sizeof(REAL); + } + if (pen->align != PenAlignmentCenter) + { + data_flags |= PenDataNonCenter; + pen_data_size += sizeof(DWORD); + } + /* TODO: Add support for PenDataCompoundLine */ + if (pen->customstart) + { + FIXME("ignoring custom start cup\n"); + } + if (pen->customend) + { + FIXME("ignoring custom end cup\n"); + } + + stat = METAFILE_PrepareBrushData(pen->brush, &brush_size); + if (stat != Ok) return stat; + + stat = METAFILE_AllocateRecord(metafile, + FIELD_OFFSET(EmfPlusObject, ObjectData.pen.data) + pen_data_size + brush_size, + (void**)&object_record); + if (stat != Ok) return stat; + + *id = METAFILE_AddObjectId(metafile); + object_record->Header.Type = EmfPlusRecordTypeObject; + object_record->Header.Flags = *id | ObjectTypePen << 8; + object_record->ObjectData.pen.Version = 0xDBC01002; + object_record->ObjectData.pen.Type = 0; + + pen_data = (EmfPlusPenData*)object_record->ObjectData.pen.data; + pen_data->PenDataFlags = data_flags; + pen_data->PenUnit = pen->unit; + pen_data->PenWidth = pen->width; + + i = 0; + if (data_flags & PenDataTransform) + { + EmfPlusTransformMatrix *m = (EmfPlusTransformMatrix*)(pen_data->OptionalData + i); + memcpy(m, &pen->transform, sizeof(*m)); + i += sizeof(EmfPlusTransformMatrix); + } + if (data_flags & PenDataStartCap) + { + *(DWORD*)(pen_data->OptionalData + i) = pen->startcap; + i += sizeof(DWORD); + } + if (data_flags & PenDataEndCap) + { + *(DWORD*)(pen_data->OptionalData + i) = pen->endcap; + i += sizeof(DWORD); + } + if (data_flags & PenDataJoin) + { + *(DWORD*)(pen_data->OptionalData + i) = pen->join; + i += sizeof(DWORD); + } + if (data_flags & PenDataMiterLimit) + { + *(REAL*)(pen_data->OptionalData + i) = pen->miterlimit; + i += sizeof(REAL); + } + if (data_flags & PenDataLineStyle) + { + switch (pen->style & PS_STYLE_MASK) + { + case PS_SOLID: *(DWORD*)(pen_data->OptionalData + i) = LineStyleSolid; break; + case PS_DASH: *(DWORD*)(pen_data->OptionalData + i) = LineStyleDash; break; + case PS_DOT: *(DWORD*)(pen_data->OptionalData + i) = LineStyleDot; break; + case PS_DASHDOT: *(DWORD*)(pen_data->OptionalData + i) = LineStyleDashDot; break; + case PS_DASHDOTDOT: *(DWORD*)(pen_data->OptionalData + i) = LineStyleDashDotDot; break; + default: *(DWORD*)(pen_data->OptionalData + i) = LineStyleCustom; break; + } + i += sizeof(DWORD); + } + if (data_flags & PenDataDashedLineCap) + { + *(DWORD*)(pen_data->OptionalData + i) = pen->dash; + i += sizeof(DWORD); + } + if (data_flags & PenDataDashedLineOffset) + { + *(REAL*)(pen_data->OptionalData + i) = pen->offset; + i += sizeof(REAL); + } + if (data_flags & PenDataDashedLine) + { + int j; + + *(DWORD*)(pen_data->OptionalData + i) = pen->numdashes; + i += sizeof(DWORD); + + for (j=0; j<pen->numdashes; j++) + { + *(REAL*)(pen_data->OptionalData + i) = pen->dashes[j]; + i += sizeof(REAL); + } + } + if (data_flags & PenDataNonCenter) + { + *(REAL*)(pen_data->OptionalData + i) = pen->align; + i += sizeof(DWORD); + } + + METAFILE_FillBrushData(pen->brush, + (EmfPlusBrush*)(object_record->ObjectData.pen.data + pen_data_size)); + return Ok; +} + GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) { DWORD path_id; + DWORD pen_id; GpStatus stat; FIXME("stub!\n"); + stat = METAFILE_AddPenObject(metafile, pen, &pen_id); + if (stat != Ok) return stat; + stat = METAFILE_AddPathObject(metafile, path, &path_id); if (stat != Ok) return stat; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 1d3a35d..7dd5234 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2487,7 +2487,7 @@ static const emfplus_record draw_path_records[] = { {0, EMR_HEADER}, {0, EmfPlusRecordTypeHeader}, {0, EmfPlusRecordTypeObject}, - {1, EmfPlusRecordTypeObject}, + {0, EmfPlusRecordTypeObject}, {1, EmfPlusRecordTypeDrawPath}, {1, EMR_SAVEDC}, {1, EMR_SETICMMODE},

1 0