February 2019 - Wine-Commits

Gabriel Ivăncescu : user32/listbox: Shrink the item array with resize_storage.
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: 1ece9f62056d1ce88bc528b6e55c26b05cc17522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ece9f62056d1ce88bc528b6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 8 13:17:20 2019 +0200 user32/listbox: Shrink the item array with resize_storage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 80ba38b..3bd1b58 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1678,7 +1678,6 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) { LB_ITEMDATA *item; - INT max_items; if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; @@ -1698,20 +1697,8 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); if (descr->anchor_item == descr->nb_items) descr->anchor_item--; - /* Shrink the item array if possible */ + resize_storage(descr, descr->nb_items); - max_items = descr->items_size; - if (descr->nb_items < max_items - 2*LB_ARRAY_GRANULARITY) - { - max_items -= LB_ARRAY_GRANULARITY; - item = HeapReAlloc( GetProcessHeap(), 0, descr->items, - max_items * sizeof(LB_ITEMDATA) ); - if (item) - { - descr->items_size = max_items; - descr->items = item; - } - } /* Repaint the items */ LISTBOX_UpdateScroll( descr );

1 0

Sven Baars : webservices/tests: Add a missing closesocket call (Coverity).
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: 340d0106fe2d2e521261e10823f71eb916995761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=340d0106fe2d2e521261e108… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Feb 9 16:55:49 2019 +0100 webservices/tests: Add a missing closesocket call (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/proxy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index f529779..3fe9236 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -708,6 +708,7 @@ static DWORD CALLBACK server_proc( void *arg ) closesocket( c ); if (quit) break; } + closesocket( s ); return 0; }

1 0

Gabriel Ivăncescu : user32/listbox: Return proper value for LB_INITSTORAGE.
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: 0dd9eaf4e32ad15be524fefa79bc01034c454b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dd9eaf4e32ad15be524fefa… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 8 13:17:21 2019 +0200 user32/listbox: Return proper value for LB_INITSTORAGE. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 3bd1b58..a2791eb 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -734,7 +734,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) if (new_size > descr->items_size && !resize_storage(descr, new_size)) return LB_ERRSPACE; - return LB_OKAY; + return descr->items_size; }

1 0

