wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

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

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

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

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

Austin English : ntoskrnl.exe: Add IoCreateNotificationEvent stub.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: b3a698e501832a072d358f7f2185e08830ad990f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a698e501832a072d358f7f2… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jul 6 15:41:08 2017 -0500 ntoskrnl.exe: Add IoCreateNotificationEvent stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 ++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 105bb7d..8d2c020 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3255,7 +3255,16 @@ KIRQL WINAPI KeAcquireSpinLockRaiseToDpc(KSPIN_LOCK *spinlock) /*********************************************************************** * KeReleaseSpinLock (NTOSKRNL.EXE.@) */ -VOID WINAPI KeReleaseSpinLock( KSPIN_LOCK *spinlock, KIRQL irql ) +void WINAPI KeReleaseSpinLock( KSPIN_LOCK *spinlock, KIRQL irql ) { FIXME( "stub: %p %u\n", spinlock, irql ); } + +/*********************************************************************** + * IoCreateNotificationEvent (NTOSKRNL.EXE.@) + */ +PKEVENT WINAPI IoCreateNotificationEvent(UNICODE_STRING *name, HANDLE *handle) +{ + FIXME( "stub: %s %p\n", debugstr_us(name), handle ); + return NULL; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 339e7c5..ae2f335 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -343,7 +343,7 @@ @ stdcall IoCreateDriver(ptr ptr) @ stdcall IoCreateFile(ptr long ptr ptr ptr long long long long ptr long long ptr long) @ stub IoCreateFileSpecifyDeviceObjectHint -@ stub IoCreateNotificationEvent +@ stdcall IoCreateNotificationEvent(ptr ptr) @ stub IoCreateStreamFileObject @ stub IoCreateStreamFileObjectEx @ stub IoCreateStreamFileObjectLite

1 0

Jactry Zeng : powershell: Add a stub program.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 54dc788b114250717e83947c3fd391bfd4ee87d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54dc788b114250717e83947c3… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Jun 28 15:45:30 2017 +0800 powershell: Add a stub program. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/powershell/Makefile.in | 5 +++++ programs/powershell/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/configure b/configure index 95cfa25..f334749 100755 --- a/configure +++ b/configure @@ -1599,6 +1599,7 @@ enable_notepad enable_oleview enable_ping enable_plugplay +enable_powershell enable_presentationfontcache enable_progman enable_reg @@ -18868,6 +18869,7 @@ wine_fn_config_program notepad enable_notepad clean,install,installbin,manpage wine_fn_config_program oleview enable_oleview clean,install wine_fn_config_program ping enable_ping install wine_fn_config_program plugplay enable_plugplay install +wine_fn_config_program powershell enable_powershell install wine_fn_config_program presentationfontcache enable_presentationfontcache install wine_fn_config_program progman enable_progman clean,install wine_fn_config_program reg enable_reg clean,install diff --git a/configure.ac b/configure.ac index 77b04b9..bae5ba0 100644 --- a/configure.ac +++ b/configure.ac @@ -3693,6 +3693,7 @@ WINE_CONFIG_PROGRAM(notepad,,[clean,install,installbin,manpage]) WINE_CONFIG_PROGRAM(oleview,,[clean,install]) WINE_CONFIG_PROGRAM(ping,,[install]) WINE_CONFIG_PROGRAM(plugplay,,[install]) +WINE_CONFIG_PROGRAM(powershell,,[install]) WINE_CONFIG_PROGRAM(presentationfontcache,,[install]) WINE_CONFIG_PROGRAM(progman,,[clean,install]) WINE_CONFIG_PROGRAM(reg,,[clean,install]) diff --git a/programs/powershell/Makefile.in b/programs/powershell/Makefile.in new file mode 100644 index 0000000..8a8c319 --- /dev/null +++ b/programs/powershell/Makefile.in @@ -0,0 +1,5 @@ +MODULE = powershell.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c diff --git a/programs/powershell/main.c b/programs/powershell/main.c new file mode 100644 index 0000000..d39cdc0 --- /dev/null +++ b/programs/powershell/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2017 Jactry Zeng 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(powershell); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Jens Reyer : make_unicode: Use VerticalOrientation.txt from UCD.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: ebbbe85038a6fcaf8d0f24dd3f66d40af3c8d954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebbbe85038a6fcaf8d0f24dd3… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Sat Jul 8 15:45:51 2017 +0200 make_unicode: Use VerticalOrientation.txt from UCD. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/vertical.c | 24 +++++++++++++----------- dlls/wineps.drv/vertical.c | 24 +++++++++++++----------- tools/make_unicode | 5 ++--- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/vertical.c b/dlls/gdi32/vertical.c index 33309f9..0573760 100644 --- a/dlls/gdi32/vertical.c +++ b/dlls/gdi32/vertical.c @@ -1,10 +1,10 @@ /* Unicode Vertical Orientation */ -/* generated from http://www.unicode.org/Public/vertical/revision-15/VerticalOrientation-15.t… */ +/* generated from http://www.unicode.org/Public/10.0.0/ucd/VerticalOrientation.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" -const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] = +const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, @@ -71,23 +71,23 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] = 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0480, 0x0490, 0x02d0, 0x04a0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0450, 0x02d0, 0x0280, 0x0280, 0x0470, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x04b0, 0x02d0, 0x02d0, 0x04c0, 0x02d0, + 0x0280, 0x0280, 0x0280, 0x04b0, 0x02d0, 0x04c0, 0x04d0, 0x02d0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x04d0, 0x04e0, 0x02d0, 0x04f0, 0x0500, 0x02d0, 0x0510, 0x02d0, - 0x0520, 0x0530, 0x0540, 0x02d0, 0x0510, 0x02d0, 0x0520, 0x0550, - 0x02d0, 0x02d0, 0x0560, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0570, - 0x0570, 0x0570, 0x0570, 0x0570, 0x0570, 0x0580, 0x02d0, 0x0590, + 0x04e0, 0x04f0, 0x02d0, 0x0500, 0x0510, 0x02d0, 0x0520, 0x02d0, + 0x0530, 0x0540, 0x0550, 0x02d0, 0x0520, 0x02d0, 0x0530, 0x0560, + 0x02d0, 0x02d0, 0x0570, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, + 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0580, + 0x0580, 0x0580, 0x0580, 0x0580, 0x0580, 0x0590, 0x02d0, 0x05a0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x02d0, 0x02d0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x02d0, 0x0280, 0x02d0, 0x05a0, 0x05b0, 0x05c0, 0x0280, + 0x0280, 0x02d0, 0x0280, 0x02d0, 0x05b0, 0x05c0, 0x05d0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x05d0, 0x05e0, 0x02d0, 0x05f0, 0x02d0, 0x0600, 0x0610, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0620, 0x0630, + 0x05e0, 0x05f0, 0x02d0, 0x0600, 0x02d0, 0x0610, 0x0620, 0x0280, + 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0630, 0x0640, /* values */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -161,6 +161,8 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0003, 0x0003, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, diff --git a/dlls/wineps.drv/vertical.c b/dlls/wineps.drv/vertical.c index 33309f9..0573760 100644 --- a/dlls/wineps.drv/vertical.c +++ b/dlls/wineps.drv/vertical.c @@ -1,10 +1,10 @@ /* Unicode Vertical Orientation */ -/* generated from http://www.unicode.org/Public/vertical/revision-15/VerticalOrientation-15.t… */ +/* generated from http://www.unicode.org/Public/10.0.0/ucd/VerticalOrientation.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" -const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] = +const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, @@ -71,23 +71,23 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] = 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0480, 0x0490, 0x02d0, 0x04a0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0450, 0x02d0, 0x0280, 0x0280, 0x0470, 0x0280, 0x0280, - 0x0280, 0x0280, 0x0280, 0x04b0, 0x02d0, 0x02d0, 0x04c0, 0x02d0, + 0x0280, 0x0280, 0x0280, 0x04b0, 0x02d0, 0x04c0, 0x04d0, 0x02d0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x04d0, 0x04e0, 0x02d0, 0x04f0, 0x0500, 0x02d0, 0x0510, 0x02d0, - 0x0520, 0x0530, 0x0540, 0x02d0, 0x0510, 0x02d0, 0x0520, 0x0550, - 0x02d0, 0x02d0, 0x0560, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, - 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0570, - 0x0570, 0x0570, 0x0570, 0x0570, 0x0570, 0x0580, 0x02d0, 0x0590, + 0x04e0, 0x04f0, 0x02d0, 0x0500, 0x0510, 0x02d0, 0x0520, 0x02d0, + 0x0530, 0x0540, 0x0550, 0x02d0, 0x0520, 0x02d0, 0x0530, 0x0560, + 0x02d0, 0x02d0, 0x0570, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, + 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0580, + 0x0580, 0x0580, 0x0580, 0x0580, 0x0580, 0x0590, 0x02d0, 0x05a0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x02d0, 0x02d0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x0280, 0x02d0, 0x0280, 0x02d0, 0x05a0, 0x05b0, 0x05c0, 0x0280, + 0x0280, 0x02d0, 0x0280, 0x02d0, 0x05b0, 0x05c0, 0x05d0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, - 0x05d0, 0x05e0, 0x02d0, 0x05f0, 0x02d0, 0x0600, 0x0610, 0x0280, - 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0620, 0x0630, + 0x05e0, 0x05f0, 0x02d0, 0x0600, 0x02d0, 0x0610, 0x0620, 0x0280, + 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0630, 0x0640, /* values */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -161,6 +161,8 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0003, 0x0003, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, diff --git a/tools/make_unicode b/tools/make_unicode index 059c751..92b0b64 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -26,7 +26,6 @@ my $MAPPINGS = "http://www.unicode.org/Public/MAPPINGS"; my $UNIDATA = "http://www.unicode.org/Public/10.0.0/ucd"; my $REPORTS = "http://www.unicode.org/reports"; my $RFCS = "http://www.rfc-editor.org/rfc"; -my $VERTICALDATA = "http://www.unicode.org/Public/vertical/revision-15"; # Sort keys file my $SORTKEYS = "tr10/allkeys.txt"; @@ -1673,7 +1672,7 @@ sub dump_vertical($) my $filename = shift; my @vertical_table; - my $INPUT = open_data_file( $VERTICALDATA, "VerticalOrientation-15.txt" ); + my $INPUT = open_data_file( $UNIDATA, "VerticalOrientation.txt" ); while (<$INPUT>) { next if /^\#/; # skip comments @@ -1706,7 +1705,7 @@ sub dump_vertical($) open OUTPUT,">$filename.new" or die "Cannot create $filename"; print "Building $filename\n"; print OUTPUT "/* Unicode Vertical Orientation */\n"; - print OUTPUT "/* generated from $VERTICALDATA/VerticalOrientation-15.txt */\n"; + print OUTPUT "/* generated from $UNIDATA/VerticalOrientation.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n";

1 0

Jens Reyer : make_unicode: Update data tables to Unicode 10.0.0.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: b736dbe933465562e1225f541b59846276b67c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b736dbe933465562e1225f541… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Sat Jul 8 15:45:50 2017 +0200 make_unicode: Update data tables to Unicode 10.0.0. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bracket.c | 2 +- dlls/dwrite/linebreak.c | 214 ++++++++++++++++--------------- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 308 ++++++++++++++++++++++----------------------- dlls/dwrite/scripts.h | 2 +- dlls/usp10/bracket.c | 2 +- dlls/usp10/indicsyllable.c | 86 ++++++------- dlls/usp10/linebreak.c | 214 ++++++++++++++++--------------- dlls/usp10/mirror.c | 2 +- dlls/usp10/shaping.c | 116 +++++++++-------- libs/port/compose.c | 2 +- libs/port/decompose.c | 2 +- libs/port/digitmap.c | 2 +- libs/wine/casemap.c | 2 +- libs/wine/wctype.c | 38 +++--- tools/make_unicode | 5 +- 16 files changed, 501 insertions(+), 498 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b736dbe933465562e1225…

1 0

Józef Kucia : d3d11/tests: Add test for swapc instruction.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: 555dbd1ccda406eb61b71595dd686341debaed5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=555dbd1ccda406eb61b71595d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 13 00:35:47 2017 +0200 d3d11/tests: Add test for swapc instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 274 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 274 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=555dbd1ccda406eb61b71…

1 0

Józef Kucia : wined3d: Implement SM5 swapc instruction.
by Alexandre Julliard 13 Jul '17

13 Jul '17

Module: wine Branch: master Commit: af80b7afdd51c89fd7423a687dd7213f32a1f87b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af80b7afdd51c89fd7423a687… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 13 00:35:46 2017 +0200 wined3d: Implement SM5 swapc instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 54 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1bd3a66..650f8ad 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4353,6 +4353,58 @@ static void shader_glsl_compare(const struct wined3d_shader_instruction *ins) } } +static void shader_glsl_swapc(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct wined3d_shader_dst_param dst[2]; + struct glsl_src_param src[3]; + unsigned int i, j, k; + char mask_char[6]; + DWORD write_mask; + BOOL tmp_dst[2]; + + for (i = 0; i < ins->dst_count; ++i) + { + tmp_dst[i] = FALSE; + for (j = 0; j < ins->src_count; ++j) + { + if (ins->dst[i].reg.idx[0].offset == ins->src[j].reg.idx[0].offset + && ins->dst[i].reg.type == ins->src[j].reg.type) + tmp_dst[i] = TRUE; + } + } + + dst[0] = ins->dst[0]; + dst[1] = ins->dst[1]; + for (i = 0; i < 4; ++i) + { + for (j = 0; j < ARRAY_SIZE(dst); ++j) + { + dst[j].write_mask = ins->dst[j].write_mask & (WINED3DSP_WRITEMASK_0 << i); + if (tmp_dst[j] && (write_mask = shader_glsl_get_write_mask(&dst[j], mask_char))) + shader_addline(buffer, "tmp%u%s = (", j, mask_char); + else if (!(write_mask = shader_glsl_append_dst_ext(buffer, ins, &dst[j], dst[j].reg.data_type))) + continue; + + for (k = 0; k < ARRAY_SIZE(src); ++k) + shader_glsl_add_src_param(ins, &ins->src[k], write_mask, &src[k]); + + shader_addline(buffer, "%sbool(%s) ? %s : %s);\n", !j ? "!" : "", + src[0].param_str, src[1].param_str, src[2].param_str); + } + } + + for (i = 0; i < ARRAY_SIZE(tmp_dst); ++i) + { + if (tmp_dst[i]) + { + shader_glsl_get_write_mask(&ins->dst[i], mask_char); + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[i], ins->dst[i].reg.data_type); + shader_addline(ins->ctx->buffer, "tmp%u%s);\n", i, mask_char); + } + } +} + static void shader_glsl_conditional_move(const struct wined3d_shader_instruction *ins) { const char *condition_prefix, *condition_suffix; @@ -10805,7 +10857,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_STORE_STRUCTURED */ shader_glsl_store_raw_structured, /* WINED3DSIH_STORE_UAV_TYPED */ shader_glsl_store_uav, /* WINED3DSIH_SUB */ shader_glsl_binop, - /* WINED3DSIH_SWAPC */ NULL, + /* WINED3DSIH_SWAPC */ shader_glsl_swapc, /* WINED3DSIH_SWITCH */ shader_glsl_switch, /* WINED3DSIH_SYNC */ shader_glsl_sync, /* WINED3DSIH_TEX */ shader_glsl_tex,

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
64
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 July 2017