wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Alexandre Julliard : include: Add missing CONTEXT_ALL definitions.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: c3d78af9bb6ce09838f3a30f8df9279376c7dd3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3d78af9bb6ce09838f3a30f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 15:49:31 2018 +0100 include: Add missing CONTEXT_ALL definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 61 ++++++++++++++++++++++++++------------------------------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 1fb09b3..a9d718a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -914,42 +914,42 @@ typedef struct _FLOATING_SAVE_AREA typedef struct _CONTEXT { - DWORD ContextFlags; + DWORD ContextFlags; /* 000 */ /* These are selected by CONTEXT_DEBUG_REGISTERS */ - DWORD Dr0; - DWORD Dr1; - DWORD Dr2; - DWORD Dr3; - DWORD Dr6; - DWORD Dr7; + DWORD Dr0; /* 004 */ + DWORD Dr1; /* 008 */ + DWORD Dr2; /* 00c */ + DWORD Dr3; /* 010 */ + DWORD Dr6; /* 014 */ + DWORD Dr7; /* 018 */ /* These are selected by CONTEXT_FLOATING_POINT */ - FLOATING_SAVE_AREA FloatSave; + FLOATING_SAVE_AREA FloatSave; /* 01c */ /* These are selected by CONTEXT_SEGMENTS */ - DWORD SegGs; - DWORD SegFs; - DWORD SegEs; - DWORD SegDs; + DWORD SegGs; /* 08c */ + DWORD SegFs; /* 090 */ + DWORD SegEs; /* 094 */ + DWORD SegDs; /* 098 */ /* These are selected by CONTEXT_INTEGER */ - DWORD Edi; - DWORD Esi; - DWORD Ebx; - DWORD Edx; - DWORD Ecx; - DWORD Eax; + DWORD Edi; /* 09c */ + DWORD Esi; /* 0a0 */ + DWORD Ebx; /* 0a4 */ + DWORD Edx; /* 0a8 */ + DWORD Ecx; /* 0ac */ + DWORD Eax; /* 0b0 */ /* These are selected by CONTEXT_CONTROL */ - DWORD Ebp; - DWORD Eip; - DWORD SegCs; - DWORD EFlags; - DWORD Esp; - DWORD SegSs; - - BYTE ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; + DWORD Ebp; /* 0b4 */ + DWORD Eip; /* 0b8 */ + DWORD SegCs; /* 0bc */ + DWORD EFlags; /* 0c0 */ + DWORD Esp; /* 0c4 */ + DWORD SegSs; /* 0c8 */ + + BYTE ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; /* 0xcc */ } CONTEXT; #define CONTEXT_X86 0x00010000 @@ -1643,6 +1643,7 @@ typedef struct _CONTEXT #define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM | 0x00000008) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) +#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS) #define EXCEPTION_READ_FAULT 0 #define EXCEPTION_WRITE_FAULT 1 @@ -1742,13 +1743,6 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_ #endif /* __arm__ */ #ifdef __aarch64__ -/* - * FIXME: - * - * There is not yet an official CONTEXT structure defined for the AArch64 - * architecture, so I just made one up. - * - */ #define CONTEXT_ARM64 0x400000 #define CONTEXT_CONTROL (CONTEXT_ARM64 | 0x00000001) @@ -1757,6 +1751,7 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_ #define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM64 | 0x00000008) #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) +#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS) #define EXCEPTION_READ_FAULT 0 #define EXCEPTION_WRITE_FAULT 1

1 0

