wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Daniel Lehman : vcruntime140_1: Support unwind handler with frame.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 7f0f3be020af5cf06d783cd11d92c63ba34bc9b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0f3be020af5cf06d783cd1… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jun 3 11:07:45 2020 +0200 vcruntime140_1: Support unwind handler with frame. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index e1a39c0662..2c1ed63152 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -53,7 +53,7 @@ typedef struct typedef struct { - UINT flags; + UINT type; BYTE *prev; UINT handler; UINT object; @@ -77,6 +77,10 @@ typedef struct #define TYPE_FLAG_VOLATILE 2 #define TYPE_FLAG_REFERENCE 8 +#define UNWIND_TYPE_NO_HANDLER 0 +#define UNWIND_TYPE_DTOR_OBJ 1 +#define UNWIND_TYPE_FRAME 3 + typedef struct { UINT start_level; @@ -161,22 +165,25 @@ static BOOL read_unwind_info(BYTE **b, unwind_info *ui) BYTE *p = *b; memset(ui, 0, sizeof(*ui)); - ui->flags = decode_uint(b); - ui->prev = p - (ui->flags >> 2); - ui->flags &= 0x3; + ui->type = decode_uint(b); + ui->prev = p - (ui->type >> 2); + ui->type &= 0x3; - if (ui->flags & 0x1) + switch (ui->type) { + case UNWIND_TYPE_NO_HANDLER: + return TRUE; + case UNWIND_TYPE_DTOR_OBJ: ui->handler = read_rva(b); ui->object = decode_uint(b); /* frame offset */ - } - - if (ui->flags & 0x2) - { - FIXME("unknown flag: %x\n", ui->flags); + return TRUE; + case UNWIND_TYPE_FRAME: + ui->handler = read_rva(b); + return TRUE; + default: + FIXME("unknown type: %d\n", ui->type); return FALSE; } - return TRUE; } static void read_tryblock_info(BYTE **b, tryblock_info *ti, ULONG64 image_base) @@ -270,8 +277,8 @@ static BOOL validate_cxx_function_descr4(const cxx_function_descr *descr, DISPAT if (!read_unwind_info(&unwind_map, &ui)) return FALSE; if (ui.prev < (BYTE*)rva_to_ptr(descr->unwind_map, image_base)) ui.prev = NULL; - TRACE(" %d (%p): flags 0x%x prev %p func 0x%x(%p) object 0x%x\n", - i, entry, ui.flags, ui.prev, ui.handler, + TRACE(" %d (%p): type 0x%x prev %p func 0x%x(%p) object 0x%x\n", + i, entry, ui.type, ui.prev, ui.handler, rva_to_ptr(ui.handler, image_base), ui.object); } @@ -403,7 +410,7 @@ static inline void copy_exception(void *object, ULONG64 frame, DISPATCHER_CONTEX static void cxx_local_unwind4(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr, int trylevel, int last_level) { - void (__cdecl *handler_dtor)(void *obj); + void (__cdecl *handler_dtor)(void *obj, ULONG64 frame); BYTE *unwind_data, *last; unwind_info ui; void *obj; @@ -442,7 +449,7 @@ static void cxx_local_unwind4(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, handler_dtor = rva_to_ptr(ui.handler, dispatch->ImageBase); obj = rva_to_ptr(ui.object, frame); TRACE("handler: %p object: %p\n", handler_dtor, obj); - handler_dtor(obj); + handler_dtor(obj, frame); } } }

1 0

Hans Leidekker : bcrypt: Add support for importing and exporting DSS private keys.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 7cf9a75dfa77de408261aef689c8f60fee17e46e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cf9a75dfa77de408261aef6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 3 10:50:37 2020 +0200 bcrypt: Add support for importing and exporting DSS private keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 6 +++ dlls/bcrypt/bcrypt_main.c | 47 ++++++++++++++++++ dlls/bcrypt/gnutls.c | 112 ++++++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 36 ++++++++++++++ include/bcrypt.h | 12 +++++ 5 files changed, 213 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7cf9a75dfa77de408261…

1 0

Vijay Kiran Kamuju : winspool.drv: Implement AddPrintProcessorA via AddPrintProcessorW.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 992a0ae7b90d92bcda52d82672ece1d3c7d4b0ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=992a0ae7b90d92bcda52d826… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jun 3 09:42:49 2020 +0100 winspool.drv: Implement AddPrintProcessorA via AddPrintProcessorW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26171 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 593f091c2d..1a8d572f43 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5403,9 +5403,25 @@ BOOL WINAPI AddPrinterDriverW(LPWSTR pName, DWORD level, LPBYTE pDriverInfo) BOOL WINAPI AddPrintProcessorA(LPSTR pName, LPSTR pEnvironment, LPSTR pPathName, LPSTR pPrintProcessorName) { - FIXME("(%s,%s,%s,%s): stub\n", debugstr_a(pName), debugstr_a(pEnvironment), + UNICODE_STRING NameW, EnvW, PathW, ProcessorW; + BOOL ret; + + TRACE("(%s,%s,%s,%s)\n", debugstr_a(pName), debugstr_a(pEnvironment), debugstr_a(pPathName), debugstr_a(pPrintProcessorName)); - return FALSE; + + asciitounicode(&NameW, pName); + asciitounicode(&EnvW, pEnvironment); + asciitounicode(&PathW, pPathName); + asciitounicode(&ProcessorW, pPrintProcessorName); + + ret = AddPrintProcessorW(NameW.Buffer, EnvW.Buffer, PathW.Buffer, ProcessorW.Buffer); + + RtlFreeUnicodeString(&ProcessorW); + RtlFreeUnicodeString(&PathW); + RtlFreeUnicodeString(&EnvW); + RtlFreeUnicodeString(&NameW); + + return ret; } /*****************************************************************************

1 0

Alexandre Julliard : ntdll: Move more of the thread exit code to the Unix library.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: f1d40d4824b568389cbc328cebb5734430b52e44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1d40d4824b568389cbc328c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 21:26:47 2020 +0200 ntdll: Move more of the thread exit code to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 17 ----------------- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/thread.c | 14 ++++++++++++++ dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 2 +- dlls/ntdll/unixlib.h | 3 +-- 6 files changed, 17 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index d7386f2ab1..d5e34cae3b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -284,9 +284,6 @@ TEB *thread_init(void) */ void WINAPI RtlExitUserThread( ULONG status ) { - static void *prev_teb; - TEB *teb; - if (status) /* send the exit code to the server (0 is already the default) */ { SERVER_START_REQ( terminate_thread ) @@ -306,20 +303,6 @@ void WINAPI RtlExitUserThread( ULONG status ) LdrShutdownThread(); RtlFreeThreadActivationContextStack(); - - pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - - if ((teb = InterlockedExchangePointer( &prev_teb, NtCurrentTeb() ))) - { - struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; - - if (thread_data->pthread_id) - { - pthread_join( thread_data->pthread_id, NULL ); - unix_funcs->virtual_free_teb( teb ); - } - } - for (;;) unix_funcs->exit_thread( status ); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 30e1fa61b4..1297c451a1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1017,7 +1017,6 @@ static struct unix_funcs unix_funcs = virtual_get_system_info, virtual_create_builtin_view, virtual_alloc_first_teb, - virtual_free_teb, virtual_alloc_thread_stack, virtual_handle_fault, virtual_locked_server_call, diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index eaed27f4b2..205a1312e9 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -218,7 +218,21 @@ void CDECL abort_thread( int status ) */ void CDECL exit_thread( int status ) { + static void *prev_teb; + TEB *teb; + pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); + + if ((teb = InterlockedExchangePointer( &prev_teb, NtCurrentTeb() ))) + { + struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; + + if (thread_data->pthread_id) + { + pthread_join( thread_data->pthread_id, NULL ); + virtual_free_teb( teb ); + } + } signal_exit_thread( status, pthread_exit_wrapper ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index eeadf33f1c..14c4ee4cd9 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -63,7 +63,6 @@ extern NTSTATUS CDECL virtual_map_section( HANDLE handle, PVOID *addr_ptr, unsig extern void CDECL virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL virtual_create_builtin_view( void *module ) DECLSPEC_HIDDEN; extern TEB * CDECL virtual_alloc_first_teb(void) DECLSPEC_HIDDEN; -extern void CDECL virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL virtual_alloc_thread_stack( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) DECLSPEC_HIDDEN; extern unsigned int CDECL virtual_locked_server_call( void *req_ptr ) DECLSPEC_HIDDEN; @@ -134,6 +133,7 @@ extern NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOO extern NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int flags, BOOL *self ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_teb( TEB **ret_teb ) DECLSPEC_HIDDEN; +extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_threading(void) DECLSPEC_HIDDEN; extern NTSTATUS signal_alloc_thread( TEB *teb ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index b32a004dae..58ecaa6fc4 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2628,7 +2628,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) /*********************************************************************** * virtual_free_teb */ -void CDECL virtual_free_teb( TEB *teb ) +void virtual_free_teb( TEB *teb ) { struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; SIZE_T size; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index a72cd72dc7..67c63fd926 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct ldt_copy; struct msghdr; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 18 +#define NTDLL_UNIXLIB_VERSION 19 struct unix_funcs { @@ -92,7 +92,6 @@ struct unix_funcs void (CDECL *virtual_get_system_info)( SYSTEM_BASIC_INFORMATION *info ); NTSTATUS (CDECL *virtual_create_builtin_view)( void *module ); TEB * (CDECL *virtual_alloc_first_teb)(void); - void (CDECL *virtual_free_teb)( TEB *teb ); NTSTATUS (CDECL *virtual_alloc_thread_stack)( INITIAL_TEB *stack, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ); NTSTATUS (CDECL *virtual_handle_fault)( LPCVOID addr, DWORD err, BOOL on_signal_stack ); unsigned int (CDECL *virtual_locked_server_call)( void *req_ptr );

1 0

Alexandre Julliard : ntdll: Move the thread creation code to the Unix library.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 35b063a404457fdf956d1913738a3c8a66266cb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35b063a404457fdf956d1913… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 21:09:13 2020 +0200 ntdll: Move the thread creation code to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 8 ---- dlls/ntdll/thread.c | 106 ++++------------------------------------- dlls/ntdll/unix/loader.c | 3 +- dlls/ntdll/unix/thread.c | 94 ++++++++++++++++++++++++++++++++++-- dlls/ntdll/unix/unix_private.h | 7 ++- dlls/ntdll/unix/virtual.c | 2 +- dlls/ntdll/unixlib.h | 7 +-- 7 files changed, 110 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35b063a404457fdf956d…

1 0

Alexandre Julliard : ntdll: Move the thread startup code to the Unix library.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: be0eb9c92eb7a4fcd9d0d48568c8ed5e8326ef0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0eb9c92eb7a4fcd9d0d485… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 16:32:02 2020 +0200 ntdll: Move the thread startup code to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 26 ---- dlls/ntdll/process.c | 2 +- dlls/ntdll/server.c | 2 +- dlls/ntdll/signal_arm.c | 106 --------------- dlls/ntdll/signal_arm64.c | 144 --------------------- dlls/ntdll/signal_i386.c | 276 ---------------------------------------- dlls/ntdll/signal_powerpc.c | 90 ------------- dlls/ntdll/signal_x86_64.c | 130 ------------------- dlls/ntdll/thread.c | 74 ++++++++++- dlls/ntdll/unix/loader.c | 3 +- dlls/ntdll/unix/signal_arm.c | 63 +++++++++ dlls/ntdll/unix/signal_arm64.c | 103 +++++++++++++++ dlls/ntdll/unix/signal_i386.c | 88 +++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 84 ++++++++++++ dlls/ntdll/unix/thread.c | 33 ++++- dlls/ntdll/unix/unix_private.h | 8 +- dlls/ntdll/unix/virtual.c | 15 +++ dlls/ntdll/unixlib.h | 5 +- dlls/ntdll/virtual.c | 27 ---- 19 files changed, 467 insertions(+), 812 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be0eb9c92eb7a4fcd9d0…

1 0

Alexandre Julliard : kernel32: Move SetConsoleCtrlHandler() implementation to kernelbase.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 11217ee628a675c8dfe62fe1280e36be83d8dc7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=11217ee628a675c8dfe62fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 10:20:09 2020 +0200 kernel32: Move SetConsoleCtrlHandler() implementation to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 148 +--------------------------------------- dlls/kernel32/kernel32.spec | 4 +- dlls/kernelbase/console.c | 105 ++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 4 +- 4 files changed, 111 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11217ee628a675c8dfe6…

1 0

Biswapriyo Nath : include: Add missing structures in dcommon.idl.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 48020f4846cca1a02f4e1dc037e2cc2068df5e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=48020f4846cca1a02f4e1dc0… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri May 15 19:10:41 2020 +0530 include: Add missing structures in dcommon.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 4 +-- dlls/d2d1/device.c | 4 +-- dlls/d2d1/geometry.c | 4 +-- dlls/d2d1/state_block.c | 4 +-- dlls/d2d1/tests/d2d1.c | 64 +++++++++++++++++------------------ include/d2dbasetypes.h | 10 ------ include/dcommon.idl | 89 ++++++++++++++++++++++++++++++++++++++++++++++++- 7 files changed, 128 insertions(+), 51 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 1f455897f6..07d2e26a14 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -237,11 +237,11 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, enum d2d_brush_type type, const D2D1_BRUSH_PROPERTIES *desc, const struct ID2D1BrushVtbl *vtbl) { static const D2D1_MATRIX_3X2_F identity = - { + {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, - }; + }}}; brush->ID2D1Brush_iface.lpVtbl = vtbl; brush->refcount = 1; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index acecb2058a..3c8431ce8f 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -23,11 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); #define INITIAL_CLIP_STACK_SIZE 4 static const D2D1_MATRIX_3X2_F identity = -{ +{{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, -}; +}}}; struct d2d_draw_text_layout_ctx { diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 9c5e653f56..c32de31035 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -30,11 +30,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); #define D2D_FP_EPS (1.0f / (1 << FLT_MANT_DIG)) static const D2D1_MATRIX_3X2_F identity = -{ +{{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, -}; +}}}; enum d2d_cdt_edge_next { diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index e3175146a6..501d94ae3e 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -165,11 +165,11 @@ void d2d_state_block_init(struct d2d_state_block *state_block, ID2D1Factory *fac const D2D1_DRAWING_STATE_DESCRIPTION1 *desc, IDWriteRenderingParams *text_rendering_params) { static const D2D1_MATRIX_3X2_F identity = - { + {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, - }; + }}}; state_block->ID2D1DrawingStateBlock1_iface.lpVtbl = &d2d_state_block_vtbl; state_block->refcount = 1; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7c0ee91099..87c87324f3 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1096,11 +1096,11 @@ static void test_clip(void) HRESULT hr; BOOL match; static const D2D1_MATRIX_3X2_F identity = - { + {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, - }; + }}}; if (!(device = create_device())) { @@ -1302,23 +1302,23 @@ static void test_state_block(void) HWND window; HRESULT hr; static const D2D1_MATRIX_3X2_F identity = - { + {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, - }; + }}}; static const D2D1_MATRIX_3X2_F transform1 = - { + {{{ 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, - }; + }}}; static const D2D1_MATRIX_3X2_F transform2 = - { + {{{ 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, - }; + }}}; if (!(device = create_device())) { @@ -8613,57 +8613,57 @@ static void test_invert_matrix(void) } invert_tests[] = { - { { 0 }, { 0 }, FALSE }, + { {{{ 0 }}}, {{{ 0 }}}, FALSE }, { - { + {{{ 1.0f, 2.0f, 1.0f, 2.0f, 4.0f, 8.0f - }, - { + }}}, + {{{ 1.0f, 2.0f, 1.0f, 2.0f, 4.0f, 8.0f - }, + }}}, FALSE }, { - { + {{{ 2.0f, 0.0f, 0.0f, 2.0f, 4.0f, 8.0f - }, - { + }}}, + {{{ 0.5f, -0.0f, -0.0f, 0.5f, -2.0f, -4.0f - }, + }}}, TRUE }, { - { + {{{ 2.0f, 1.0f, 2.0f, 2.0f, 4.0f, 8.0f - }, - { + }}}, + {{{ 1.0f, -0.5f, -1.0f, 1.0f, 4.0f, -6.0f - }, + }}}, TRUE }, { - { + {{{ 2.0f, 1.0f, 3.0f, 1.0f, 4.0f, 8.0f - }, - { + }}}, + {{{ -1.0f, 1.0f, 3.0f, -2.0f, -20.0f, 12.0f - }, + }}}, TRUE }, }; @@ -8697,13 +8697,13 @@ static void test_skew_matrix(void) } skew_tests[] = { - { 0.0f, 0.0f, { 0.0f, 0.0f }, { 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f } }, - { 45.0f, 0.0f, { 0.0f, 0.0f }, { 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f } }, - { 0.0f, 0.0f, { 10.0f, -3.0f }, { 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f } }, - { -45.0f, 45.0f, { 0.1f, 0.5f }, { 1.0f, 1.0f, -1.0f, 1.0f, 0.5f, -0.1f } }, - { -45.0f, 45.0f, { 1.0f, 2.0f }, { 1.0f, 1.0f, -1.0f, 1.0f, 2.0f, -1.0f } }, - { 45.0f, -45.0f, { 1.0f, 2.0f }, { 1.0f, -1.0f, 1.0f, 1.0f, -2.0f, 1.0f } }, - { 30.0f, -60.0f, { 12.0f, -5.0f }, { 1.0f, -1.7320509f, 0.577350259f, 1.0f, 2.88675117f, 20.7846107f } }, + { 0.0f, 0.0f, { 0.0f, 0.0f }, {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f }}} }, + { 45.0f, 0.0f, { 0.0f, 0.0f }, {{{ 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f }}} }, + { 0.0f, 0.0f, { 10.0f, -3.0f }, {{{ 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f }}} }, + { -45.0f, 45.0f, { 0.1f, 0.5f }, {{{ 1.0f, 1.0f, -1.0f, 1.0f, 0.5f, -0.1f }}} }, + { -45.0f, 45.0f, { 1.0f, 2.0f }, {{{ 1.0f, 1.0f, -1.0f, 1.0f, 2.0f, -1.0f }}} }, + { 45.0f, -45.0f, { 1.0f, 2.0f }, {{{ 1.0f, -1.0f, 1.0f, 1.0f, -2.0f, 1.0f }}} }, + { 30.0f, -60.0f, { 12.0f, -5.0f }, {{{ 1.0f, -1.7320509f, 0.577350259f, 1.0f, 2.88675117f, 20.7846107f }}} }, }; unsigned int i; diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index b231081647..a160a89021 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -29,16 +29,6 @@ typedef struct D3DCOLORVALUE typedef D3DCOLORVALUE D2D_COLOR_F; -typedef struct D2D_MATRIX_3X2_F -{ - float _11; - float _12; - float _21; - float _22; - float _31; - float _32; -} D2D_MATRIX_3X2_F; - typedef struct D2D_RECT_F { float left; diff --git a/include/dcommon.idl b/include/dcommon.idl index 53281bd487..43c82eb8a7 100644 --- a/include/dcommon.idl +++ b/include/dcommon.idl @@ -23,6 +23,12 @@ typedef struct { long x, y; } POINT; + +typedef struct +{ + long left, top, right, bottom; +} RECT; + typedef unsigned int UINT32; cpp_quote("#endif") @@ -52,7 +58,7 @@ typedef enum D2D1_ALPHA_MODE D2D1_ALPHA_MODE_PREMULTIPLIED = 1, D2D1_ALPHA_MODE_STRAIGHT = 2, D2D1_ALPHA_MODE_IGNORE = 3, - D2D1_ALPHA_MODE_FORCE_DWORD = 0xffffffff, + D2D1_ALPHA_MODE_FORCE_DWORD = 0xffffffff } D2D1_ALPHA_MODE; typedef struct D2D1_PIXEL_FORMAT @@ -69,12 +75,76 @@ typedef struct D2D_POINT_2F typedef POINT D2D_POINT_2L, D2D1_POINT_2L; +typedef struct D2D_VECTOR_2F +{ + float x; + float y; +} D2D_VECTOR_2F; + +typedef struct D2D_VECTOR_3F +{ + float x; + float y; + float z; +} D2D_VECTOR_3F; + +typedef struct D2D_VECTOR_4F +{ + float x; + float y; + float z; + float w; +} D2D_VECTOR_4F; + +typedef RECT D2D_RECT_L, D2D1_RECT_L; + typedef struct D2D_SIZE_U { UINT32 width; UINT32 height; } D2D_SIZE_U, D2D1_SIZE_U; +typedef struct D2D_MATRIX_3X2_F +{ + union + { + struct + { + float m11; + float m12; + float m21; + float m22; + float dx; + float dy; + }; + + struct + { + float _11, _12; + float _21, _22; + float _31, _32; + }; + + float m[3][2]; + }; +} D2D_MATRIX_3X2_F; + +typedef struct D2D_MATRIX_4X3_F +{ + union + { + struct + { + float _11, _12, _13; + float _21, _22, _23; + float _31, _32, _33; + float _41, _42, _43; + }; + + float m[4][3]; + }; +} D2D_MATRIX_4X3_F; + typedef struct D2D_MATRIX_4X4_F { union @@ -90,3 +160,20 @@ typedef struct D2D_MATRIX_4X4_F float m[4][4]; }; } D2D_MATRIX_4X4_F; + +typedef struct D2D_MATRIX_5X4_F +{ + union + { + struct + { + float _11, _12, _13, _14; + float _21, _22, _23, _24; + float _31, _32, _33, _34; + float _41, _42, _43, _44; + float _51, _52, _53, _54; + }; + + float m[5][4]; + }; +} D2D_MATRIX_5X4_F;

1 0

Vijay Kiran Kamuju : ole2.dll16: Add stub OleIsCurrentClipboard function.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 9c95434095630aa1ed4f1ae3763424f09f423575 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c95434095630aa1ed4f1ae3… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Jun 2 18:02:50 2020 +0200 ole2.dll16: Add stub OleIsCurrentClipboard function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=7102 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2.dll16/ole2.c | 9 +++++++++ dlls/ole2.dll16/ole2.dll16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 5e6142fc96..04b40b0863 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -272,6 +272,15 @@ HRESULT WINAPI OleFlushClipboard16(void) return OleFlushClipboard(); } +/*********************************************************************** + * OleIsCurrentClipboard [OLE2.77] + */ +HRESULT WINAPI OleIsCurrentClipboard16(IDataObject* pDataObj) +{ + FIXME("(%p): stub\n", pDataObj); + return S_OK; +} + #define GET_SEGPTR_METHOD_ADDR(ifacename,segptr,methodname) \ ((SEGPTR)((const ifacename##Vtbl*)MapSL((SEGPTR)((ifacename*)MapSL(segptr))->lpVtbl))->methodname) diff --git a/dlls/ole2.dll16/ole2.dll16.spec b/dlls/ole2.dll16/ole2.dll16.spec index 108c3ee8f3..7aac6864e5 100644 --- a/dlls/ole2.dll16/ole2.dll16.spec +++ b/dlls/ole2.dll16/ole2.dll16.spec @@ -72,7 +72,7 @@ 74 stub READFMTUSERTYPESTG 75 stub WRITEFMTUSERTYPESTG 76 pascal -ret16 OleFlushClipboard() OleFlushClipboard16 -77 stub OLEISCURRENTCLIPBOARD +77 pascal OleIsCurrentClipboard(ptr) OleIsCurrentClipboard16 78 stub OLETRANSLATEACCELERATOR 79 pascal OleDoAutoConvert(ptr ptr) OleDoAutoConvert16 80 stub OLEGETAUTOCONVERT

1 0

Alexandre Julliard : ntdll: Use the local server_send_fd() function in the Unix library.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 9fe61171e515e7c77720675ecbe69731219b549c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fe61171e515e7c77720675e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 17:39:28 2020 +0200 ntdll: Use the local server_send_fd() function in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 5843cde23f..17b23e58d2 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1053,7 +1053,7 @@ NTSTATUS CDECL server_fd_to_handle( int fd, unsigned int access, unsigned int at NTSTATUS ret; *handle = 0; - wine_server_send_fd( fd ); + server_send_fd( fd ); SERVER_START_REQ( alloc_file_handle ) { @@ -1494,8 +1494,8 @@ size_t CDECL server_init_thread( void *entry_point, BOOL *suspend, unsigned int /* create the server->client communication pipes */ if (server_pipe( reply_pipe ) == -1) server_protocol_perror( "pipe" ); if (server_pipe( ntdll_get_thread_data()->wait_fd ) == -1) server_protocol_perror( "pipe" ); - wine_server_send_fd( reply_pipe[1] ); - wine_server_send_fd( ntdll_get_thread_data()->wait_fd[1] ); + server_send_fd( reply_pipe[1] ); + server_send_fd( ntdll_get_thread_data()->wait_fd[1] ); ntdll_get_thread_data()->reply_fd = reply_pipe[0]; close( reply_pipe[1] );

1 0

← Newer
1
...
75
76
77
78
79
80
81
...
95
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 June 2020