Sergio Gómez Del Real : gdi32/dibdrv : Clip segment points to dib rect in wide_line_segment().
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: c20285218b55a08c1ad3a9a5e049d50913319de6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c20285218b55a08c1ad3a9a5… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Fri Feb 8 10:05:10 2019 -0500 gdi32/dibdrv: Clip segment points to dib rect in wide_line_segment(). Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/objects.c | 43 +++++++++++++++++++++++++++++++++---------- dlls/gdi32/gdi_private.h | 8 ++++++++ 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index f95475a..26710dd 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1334,15 +1334,21 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const P { HRGN join; POINT pts[4]; + RECT rect; switch (pdev->pen_join) { default: FIXME( "Unknown line join %x\n", pdev->pen_join ); /* fall through */ case PS_JOIN_ROUND: - OffsetRgn( round_cap, pt->x, pt->y ); - CombineRgn( region, region, round_cap, RGN_OR ); - OffsetRgn( round_cap, -pt->x, -pt->y ); + GetRgnBox( round_cap, &rect ); + offset_rect( &rect, pt->x, pt->y ); + if (clip_rect_to_dib( &pdev->dib, &rect )) + { + OffsetRgn( round_cap, pt->x, pt->y ); + CombineRgn( region, region, round_cap, RGN_OR ); + OffsetRgn( round_cap, -pt->x, -pt->y ); + } return; case PS_JOIN_MITER: @@ -1358,7 +1364,9 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const P break; } - CombineRgn( region, region, join, RGN_OR ); + GetRgnBox( join, &rect ); + if (clip_rect_to_dib( &pdev->dib, &rect )) + CombineRgn( region, region, join, RGN_OR ); DeleteObject( join ); return; } @@ -1367,7 +1375,7 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, const POINT *pt_1, const POINT *pt_2, int dx, int dy, BOOL need_cap_1, BOOL need_cap_2, struct face *face_1, struct face *face_2 ) { - RECT rect; + RECT rect, clip_rect; BOOL sq_cap_1 = need_cap_1 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); BOOL sq_cap_2 = need_cap_2 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); @@ -1381,7 +1389,9 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, rect.bottom = rect.top + pdev->pen_width; if ((sq_cap_1 && dx > 0) || (sq_cap_2 && dx < 0)) rect.left -= pdev->pen_width / 2; if ((sq_cap_2 && dx > 0) || (sq_cap_1 && dx < 0)) rect.right += pdev->pen_width / 2; - add_rect_to_region( total, &rect ); + clip_rect = rect; + if (clip_rect_to_dib( &pdev->dib, &clip_rect )) + add_rect_to_region( total, &clip_rect ); if (dx > 0) { face_1->start.x = face_1->end.x = rect.left; @@ -1405,7 +1415,9 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, rect.right = rect.left + pdev->pen_width; if ((sq_cap_1 && dy > 0) || (sq_cap_2 && dy < 0)) rect.top -= pdev->pen_width / 2; if ((sq_cap_2 && dy > 0) || (sq_cap_1 && dy < 0)) rect.bottom += pdev->pen_width / 2; - add_rect_to_region( total, &rect ); + clip_rect = rect; + if (clip_rect_to_dib( &pdev->dib, &clip_rect )) + add_rect_to_region( total, &clip_rect ); if (dy > 0) { face_1->start.x = face_2->end.x = rect.left; @@ -1475,9 +1487,20 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, seg_pts[3].y += wide_half.x; } - segment = CreatePolygonRgn( seg_pts, 4, ALTERNATE ); - CombineRgn( total, total, segment, RGN_OR ); - DeleteObject( segment ); + if (dx > 0 && dy > 0) + set_rect( &clip_rect, seg_pts[0].x, seg_pts[1].y, seg_pts[2].x, seg_pts[3].y ); + else if (dx > 0 && dy < 0) + set_rect( &clip_rect, seg_pts[1].x, seg_pts[2].y, seg_pts[3].x, seg_pts[0].y ); + else if (dx < 0 && dy > 0) + set_rect( &clip_rect, seg_pts[3].x, seg_pts[0].y, seg_pts[1].x, seg_pts[2].y ); + else + set_rect( &clip_rect, seg_pts[2].x, seg_pts[3].y, seg_pts[0].x, seg_pts[1].y ); + if (clip_rect_to_dib( &pdev->dib, &clip_rect )) + { + segment = CreatePolygonRgn( seg_pts, 4, ALTERNATE ); + CombineRgn( total, total, segment, RGN_OR ); + DeleteObject( segment ); + } face_1->start = seg_pts[0]; face_1->end = seg_pts[1]; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 920cd1e..01473dd 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -521,6 +521,14 @@ static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) rect->bottom += offset_y; } +static inline void set_rect( RECT *rect, int left, int top, int right, int bottom ) +{ + rect->left = left; + rect->top = top; + rect->right = right; + rect->bottom = bottom; +} + static inline void order_rect( RECT *rect ) { if (rect->left > rect->right)

1 0

Alexandre Julliard : ntdll: Use the image info to check for fake dlls.
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: 2062df7e6cf62ba616f2d9957ae965957de1d9f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2062df7e6cf62ba616f2d995… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 9 15:29:54 2019 +0100 ntdll: Use the image info to check for fake dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 68 ++++++++++++++--------------------------------------- 1 file changed, 17 insertions(+), 51 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 497b75d..dd6f437 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1635,29 +1635,6 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, /*********************************************************************** - * is_fake_dll - * - * Check if a loaded native dll is a Wine fake dll. - */ -static BOOL is_fake_dll( HANDLE handle ) -{ - static const char fakedll_signature[] = "Wine placeholder DLL"; - char buffer[sizeof(IMAGE_DOS_HEADER) + sizeof(fakedll_signature)]; - const IMAGE_DOS_HEADER *dos = (const IMAGE_DOS_HEADER *)buffer; - IO_STATUS_BLOCK io; - LARGE_INTEGER offset; - - offset.QuadPart = 0; - if (NtReadFile( handle, 0, NULL, 0, &io, buffer, sizeof(buffer), &offset, NULL )) return FALSE; - if (io.Information < sizeof(buffer)) return FALSE; - if (dos->e_magic != IMAGE_DOS_SIGNATURE) return FALSE; - if (dos->e_lfanew >= sizeof(*dos) + sizeof(fakedll_signature) && - !memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )) return TRUE; - return FALSE; -} - - -/*********************************************************************** * get_builtin_fullname * * Build the full pathname for a builtin dll. @@ -2323,7 +2300,7 @@ done: * Open a file for a new dll. Helper for find_dll_file. */ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_MODREF **pwm, - HANDLE *handle, void **module, pe_image_info_t *image_info, struct stat *st ) + void **module, pe_image_info_t *image_info, struct stat *st ) { FILE_BASIC_INFORMATION info; OBJECT_ATTRIBUTES attr; @@ -2331,7 +2308,7 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ LARGE_INTEGER size; SIZE_T len = 0; NTSTATUS status; - HANDLE mapping; + HANDLE handle, mapping; int fd, needs_close; nt_name->Buffer = NULL; @@ -2345,7 +2322,7 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ attr.ObjectName = nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if ((status = NtOpenFile( handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, + if ((status = NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ))) { @@ -2360,7 +2337,7 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ return STATUS_DLL_NOT_FOUND; } - if (!server_get_unix_fd( *handle, 0, &fd, &needs_close, NULL, NULL )) + if (!server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )) { fstat( fd, st ); if (needs_close) close( fd ); @@ -2368,8 +2345,7 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ { TRACE( "%s is the same file as existing module %p %s\n", debugstr_w( nt_name->Buffer ), (*pwm)->ldr.BaseAddress, debugstr_w( (*pwm)->ldr.FullDllName.Buffer )); - NtClose( *handle ); - *handle = 0; + NtClose( handle ); return STATUS_SUCCESS; } } @@ -2377,7 +2353,9 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ size.QuadPart = 0; status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE, - NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, *handle ); + NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, handle ); + NtClose( handle ); + if (!status) { status = virtual_map_section( mapping, module, 0, 0, NULL, &len, @@ -2385,11 +2363,6 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; NtClose( mapping ); } - if (status) - { - NtClose( *handle ); - *handle = 0; - } return status; } @@ -2400,8 +2373,8 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ * Search for dll in the specified paths. */ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING *nt_name, - WINE_MODREF **pwm, HANDLE *handle, void **module, - pe_image_info_t *image_info, struct stat *st ) + WINE_MODREF **pwm, void **module, pe_image_info_t *image_info, + struct stat *st ) { WCHAR *name; NTSTATUS status = STATUS_DLL_NOT_FOUND; @@ -2423,7 +2396,7 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * memcpy( name, paths, len * sizeof(WCHAR) ); if (len && name[len - 1] != '\\') name[len++] = '\\'; strcpyW( name + len, search ); - status = open_dll_file( name, nt_name, pwm, handle, module, image_info, st ); + status = open_dll_file( name, nt_name, pwm, module, image_info, st ); if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( nt_name ); paths = ptr; @@ -2447,15 +2420,13 @@ done: */ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, UNICODE_STRING *nt_name, WINE_MODREF **pwm, - HANDLE *handle, void **module, pe_image_info_t *image_info, - struct stat *st ) + void **module, pe_image_info_t *image_info, struct stat *st ) { WCHAR *ext, *dllname; NTSTATUS status = STATUS_SUCCESS; /* first append .dll if needed */ - *handle = 0; *pwm = NULL; *module = NULL; dllname = NULL; @@ -2488,9 +2459,9 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, } if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) - status = search_dll_file( load_path, libname, nt_name, pwm, handle, module, image_info, st ); + status = search_dll_file( load_path, libname, nt_name, pwm, module, image_info, st ); else - status = open_dll_file( libname, nt_name, pwm, handle, module, image_info, st ); + status = open_dll_file( libname, nt_name, pwm, module, image_info, st ); done: RtlFreeHeap( GetProcessHeap(), 0, dllname ); @@ -2510,14 +2481,13 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ WINE_MODREF *main_exe; UNICODE_STRING nt_name; struct stat st; - HANDLE handle; void *module; pe_image_info_t image_info; NTSTATUS nts; TRACE( "looking for %s in %s\n", debugstr_w(libname), debugstr_w(load_path) ); - nts = find_dll_file( load_path, libname, &nt_name, pwm, &handle, &module, &image_info, &st ); + nts = find_dll_file( load_path, libname, &nt_name, pwm, &module, &image_info, &st ); if (*pwm) /* found already loaded module */ { @@ -2554,7 +2524,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ break; case STATUS_SUCCESS: /* valid PE file */ - if (!is_fake_dll( handle )) + if (!(image_info.image_flags & IMAGE_FLAGS_WineFakeDll)) { switch (loadorder) { @@ -2587,12 +2557,10 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ nts = STATUS_DLL_NOT_FOUND; break; } - NtClose( handle ); if (module) NtUnmapViewOfSection( NtCurrentProcess(), module ); break; } TRACE( "%s is a fake Wine dll\n", debugstr_us(&nt_name) ); - NtClose( handle ); NtUnmapViewOfSection( NtCurrentProcess(), module ); /* fall through */ @@ -2661,7 +2629,6 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S NTSTATUS status; UNICODE_STRING nt_name; WINE_MODREF *wm; - HANDLE handle; void *module; pe_image_info_t image_info; struct stat st; @@ -2670,8 +2637,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S if (!load_path) load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; - status = find_dll_file( load_path, name->Buffer, &nt_name, &wm, &handle, &module, &image_info, &st ); - if (handle) NtClose( handle ); + status = find_dll_file( load_path, name->Buffer, &nt_name, &wm, &module, &image_info, &st ); if (wm) *base = wm->ldr.BaseAddress; else

1 0

Alexandre Julliard : server: Add custom flag for fake dlls in PE image information.
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: f244c3b5ebfae0bcbe13b127c4b3abd356a22f7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f244c3b5ebfae0bcbe13b127… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 9 15:23:47 2019 +0100 server: Add custom flag for fake dlls in PE image information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- include/wine/server_protocol.h | 3 ++- server/mapping.c | 20 +++++++++++++++----- server/protocol.def | 1 + 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 030c658..c008db7 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3200,7 +3200,7 @@ void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMA info->DllCharacteristics = pe_info->dll_charact; info->Machine = pe_info->machine; info->ImageContainsCode = pe_info->contains_code; - info->u.ImageFlags = pe_info->image_flags; + info->u.ImageFlags = pe_info->image_flags & ~IMAGE_FLAGS_WineFakeDll; info->LoaderFlags = pe_info->loader_flags; info->ImageFileSize = pe_info->file_size; info->CheckSum = pe_info->checksum; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 48c9723..63f65cd 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -714,6 +714,7 @@ typedef struct #define IMAGE_FLAGS_ImageDynamicallyRelocated 0x04 #define IMAGE_FLAGS_ImageMappedFlat 0x08 #define IMAGE_FLAGS_BaseBelow4gb 0x10 +#define IMAGE_FLAGS_WineFakeDll 0x80 struct rawinput_device { @@ -6553,6 +6554,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 571 +#define SERVER_PROTOCOL_VERSION 572 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/mapping.c b/server/mapping.c index bc59b21..37c17b0 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -555,11 +555,17 @@ static int load_clr_header( IMAGE_COR20_HEADER *hdr, size_t va, size_t size, int /* retrieve the mapping parameters for an executable (PE) image */ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_size, int unix_fd ) { - IMAGE_DOS_HEADER dos; + static const char fakedll_signature[] = "Wine placeholder DLL"; + IMAGE_COR20_HEADER clr; IMAGE_SECTION_HEADER sec[96]; struct { + IMAGE_DOS_HEADER dos; + char buffer[sizeof(fakedll_signature)]; + } mz; + struct + { DWORD Signature; IMAGE_FILE_HEADER FileHeader; union @@ -570,15 +576,17 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s } nt; off_t pos; int size; - size_t clr_va, clr_size; + size_t mz_size, clr_va, clr_size; unsigned int i, cpu_mask = get_supported_cpu_mask(); /* load the headers */ if (!file_size) return STATUS_INVALID_FILE_FOR_SECTION; - if (pread( unix_fd, &dos, sizeof(dos), 0 ) != sizeof(dos)) return STATUS_INVALID_IMAGE_NOT_MZ; - if (dos.e_magic != IMAGE_DOS_SIGNATURE) return STATUS_INVALID_IMAGE_NOT_MZ; - pos = dos.e_lfanew; + size = pread( unix_fd, &mz, sizeof(mz), 0 ); + if (size < sizeof(mz.dos)) return STATUS_INVALID_IMAGE_NOT_MZ; + if (mz.dos.e_magic != IMAGE_DOS_SIGNATURE) return STATUS_INVALID_IMAGE_NOT_MZ; + mz_size = size; + pos = mz.dos.e_lfanew; size = pread( unix_fd, &nt, sizeof(nt), pos ); if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_FORMAT; @@ -691,6 +699,8 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.gp = 0; /* FIXME */ mapping->image.file_size = file_size; mapping->image.loader_flags = clr_va && clr_size; + if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) + mapping->image.image_flags |= IMAGE_FLAGS_WineFakeDll; /* load the section headers */ diff --git a/server/protocol.def b/server/protocol.def index 73e0868..e65b984 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -730,6 +730,7 @@ typedef struct #define IMAGE_FLAGS_ImageDynamicallyRelocated 0x04 #define IMAGE_FLAGS_ImageMappedFlat 0x08 #define IMAGE_FLAGS_BaseBelow4gb 0x10 +#define IMAGE_FLAGS_WineFakeDll 0x80 struct rawinput_device {

1 0

Alexandre Julliard : ntdll: Directly try to open the dll file instead of checking for existence first.
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: c946922a9cc17929dc121b0d4c0895cf57010753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c946922a9cc17929dc121b0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 8 19:58:40 2019 +0100 ntdll: Directly try to open the dll file instead of checking for existence first. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 25 ++++-------- dlls/ntdll/loader.c | 94 ++++++++++++++++++++------------------------ 2 files changed, 50 insertions(+), 69 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 2314c84..3e077f3 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -336,32 +336,23 @@ static void testLoadLibraryEx(void) SetLastError(0xdeadbeef); hmodule = LoadLibraryExA("testfile.dll", hfile, 0); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - todo_wine - { - ok(GetLastError() == ERROR_SHARING_VIOLATION || - GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */ - "Unexpected last error, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_SHARING_VIOLATION || + GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */ + "Unexpected last error, got %d\n", GetLastError()); SetLastError(0xdeadbeef); hmodule = LoadLibraryExA("testfile.dll", (HANDLE)0xdeadbeef, 0); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - todo_wine - { - ok(GetLastError() == ERROR_SHARING_VIOLATION || - GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */ - "Unexpected last error, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_SHARING_VIOLATION || + GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */ + "Unexpected last error, got %d\n", GetLastError()); /* try to open a file that is locked */ SetLastError(0xdeadbeef); hmodule = LoadLibraryExA("testfile.dll", NULL, 0); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - todo_wine - { - ok(GetLastError() == ERROR_SHARING_VIOLATION, - "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_SHARING_VIOLATION, + "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); /* lpFileName does not matter */ if (is_unicode_enabled) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 701692a..2c93b02 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2345,14 +2345,19 @@ done: * * Open a file for a new dll. Helper for find_dll_file. */ -static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct stat *st ) +static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, + WINE_MODREF **pwm, HANDLE *handle, struct stat *st ) { + FILE_BASIC_INFORMATION info; OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; - HANDLE handle; + NTSTATUS status; int fd, needs_close; - if ((*pwm = find_fullname_module( nt_name ))) return 0; + nt_name->Buffer = NULL; + if ((status = RtlDosPathNameToNtPathName_U_WithStatus( name, nt_name, NULL, NULL ))) return status; + + if ((*pwm = find_fullname_module( nt_name ))) return STATUS_SUCCESS; attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -2360,11 +2365,22 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct attr.ObjectName = nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_DELETE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE )) - return 0; + if ((status = NtOpenFile( handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ))) + { + if (status != STATUS_OBJECT_PATH_NOT_FOUND && + status != STATUS_OBJECT_NAME_NOT_FOUND && + !NtQueryAttributesFile( &attr, &info )) + { + /* if the file exists but failed to open, report the error */ + return status; + } + /* otherwise continue searching */ + return STATUS_DLL_NOT_FOUND; + } - if (!server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )) + if (!server_get_unix_fd( *handle, 0, &fd, &needs_close, NULL, NULL )) { fstat( fd, st ); if (needs_close) close( fd ); @@ -2372,11 +2388,11 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct { TRACE( "%s is the same file as existing module %p %s\n", debugstr_w( nt_name->Buffer ), (*pwm)->ldr.BaseAddress, debugstr_w( (*pwm)->ldr.FullDllName.Buffer )); - NtClose( handle ); - return 0; + NtClose( *handle ); + *handle = 0; } } - return handle; + return STATUS_SUCCESS; } @@ -2385,7 +2401,8 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct * * Search for dll in the specified paths. */ -static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING *nt_name ) +static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING *nt_name, + WINE_MODREF **pwm, HANDLE *handle, struct stat *st ) { WCHAR *name; NTSTATUS status = STATUS_DLL_NOT_FOUND; @@ -2407,14 +2424,9 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * memcpy( name, paths, len * sizeof(WCHAR) ); if (len && name[len - 1] != '\\') name[len++] = '\\'; strcpyW( name + len, search ); - if (RtlDoesFileExists_U( name )) - { - if (!RtlDosPathNameToNtPathName_U( name, nt_name, NULL, NULL )) - status = STATUS_NO_MEMORY; - else - status = STATUS_SUCCESS; - goto done; - } + status = open_dll_file( name, nt_name, pwm, handle, st ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + RtlFreeUnicodeString( nt_name ); paths = ptr; } @@ -2439,11 +2451,12 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, HANDLE *handle, struct stat *st ) { WCHAR *ext, *dllname; - NTSTATUS status; + NTSTATUS status = STATUS_SUCCESS; /* first append .dll if needed */ *handle = 0; + *pwm = NULL; dllname = NULL; if (!(ext = strrchrW( libname, '.')) || strchrW( ext, '/' ) || strchrW( ext, '\\')) { @@ -2461,7 +2474,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, { WCHAR *fullname = NULL; - if ((*pwm = find_basename_module( libname )) != NULL) goto found; + if ((*pwm = find_basename_module( libname )) != NULL) goto done; status = find_actctx_dll( libname, &fullname ); if (status == STATUS_SUCCESS) @@ -2470,40 +2483,17 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, RtlFreeHeap( GetProcessHeap(), 0, dllname ); libname = dllname = fullname; } - else if (status != STATUS_SXS_KEY_NOT_FOUND) - { - RtlFreeHeap( GetProcessHeap(), 0, dllname ); - return status; - } + else if (status != STATUS_SXS_KEY_NOT_FOUND) goto done; } if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) - { - /* we need to search for it */ - if (!(status = search_dll_file( load_path, libname, nt_name ))) - { - *handle = open_dll_file( nt_name, pwm, st ); - } - else if (status != STATUS_DLL_NOT_FOUND) - { - RtlFreeHeap( GetProcessHeap(), 0, dllname ); - return status; - } - goto found; - } - - /* absolute path name */ - - if (!RtlDosPathNameToNtPathName_U( libname, nt_name, NULL, NULL )) - { - RtlFreeHeap( GetProcessHeap(), 0, dllname ); - return STATUS_NO_MEMORY; - } - *handle = open_dll_file( nt_name, pwm, st ); + status = search_dll_file( load_path, libname, nt_name, pwm, handle, st ); + else + status = open_dll_file( libname, nt_name, pwm, handle, st ); -found: +done: RtlFreeHeap( GetProcessHeap(), 0, dllname ); - return STATUS_SUCCESS; + return status; } @@ -2524,9 +2514,8 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ TRACE( "looking for %s in %s\n", debugstr_w(libname), debugstr_w(load_path) ); - *pwm = NULL; nts = find_dll_file( load_path, libname, &nt_name, pwm, &handle, &st ); - if (nts) return nts; + if (nts && nts != STATUS_DLL_NOT_FOUND) goto done; if (*pwm) /* found already loaded module */ { @@ -2591,6 +2580,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ break; } +done: if (nts == STATUS_SUCCESS) TRACE("Loaded module %s (%s) at %p\n", debugstr_us(&nt_name), ((*pwm)->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native", (*pwm)->ldr.BaseAddress);

1 0

Gabriel Ivăncescu : user32/listbox: Use a helper to expand the item array.
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: d7f2f33575cf6de36a0fc9b3b6732bcc5e161330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7f2f33575cf6de36a0fc9b3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 8 13:17:19 2019 +0200 user32/listbox: Use a helper to expand the item array. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 64 ++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 821da60..80ba38b 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -33,10 +33,11 @@ #include "controls.h" #include "wine/exception.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(listbox); -/* Items array granularity */ +/* Items array granularity (must be power of 2) */ #define LB_ARRAY_GRANULARITY 16 /* Scrolling timeout in ms */ @@ -121,6 +122,26 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +static BOOL resize_storage(LB_DESCR *descr, UINT items_size) +{ + LB_ITEMDATA *items; + + if (items_size > descr->items_size || + items_size + LB_ARRAY_GRANULARITY * 2 < descr->items_size) + { + items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); + items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); + if (!items) + { + SEND_NOTIFICATION(descr, LBN_ERRSPACE); + return FALSE; + } + descr->items_size = items_size; + descr->items = items; + } + return TRUE; +} + static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { return descr->items[index].selected; @@ -709,27 +730,10 @@ static void LISTBOX_DrawFocusRect( LB_DESCR *descr, BOOL on ) */ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) { - LB_ITEMDATA *item; - - nb_items += LB_ARRAY_GRANULARITY - 1; - nb_items -= (nb_items % LB_ARRAY_GRANULARITY); - if (descr->items) { - nb_items += descr->items_size; - item = HeapReAlloc( GetProcessHeap(), 0, descr->items, - nb_items * sizeof(LB_ITEMDATA)); - } - else { - item = HeapAlloc( GetProcessHeap(), 0, - nb_items * sizeof(LB_ITEMDATA)); - } + UINT new_size = descr->nb_items + nb_items; - if (!item) - { - SEND_NOTIFICATION( descr, LBN_ERRSPACE ); + if (new_size > descr->items_size && !resize_storage(descr, new_size)) return LB_ERRSPACE; - } - descr->items_size = nb_items; - descr->items = item; return LB_OKAY; } @@ -1534,29 +1538,11 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, LPWSTR str, ULONG_PTR data ) { LB_ITEMDATA *item; - INT max_items; INT oldfocus = descr->focus_item; if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; - if (descr->nb_items == descr->items_size) - { - /* We need to grow the array */ - max_items = descr->items_size + LB_ARRAY_GRANULARITY; - if (descr->items) - item = HeapReAlloc( GetProcessHeap(), 0, descr->items, - max_items * sizeof(LB_ITEMDATA) ); - else - item = HeapAlloc( GetProcessHeap(), 0, - max_items * sizeof(LB_ITEMDATA) ); - if (!item) - { - SEND_NOTIFICATION( descr, LBN_ERRSPACE ); - return LB_ERRSPACE; - } - descr->items_size = max_items; - descr->items = item; - } + if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR; /* Insert the item structure */

1 0

Huw Davies : kernel32: Implement canonical reordering.
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: dc919db2bfbc6975217e776d0beb07c492a578c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc919db2bfbc6975217e776d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 8 10:41:24 2019 +0000 kernel32: Implement canonical reordering. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 1 + dlls/kernel32/tests/locale.c | 6 +- libs/port/Makefile.in | 1 + libs/port/combclass.c | 288 +++++++++++++++++++++++++++++++++++++++++++ libs/port/normalize.c | 68 ++++++++++ tools/make_unicode | 24 ++++ 6 files changed, 385 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc919db2bfbc6975217e…

1 0

Alistair Leslie-Hughes : include: Add more VSS_* typedefs.
by Alexandre Julliard Feb. 11, 2019

Feb. 11, 2019

Module: wine Branch: master Commit: c6b5651dc41a2cb3e7576bfd48eb92ab5d5edf11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b5651dc41a2cb3e7576bfd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 10 22:48:08 2019 +0000 include: Add more VSS_* typedefs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vss.idl | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/include/vss.idl b/include/vss.idl index 62335ea..902a6ae 100644 --- a/include/vss.idl +++ b/include/vss.idl @@ -19,6 +19,8 @@ import "oaidl.idl"; typedef GUID VSS_ID; +typedef [unique, string] WCHAR *VSS_PWSZ; +typedef LONGLONG VSS_TIMESTAMP; typedef enum _VSS_APPLICATION_LEVEL { @@ -29,3 +31,91 @@ typedef enum _VSS_APPLICATION_LEVEL VSS_APP_FRONT_END = 3, VSS_APP_SYSTEM_RM = 4 } VSS_APPLICATION_LEVEL; + +typedef enum _VSS_BACKUP_TYPE +{ + VSS_BT_UNDEFINED, + VSS_BT_FULL, + VSS_BT_INCREMENTAL, + VSS_BT_DIFFERENTIAL, + VSS_BT_LOG, + VSS_BT_COPY, + VSS_BT_OTHER +} VSS_BACKUP_TYPE, *PVSS_BACKUP_TYPE; + +typedef enum _VSS_RESTORE_TYPE +{ + VSS_RTYPE_UNDEFINED, + VSS_RTYPE_BY_COPY, + VSS_RTYPE_IMPORT, + VSS_RTYPE_OTHER +} VSS_RESTORE_TYPE, *PVSS_RESTORE_TYPE; + +typedef enum _VSS_WRITER_STATE +{ + VSS_WS_UNKNOWN, + VSS_WS_STABLE, + VSS_WS_WAITING_FOR_FREEZE, + VSS_WS_WAITING_FOR_THAW, + VSS_WS_WAITING_FOR_POST_SNAPSHOT, + VSS_WS_WAITING_FOR_BACKUP_COMPLETE, + VSS_WS_FAILED_AT_IDENTIFY, + VSS_WS_FAILED_AT_PREPARE_BACKUP, + VSS_WS_FAILED_AT_PREPARE_SNAPSHOT, + VSS_WS_FAILED_AT_FREEZE, + VSS_WS_FAILED_AT_THAW, + VSS_WS_FAILED_AT_POST_SNAPSHOT, + VSS_WS_FAILED_AT_BACKUP_COMPLETE, + VSS_WS_FAILED_AT_PRE_RESTORE, + VSS_WS_FAILED_AT_POST_RESTORE, + VSS_WS_FAILED_AT_BACKUPSHUTDOWN, + VSS_WS_COUNT +} VSS_WRITER_STATE, *PVSS_WRITER_STATE; + +typedef enum _VSS_OBJECT_TYPE +{ + VSS_OBJECT_UNKNOWN, + VSS_OBJECT_NONE, + VSS_OBJECT_SNAPSHOT_SET, + VSS_OBJECT_SNAPSHOT, + VSS_OBJECT_PROVIDER, + VSS_OBJECT_TYPE_COUNT +} VSS_OBJECT_TYPE, *PVSS_OBJECT_TYPE; + +typedef enum _VSS_SNAPSHOT_STATE +{ + VSS_SS_UNKNOWN = 0, + VSS_SS_PREPARING, + VSS_SS_PROCESSING_PREPARE, + VSS_SS_PREPARED, + VSS_SS_PROCESSING_PRECOMMIT, + VSS_SS_PRECOMMITTED, + VSS_SS_PROCESSING_COMMIT, + VSS_SS_COMMITTED, + VSS_SS_PROCESSING_POSTCOMMIT, + VSS_SS_PROCESSING_PREFINALCOMMIT, + VSS_SS_PREFINALCOMMITTED, + VSS_SS_PROCESSING_POSTFINALCOMMIT, + VSS_SS_CREATED, + VSS_SS_ABORTED, + VSS_SS_DELETED, + VSS_SS_POSTCOMMITTED, + VSS_SS_COUNT +} VSS_SNAPSHOT_STATE, *PVSS_SNAPSHOT_STATE; + +typedef struct _VSS_SNAPSHOT_PROP +{ + VSS_ID m_SnapshotId; + VSS_ID m_SnapshotSetId; + LONG m_lSnapshotsCount; + VSS_PWSZ m_pwszSnapshotDeviceObject; + VSS_PWSZ m_pwszOriginalVolumeName; + VSS_PWSZ m_pwszOriginatingMachine; + VSS_PWSZ m_pwszServiceMachine; + VSS_PWSZ m_pwszExposedName; + VSS_PWSZ m_pwszExposedPath; + VSS_ID m_ProviderId; + LONG m_lSnapshotAttributes; + VSS_TIMESTAMP m_tsCreationTimestamp; + VSS_SNAPSHOT_STATE m_eStatus; +} VSS_SNAPSHOT_PROP, *PVSS_SNAPSHOT_PROP;

1 0