Alexandre Julliard : server: Only update the modified parts of the context on thread suspend.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 03d31ea81db4fe4ca3c534dc460115fb3cfeb9af URL: https://source.winehq.org/git/wine.git/?a=commit;h=03d31ea81db4fe4ca3c534dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 13:11:56 2018 +0100 server: Only update the modified parts of the context on thread suspend. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 7 ++++++- include/wine/server_protocol.h | 2 +- server/thread.c | 6 +++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index daca45a..f853810 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -110,6 +110,7 @@ void wait_suspend( CONTEXT *context ) LARGE_INTEGER timeout; int saved_errno = errno; context_t server_context; + DWORD flags = context->ContextFlags; context_to_server( &server_context, context ); @@ -130,10 +131,14 @@ void wait_suspend( CONTEXT *context ) { wine_server_set_reply( req, &server_context, sizeof(server_context) ); wine_server_call( req ); + if (wine_server_reply_size( reply )) + { + context_from_server( context, &server_context ); + context->ContextFlags |= flags; /* unchanged registers are still available */ + } } SERVER_END_REQ; - context_from_server( context, &server_context ); errno = saved_errno; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0d0d074..ba9f66f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -6496,6 +6496,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 547 +#define SERVER_PROTOCOL_VERSION 548 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/thread.c b/server/thread.c index 2f65c16..e313dfe 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1715,7 +1715,10 @@ DECL_HANDLER(get_suspend_context) if (current->suspend_context) { - set_reply_data_ptr( current->suspend_context, sizeof(context_t) ); + if (current->suspend_context->flags) + set_reply_data_ptr( current->suspend_context, sizeof(context_t) ); + else + free( current->suspend_context ); if (current->context == current->suspend_context) { current->context = NULL; @@ -1745,6 +1748,7 @@ DECL_HANDLER(set_suspend_context) else if ((current->suspend_context = mem_alloc( sizeof(context_t) ))) { memcpy( current->suspend_context, get_req_data(), sizeof(context_t) ); + current->suspend_context->flags = 0; /* to keep track of what is modified */ current->context = current->suspend_context; if (current->debug_break) break_thread( current ); }

1 0

Alexandre Julliard : wineandroid: Don' t allocate a window surface for off-screen windows.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: a6f85e616d127b4d0b9ca7ae5e5631177f355ed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6f85e616d127b4d0b9ca7ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 12:45:46 2018 +0100 wineandroid: Don't allocate a window surface for off-screen windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 568f5ab..22e2181 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1028,17 +1028,15 @@ static struct android_win_data *create_win_data( HWND hwnd, const RECT *window_r } -static inline RECT get_surface_rect( const RECT *visible_rect ) +static inline BOOL get_surface_rect( const RECT *visible_rect, RECT *surface_rect ) { - RECT rect; - - IntersectRect( &rect, visible_rect, &virtual_screen_rect ); - OffsetRect( &rect, -visible_rect->left, -visible_rect->top ); - rect.left &= ~31; - rect.top &= ~31; - rect.right = max( rect.left + 32, (rect.right + 31) & ~31 ); - rect.bottom = max( rect.top + 32, (rect.bottom + 31) & ~31 ); - return rect; + if (!IntersectRect( surface_rect, visible_rect, &virtual_screen_rect )) return FALSE; + OffsetRect( surface_rect, -visible_rect->left, -visible_rect->top ); + surface_rect->left &= ~31; + surface_rect->top &= ~31; + surface_rect->right = max( surface_rect->left + 32, (surface_rect->right + 31) & ~31 ); + surface_rect->bottom = max( surface_rect->top + 32, (surface_rect->bottom + 31) & ~31 ); + return TRUE; } @@ -1069,8 +1067,8 @@ void CDECL ANDROID_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_fla if (data->parent) goto done; if (swp_flags & SWP_HIDEWINDOW) goto done; if (is_argb_surface( data->surface )) goto done; + if (!get_surface_rect( visible_rect, &surface_rect )) goto done; - surface_rect = get_surface_rect( visible_rect ); if (data->surface) { if (!memcmp( &data->surface->rect, &surface_rect, sizeof(surface_rect) ))

1 0

Alexandre Julliard : winex11: Don' t allocate a window surface for off-screen windows.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 5ef349e45f38ae4d204f151256ad02db6937acab URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ef349e45f38ae4d204f1512… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 12:45:35 2018 +0100 winex11: Don't allocate a window surface for off-screen windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d35328c..a7651fb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2151,17 +2151,17 @@ done: } -static inline RECT get_surface_rect( const RECT *visible_rect ) +static inline BOOL get_surface_rect( const RECT *visible_rect, RECT *surface_rect ) { - RECT rect = get_virtual_screen_rect(); + *surface_rect = get_virtual_screen_rect(); - IntersectRect( &rect, &rect, visible_rect ); - OffsetRect( &rect, -visible_rect->left, -visible_rect->top ); - rect.left &= ~31; - rect.top &= ~31; - rect.right = max( rect.left + 32, (rect.right + 31) & ~31 ); - rect.bottom = max( rect.top + 32, (rect.bottom + 31) & ~31 ); - return rect; + if (!IntersectRect( surface_rect, surface_rect, visible_rect )) return FALSE; + OffsetRect( surface_rect, -visible_rect->left, -visible_rect->top ); + surface_rect->left &= ~31; + surface_rect->top &= ~31; + surface_rect->right = max( surface_rect->left + 32, (surface_rect->right + 31) & ~31 ); + surface_rect->bottom = max( surface_rect->top + 32, (surface_rect->bottom + 31) & ~31 ); + return TRUE; } @@ -2198,6 +2198,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (!data->whole_window && !data->embedded) goto done; if (swp_flags & SWP_HIDEWINDOW) goto done; if (data->vis.visualid != default_visual.visualid) goto done; + if (!get_surface_rect( visible_rect, &surface_rect )) goto done; if (*surface) window_surface_release( *surface ); *surface = NULL; /* indicate that we want to draw directly to the window */ @@ -2207,7 +2208,6 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (data->client_window) goto done; if (!client_side_graphics && !layered) goto done; - surface_rect = get_surface_rect( visible_rect ); if (data->surface) { if (EqualRect( &data->surface->rect, &surface_rect ))

1 0

Martin Storsjo : ucrtbase: Hook up __intrinsic_setjmpex for x86_64 and arm64.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: ae49bc94b4b49363133e31a0d6c28cfb9f99b294 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae49bc94b4b49363133e31a0… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Jan 22 00:06:09 2018 +0200 ucrtbase: Hook up __intrinsic_setjmpex for x86_64 and arm64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 5e67f92..cb6fd4e 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -39,7 +39,7 @@ @ stub __dcrt_initial_narrow_environment @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp -@ stub __intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b142a17..5d12b4c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -94,7 +94,7 @@ @ cdecl __initialize_lconv_for_unsigned_char() __lconv_init @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp -@ stub __intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) MSVCRT__setjmpex @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym @ cdecl __iscsymf(long) MSVCRT___iscsymf diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index b2d11bc..c4f9f6a 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -33,7 +33,7 @@ @ stub __current_exception @ stub __current_exception_context @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp -@ stub __intrinsic_setjmpex +@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy

1 0

Huw Davies : gdi32: Don't bother using the return value of HeapFree().
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 1def41b9039c5ffe6a79e04b24c6920225f6e30b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1def41b9039c5ffe6a79e04b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 22 09:53:38 2018 +0000 gdi32: Don't bother using the return value of HeapFree(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 3 ++- dlls/gdi32/brush.c | 3 ++- dlls/gdi32/dib.c | 3 ++- dlls/gdi32/dibdrv/opengl.c | 3 ++- dlls/gdi32/enhmetafile.c | 3 ++- dlls/gdi32/font.c | 3 ++- dlls/gdi32/metafile.c | 4 +++- dlls/gdi32/palette.c | 3 ++- dlls/gdi32/pen.c | 3 ++- 9 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 768911a..c16793d 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -489,7 +489,8 @@ static BOOL BITMAP_DeleteObject( HGDIOBJ handle ) if (!bmp) return FALSE; HeapFree( GetProcessHeap(), 0, bmp->dib.dsBm.bmBits ); - return HeapFree( GetProcessHeap(), 0, bmp ); + HeapFree( GetProcessHeap(), 0, bmp ); + return TRUE; } diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 3c11243..7d13649 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -467,7 +467,8 @@ static BOOL BRUSH_DeleteObject( HGDIOBJ handle ) if (!brush) return FALSE; free_brush_pattern( &brush->pattern ); - return HeapFree( GetProcessHeap(), 0, brush ); + HeapFree( GetProcessHeap(), 0, brush ); + return TRUE; } diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 2eb0e91..c7dcdb1 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1831,5 +1831,6 @@ static BOOL DIB_DeleteObject( HGDIOBJ handle ) else VirtualFree( bmp->dib.dsBm.bmBits, 0, MEM_RELEASE ); HeapFree(GetProcessHeap(), 0, bmp->color_table); - return HeapFree( GetProcessHeap(), 0, bmp ); + HeapFree( GetProcessHeap(), 0, bmp ); + return TRUE; } diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index 20cfc02..dba5db0 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -217,7 +217,8 @@ static struct wgl_context *dibdrv_wglCreateContext( HDC hdc ) static BOOL dibdrv_wglDeleteContext( struct wgl_context *context ) { pOSMesaDestroyContext( context->context ); - return HeapFree( GetProcessHeap(), 0, context ); + HeapFree( GetProcessHeap(), 0, context ); + return TRUE; } /*********************************************************************** diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 111fa43..37edc23 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -287,7 +287,8 @@ static BOOL EMF_Delete_HENHMETAFILE( HENHMETAFILE hmf ) UnmapViewOfFile( metaObj->emh ); else HeapFree( GetProcessHeap(), 0, metaObj->emh ); - return HeapFree( GetProcessHeap(), 0, metaObj ); + HeapFree( GetProcessHeap(), 0, metaObj ); + return TRUE; } /****************************************************************** diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d059f97..17b160d 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -811,7 +811,8 @@ static BOOL FONT_DeleteObject( HGDIOBJ handle ) FONTOBJ *obj; if (!(obj = free_gdi_handle( handle ))) return FALSE; - return HeapFree( GetProcessHeap(), 0, obj ); + HeapFree( GetProcessHeap(), 0, obj ); + return TRUE; } diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index c7e25a7..28ad53c 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -135,8 +135,10 @@ static POINT *convert_points( UINT count, const POINTS *pts ) BOOL WINAPI DeleteMetaFile( HMETAFILE hmf ) { METAHEADER *mh = free_gdi_handle( hmf ); + if (!mh) return FALSE; - return HeapFree( GetProcessHeap(), 0, mh ); + HeapFree( GetProcessHeap(), 0, mh ); + return TRUE; } /****************************************************************** diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index a8135d5..52bd0d3 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -610,7 +610,8 @@ static BOOL PALETTE_DeleteObject( HGDIOBJ handle ) PALETTE_UnrealizeObject( handle ); if (!(obj = free_gdi_handle( handle ))) return FALSE; HeapFree( GetProcessHeap(), 0, obj->entries ); - return HeapFree( GetProcessHeap(), 0, obj ); + HeapFree( GetProcessHeap(), 0, obj ); + return TRUE; } diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index d6c1dc4..fa789e4 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -279,7 +279,8 @@ static BOOL PEN_DeleteObject( HGDIOBJ handle ) if (!pen) return FALSE; free_brush_pattern( &pen->pattern ); - return HeapFree( GetProcessHeap(), 0, pen ); + HeapFree( GetProcessHeap(), 0, pen ); + return TRUE; }

1 0

Hans Leidekker : msi: Write registry values for source components too.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 8bdcaf60367084c06c77cefb21ead8b3f13e5731 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bdcaf60367084c06c77cefb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 22 10:19:06 2018 +0100 msi: Write registry values for source components too. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 2 +- dlls/msi/tests/action.c | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 54295a3..71e45e8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2872,7 +2872,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; comp->Action = msi_get_component_action( package, comp ); - if (comp->Action != INSTALLSTATE_LOCAL) + if (comp->Action != INSTALLSTATE_LOCAL && comp->Action != INSTALLSTATE_SOURCE) { TRACE("component not scheduled for installation %s\n", debugstr_w(component)); return ERROR_SUCCESS; diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 11e244c..31cc981 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -506,7 +506,22 @@ static const char wrv_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" - "augustus\t\tMSITESTDIR\t0\t\taugustus\n"; + "augustus\t\tMSITESTDIR\t0\t\taugustus\n" + "caesar\t\tMSITESTDIR\t1\t\t\n"; + +static const char wrv_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "feature\t\tFeature\tFeature\t2\t1\tTARGETDIR\t0\n" + "feature2\t\tFeature2\tFeature2\t2\t1\tTARGETDIR\t1"; + +static const char wrv_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "feature\taugustus\n" + "feature2\tcaesar"; static const char wrv_registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_\n" @@ -527,7 +542,8 @@ static const char wrv_registry_dat[] = "regdata12\t2\tSOFTWARE\\Wine\\msitest\tValue8\t#1\taugustus\n" "regdata13\t2\tSOFTWARE\\Wine\\msitest\tValue9\t#x1\taugustus\n" "regdata14\t2\tSOFTWARE\\Wine\\msitest\tValue10\t#x01\taugustus\n" - "regdata15\t2\tSOFTWARE\\Wine\\msitest\tValue11\t[regdata15]\taugustus\n"; + "regdata15\t2\tSOFTWARE\\Wine\\msitest\tValue11\t[regdata15]\taugustus\n" + "regdata16\t2\tSOFTWARE\\Wine\\msitest\tValue12\t#1\tcaesar\n"; static const char cf_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -1752,8 +1768,8 @@ static const msi_table wrv_tables[] = { ADD_TABLE(wrv_component), ADD_TABLE(directory), - ADD_TABLE(rof_feature), - ADD_TABLE(ci2_feature_comp), + ADD_TABLE(wrv_feature), + ADD_TABLE(wrv_feature_comp), ADD_TABLE(ci2_file), ADD_TABLE(install_exec_seq), ADD_TABLE(rof_media), @@ -4988,7 +5004,7 @@ static void test_write_registry_values(void) goto error; } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); if (is_64bit) @@ -5111,6 +5127,15 @@ static void test_write_registry_values(void) ok(size == 1, "got %u\n", size); ok(type == REG_BINARY, "got %u\n", type); + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value12", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(*(DWORD *)buf == 1, "got %u\n", *(DWORD *)buf); + ok(size == 4, "got %u\n", size); + ok(type == REG_DWORD, "got %u\n", type); + RegDeleteValueA(hkey, "Value"); RegDeleteValueA(hkey, "Value1"); RegDeleteValueA(hkey, "Value2"); @@ -5123,6 +5148,7 @@ static void test_write_registry_values(void) RegDeleteValueA(hkey, "Value9"); RegDeleteValueA(hkey, "Value10"); RegDeleteValueA(hkey, "Value11"); + RegDeleteValueA(hkey, "Value12"); RegCloseKey(hkey); RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest");

1 0

Hans Leidekker : dnsapi: Use default server list if passed in array is empty.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: dfe48bab07aee196284b2c02641d353eb390f08d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfe48bab07aee196284b2c02… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 22 10:19:05 2018 +0100 dnsapi: Use default server list if passed in array is empty. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/query.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index a66db37..74b7096 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -547,6 +547,7 @@ static DNS_STATUS dns_set_serverlist( const IP4_ARRAY *addrs ) { int i; + if (!addrs || !addrs->AddrCount) return ERROR_SUCCESS; if (addrs->AddrCount > MAXNS) { WARN( "too many servers: %d only using the first: %d\n", @@ -716,8 +717,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser initialise_resolver(); _res.options |= dns_map_options( options ); - if (servers && (ret = dns_set_serverlist( servers ))) - return ret; + if ((ret = dns_set_serverlist( servers ))) return ret; ret = dns_do_query( name, type, options, result );

1 0

Huw Davies : oleaut32: Fix vtable offset for a SYS_WIN32 typelib loaded on WIN64.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: dd012af92a93fdf77ec648e422b4fb96369b42eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd012af92a93fdf77ec648e4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 22 09:01:42 2018 +0000 oleaut32: Fix vtable offset for a SYS_WIN32 typelib loaded on WIN64. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 46 ++++++++++++++----------------------------- dlls/oleaut32/typelib.c | 4 ++-- 2 files changed, 17 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dd012af92a93fdf77ec6…

1 0

Huw Davies : oleaut32/tests: Remove some no longer needed test work-arounds.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 138f75f19f2ac9f774fb5a1e06fdd6db87dc23a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=138f75f19f2ac9f774fb5a1e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 22 09:01:41 2018 +0000 oleaut32/tests: Remove some no longer needed test work-arounds. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 47 ++++++++++++++----------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=138f75f19f2ac9f774fb…

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
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 January 2018